Commit Graph

9240 Commits

Author SHA1 Message Date
Greg Wilkins 0a748205f0 432122 ignore frequently failing test 2014-04-07 18:00:50 +10:00
Greg Wilkins 2b2d3ac762 Fixed start.jar handling of expanded modules during --add-to-start 2014-04-07 13:11:41 +10:00
Greg Wilkins 6edb854c69 Merge remote-tracking branch 'origin/master' into jetty-9.2.x
Conflicts:
	aggregates/jetty-all/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-annotations/pom.xml
	jetty-ant/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-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-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spdy/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-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-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-04-07 12:59:15 +10:00
Greg Wilkins 64e11bc8e8 reverted version to 9.1.x pending merge of 9.2 branch 2014-04-07 12:52:43 +10:00
Greg Wilkins 086e39f6db 423392 Fix buffer overflow in AsyncGzipFilter 2014-04-07 12:32:46 +10:00
Jesse McConnell 4688c10361 Merge branch 'release-9' 2014-04-04 17:24:35 -05:00
Greg Wilkins cf430665b5 Fixed start.jar handling of expanded modules during --add-to-start 2014-04-04 14:09:46 +11:00
Greg Wilkins f9e2f1d6bc 429734 Implemented the HA ProxyProtocol 2014-04-04 12:42:06 +11:00
Greg Wilkins 4dbabd72f2 429734 Implemented the HA ProxyProtocol 2014-04-04 08:47:37 +11:00
Greg Wilkins 6e9879cc6b removed debug 2014-04-03 19:12:49 +11:00
Greg Wilkins 303fa57eaf improved protonego module structure to avoid ini files of parameterized modules 2014-04-03 16:50:33 +11:00
Jan Bartel c62500c63d Fix alpn-related poms for osgi and osgi test cases. 2014-04-03 16:41:24 +11:00
Greg Wilkins 0bbec3826c 430341 use apache jsp/jstl for maven plugins 2014-04-03 14:27:27 +11:00
Greg Wilkins 157a54ec5c 430341 Use apache jsp/jstl by default in 9.2.0 2014-04-03 14:16:13 +11:00
Jesse McConnell 34a1d3e109 set for dev 2014-04-02 16:25:26 -05:00
Jesse McConnell dbb938ac71 [maven-release-plugin] prepare for next development iteration 2014-04-02 10:55:29 -05:00
Jesse McConnell c616ece6c7 [maven-release-plugin] prepare release jetty-9.1.4.v20140401 2014-04-02 10:55:21 -05:00
Joakim Erdfelt 077887141f Updating alpn and npn modules to protonego 2014-04-01 13:09:49 -07:00
Jesse McConnell 46c1734817 Updating VERSION.txt top section 2014-04-01 09:01:59 -05:00
Jesse McConnell f842fe6c7c Merge branch 'master' into release-9 2014-04-01 09:00:23 -05:00
Simone Bordet 860ea9c329 Made easier for subclasses to customize the response code in case of
rewrite failed.
2014-04-01 15:50:41 +02:00
Simone Bordet a96d7c388c Initial implementation of 431642 (async proxy servlet). 2014-04-01 15:45:52 +02:00
Jesse McConnell c35618ee20 fixed merge conflict in version.txt 2014-04-01 08:18:20 -05:00
Joakim Erdfelt 9c96dadf21 Bumping up version to 9.2.0-SNAPSHOT 2014-03-31 15:15:55 -07:00
Joakim Erdfelt 28d9df1dbb Refactoring alpn stuff into jetty-alpn-server and jetty-alpn-client 2014-03-31 14:18:37 -07:00
Greg Wilkins 9bce638719 Merge remote-tracking branch 'origin/master' into jetty-9-alpn
Conflicts:
	apache-jsp/pom.xml
	apache-jstl/pom.xml
	jetty-quickstart/pom.xml
2014-03-31 14:13:32 +11:00
Greg Wilkins a1d20956b1 deferred apache and quickstart until 9.2 2014-03-31 14:01:39 +11:00
Greg Wilkins 81e14cf59d tests fail with new ISP? 2014-03-31 13:42:22 +11:00
Greg Wilkins 9975f44b84 Merge remote-tracking branch 'origin/master' into jetty-9-alpn 2014-03-31 12:18:40 +11:00
Greg Wilkins 325c4df482 431592 - do not resolved forwarded-for address 2014-03-31 12:17:53 +11:00
Greg Wilkins c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00
Greg Wilkins 28445fc629 Merge remote-tracking branch 'origin/master' into jetty-9-alpn 2014-03-31 09:59:52 +11:00
Greg Wilkins c895f6dbcd organised imports 2014-03-31 09:57:59 +11:00
Simone Bordet a7f9e5a674 Made test more reliable. 2014-03-28 19:34:03 +01:00
Joakim Erdfelt 8ebf4367c2 427188 - Re-enable automatic detection of logging-dependencies with logging-module
+ Adding lib/logging/**.jar [lib] to logging.mod
2014-03-28 09:59:16 -07:00
Joakim Erdfelt f3d312698f 425736 - jetty-start / Jetty 9 fails to startup with --exec option if Java path contain
+ Using .addRawArg() to avoid space escaping for Java Bin
2014-03-28 09:59:16 -07:00
Jan Bartel 76d365677a Downgrade asm requirement in osgi to version 4+ 2014-03-28 10:04:23 +11:00
Simone Bordet f36700092c Don't assert on existing directories/files. 2014-03-27 16:11:11 +01:00
Simone Bordet 342c97d8ba 430654 - closing client connections can hang worker threads.
Prettified usage of NonBlockingThread and added Javadocs.
2014-03-27 15:37:23 +01:00
Simone Bordet 1089a33578 Fixed imports referencing JUnit 3 and old matcher libraries. 2014-03-27 15:34:48 +01:00
Greg Wilkins 86d13b91a5 430654 avoid dispatching failure callbacks 2014-03-27 19:08:16 +11:00
Jan Bartel b198234d5b Ensure that jetty-annotations manifest uses 4.1 or above for asm, and that the jetty osgi spdy tests use only 4.1. 2014-03-27 17:08:57 +11:00
Joakim Erdfelt 2f6f210174 430747 - jetty-start / Allow --lib and module [lib] to recursively add jars
+ --lib={pattern} now supported
  + regular searching rules (for BaseHome) apply
  + even supporting multiple lib pattern entries via File.pathSeparator
    separation, resulting in support for command lines like this:
       --lib=/opt/common/lib/**.jar:lib/db/*.jar
  + {pattern} can be any valid java.nio.file.PathMatcher of syntax "glob:"
    (since we rely on File.pathSeparator to break apart the --lib line
    the existence of that same char in "glob:" and "regex:" means that
    supporting both syntaxes of (regex and glob) isn't going to make
    writing this line easy for the user.  opting for glob only seems
    like a good compromise)
2014-03-26 19:22:20 -07:00
Joakim Erdfelt dfbe5c92c6 426920 - jetty-start / BaseHome.listFilesRegex() and .recurseDir() do not detect filesystem loops
+ Using java.nio.files to walk directory tree and detect filesystem
  loops
+ All standard PathMatching patterns now work. ("glob:" and "regex:")
2014-03-26 19:01:05 -07:00
Joakim Erdfelt 1444ffadb8 Reverting <modules> in parent pom in favor of spdy and osgi specifics 2014-03-26 14:06:23 -07:00
Joakim Erdfelt b835aab06f 430825 - jetty-start / use of jetty-jmx.xml prevents configuration of ThreadPool in jetty.xml
+ Flipped dependencies around from:
     server -(optional) -> jmx
  to:
     jmx -> server
2014-03-26 11:59:59 -07:00
Joakim Erdfelt a52925efcc 431279 - jetty-start / Unable to start jetty if no properties are defined.
+ Removed spurious check for no properties set (as System Properties are
  not part of that check, but should have been, which essentially means
  that there is never no properties available)
2014-03-26 11:34:08 -07:00
Joakim Erdfelt 6600abd3f9 Adding more start debug for lib resolution steps 2014-03-26 11:34:06 -07:00
Joakim Erdfelt 4f051fecf3 More work to make alpn & npn builds sane 2014-03-25 15:47:15 -07:00
Joakim Erdfelt 3e500a6f48 Adding alpn.version to other compatible java 7 updates 2014-03-25 11:25:16 -07:00