Commit Graph

10316 Commits

Author SHA1 Message Date
Joakim Erdfelt 89baf907b6 452323 - Start --list-config makes no hint on transitive enabled modules
+ Eliminating lots of now dead code (#uncoding)
+ Making ambiguous add detection more sane.
2014-11-19 16:42:55 -07:00
Joakim Erdfelt 005b513653 452323 - Start --list-config makes no hint on transitive enabled modules
+ Refactoring out the Graph + Node logic into its own package
+ Changing Matcher to Predicate
+ Introducing new Node.selection Set which tracks how the various nodes
  are selected, along with with ability to track directly selected (aka
  explicit) vs transitive.
+ Module now extends from Node
+ Modules now extends from Graph<Module>
2014-11-19 15:59:54 -07:00
Joakim Erdfelt 1561de0f81 Cleaning up resolveEnabled() deprecation 2014-11-19 10:27:25 -07:00
Jan Bartel a0f6d07847 452201 EnvConfiguration.destroy() should set the classloader 2014-11-19 17:49:16 +11:00
Jan Bartel 9792cec6db 451529 Change sentinel class for finding jstl on classpath to org.apache.taglibs.standard.tag.rt.core.WhenTag 2014-11-19 17:20:55 +11:00
Greg Wilkins aeccef2154 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	VERSION.txt
	aggregates/jetty-all/pom.xml
	apache-jsp/pom.xml
	apache-jstl/pom.xml
	examples/async-rest/async-rest-jar/pom.xml
	examples/async-rest/async-rest-webapp/pom.xml
	examples/async-rest/pom.xml
	examples/embedded/pom.xml
	examples/pom.xml
	jetty-alpn/jetty-alpn-client/pom.xml
	jetty-alpn/jetty-alpn-server/pom.xml
	jetty-alpn/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-cdi/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-fcgi/fcgi-client/pom.xml
	jetty-fcgi/fcgi-server/pom.xml
	jetty-fcgi/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-alpn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-npn/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-quickstart/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spdy/pom.xml
	jetty-spdy/spdy-alpn-tests/pom.xml
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-http-client-transport/pom.xml
	jetty-spdy/spdy-http-common/pom.xml
	jetty-spdy/spdy-http-server/pom.xml
	jetty-spdy/spdy-npn-tests/pom.xml
	jetty-spdy/spdy-server/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/javax-websocket-client-impl/pom.xml
	jetty-websocket/javax-websocket-server-impl/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-quickstart/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-11-19 13:37:48 +11:00
Greg Wilkins c334e81416 452188 Delay dispatch until content optimisation
Added module and xml support
2014-11-19 11:26:07 +11:00
Greg Wilkins 04f74f73a5 452188 Delay dispatch until content optimisation 2014-11-19 11:11:48 +11:00
Joakim Erdfelt d4d6cfdfa7 Removing virtual module [ssl-protonego]
+ This virtual module, rolled the ssl + protonego + (xml) into
  http2 & spdy modules instead.
2014-11-17 14:08:19 -07:00
Joakim Erdfelt 88900593de Fixing 2 typos 2014-11-17 13:56:55 -07:00
Joakim Erdfelt 994f00102d Merge branch 'start-init-improvements' 2014-11-17 13:22:53 -07:00
Joakim Erdfelt dbf6f2e644 451973 - Ambiguous module init location when mixing --add-to-start & --add-to-startd in the same exec
+ Cleaning up entire base buildout into BaseBuilder class
+ The management of the configuration is maintained in
  - StartDirBuilder
  - StartIniBuilder
+ The buildout of the directories from the [files] section is now
  maintained by the BaseBuilder itself.
+ Using new FileInitializer system as well
+ Using new Licensing system as well
2014-11-17 13:21:01 -07:00
Joakim Erdfelt 61e480c2c1 451974 - Combine multiple start license acknowledgement into one
+ Initial work to combine licensing into a single event
  Depends on work from bug #451973
2014-11-17 13:20:12 -07:00
Joakim Erdfelt 453ab6d5c7 Supporting optional use of maven local repository for download content 2014-11-14 12:15:07 -07:00
Joakim Erdfelt 28059d9644 Updating NPN test for valid module urls 2014-11-14 10:45:54 -07:00
Joakim Erdfelt cf90c683cd Merge branch 'master' into start-init-improvements 2014-11-14 10:03:03 -07:00
Joakim Erdfelt 844a209823 Updating all non-test maven.org refs to maven:// 2014-11-14 10:02:46 -07:00
Joakim Erdfelt ccaddc5d43 Working on utility to update maven refs 2014-11-14 09:53:18 -07:00
Joakim Erdfelt 24adca89ac Removing weld.mod (in favor of cdi.mod) 2014-11-14 06:30:01 -07:00
Greg Wilkins ce4af5a8b9 Implemented the PROXY protocol
Added XML templates
2014-11-14 12:04:57 +11:00
Greg Wilkins 5b60e0c98d support h2-15 and h2-14 2014-11-14 10:53:37 +11:00
Greg Wilkins 593cb39059 Implemented the PROXY protocol
Removed old HttpParser PROXY tests
2014-11-14 10:28:04 +11:00
Greg Wilkins a62f68e438 Added 421 MISDIRECTED_REQUEST 2014-11-14 09:46:46 +11:00
Joakim Erdfelt 15bf5b02f8 Updating Main.initFiles() to be extensible 2014-11-13 14:23:26 -07:00
Jesse McConnell 6bcbdf67aa set for dev 2014-11-13 09:51:08 -06:00
Greg Wilkins a308c087ed Implemented the PROXY protocol
Moved the PROXY protocol support from HttpParser to a ConnectionFactory.
See http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
2014-11-13 19:55:01 +11:00
Jan Bartel 07d3a30ff7 Upgrade version of pax-exam and equinox for jetty-osgi testing. 2014-11-13 19:16:52 +11:00
Jan Bartel dc2b9b18a9 383207 Use BundleFileLocatorHelperFactory to obtain BundleFileLocatorHelper 2014-11-13 18:57:13 +11:00
Jesse McConnell 09846e324d [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
Jesse McConnell 97d2bd95a6 [maven-release-plugin] prepare release jetty-9.2.5.v20141112 2014-11-12 17:13:14 -06:00
Jesse McConnell 1e854936a2 set for release 2014-11-12 16:43:31 -06:00
Greg Wilkins 59fc60972e Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-11-12 17:14:06 +11:00
Greg Wilkins 9904db48ce 450894 jetty.sh does not delete JETTY_STATE at start 2014-11-12 17:01:52 +11:00
Jan Bartel f10403b41a 450467 Integer overflow in Session expiry calculation in MongoSessionManager 2014-11-12 16:26:14 +11:00
Jan Bartel 3bd03e5549 450467 Integer overflow in Session expiry calculation in MongoSessionManager 2014-11-12 16:11:44 +11:00
Greg Wilkins ac87e8c389 fixed bad merge of VERSION.TXT 2014-11-12 14:19:44 +11:00
Greg Wilkins 1834e360ea Added RFC6585 status codes and use 429 for DoSFilter 2014-11-12 14:16:41 +11:00
Greg Wilkins 39360d91e6 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-11-12 13:52:32 +11:00
Greg Wilkins e0fbd6d9f2 Increased timeout to 5s for gzip tests.
Writing large mp3's 1 byte with flush can be slow and 2s was not enough.
2014-11-12 13:51:31 +11:00
Greg Wilkins 7939edc8a2 446564 Refactored RequestLog Mechanism
fixed log race in test
2014-11-12 13:15:09 +11:00
Greg Wilkins dfe799d04c Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java

Added Interceptor chain so that double gzip interception can be prevented.
2014-11-12 12:36:56 +11:00
Greg Wilkins 5fe992bf04 450855 GzipFilter MIGHT_COMPRESS exception
Re-enabled some default GzipFilter tests.  These will work because the filter rewraps the response on
the dispatch.  It is only the timeout test that will not work with default.
2014-11-12 10:46:14 +11:00
Greg Wilkins 85811dad9b 450873 Disable tests that downcaste wrapped GzipFilterResponses 2014-11-12 10:41:48 +11:00
Greg Wilkins 5165d4c7ad 450855 GzipFilter MIGHT_COMPRESS exception
Disabled tests that tried to apply the GzipFilter to default async content generation.  These
tests will never work as GzipFilter wraps the response and the default async does not preserve wrappers.

For the MIGHT_COMPRESS issue, improved the filter to handle the case that it has already been applied to
a request/response and that the state is already mightCompress.
2014-11-12 10:20:06 +11:00
Joakim Erdfelt 4bf2d37d01 Fixing CDI test case 2014-11-11 12:42:10 -07:00
Joakim Erdfelt 27eccbc9b2 Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncScheduledWrite.java
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncTimeoutDispatchBasedWrite.java
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncTimeoutWrite.java
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterLayeredTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncScheduledDispatchWrite.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncScheduledWrite.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncTimeoutCompleteWrite.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncTimeoutDispatchBasedWrite.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncTimeoutDispatchWrite.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncTimeoutWrite.java
2014-11-11 10:59:02 -07:00
Joakim Erdfelt f04903fb68 Increasing the variety of Gzip tests per recommendations by Simone 2014-11-11 10:16:41 -07:00
Joakim Erdfelt 00692c0ff3 Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipTester.java
2014-11-10 19:31:31 -07:00
Joakim Erdfelt 5941bf76d6 Removing GzipTester.assertIsResponseNotGzipCompressed 2014-11-10 18:37:58 -07:00
Joakim Erdfelt e83df11eaf Removing GzipTester.assertIsResponseNotGzipCompressed 2014-11-10 17:58:38 -07:00