Commit Graph

597 Commits

Author SHA1 Message Date
Jan Bartel b9020d200a 419655 AnnotationParser throws NullPointerException when scanning files from jar:file urls 2013-10-21 16:42:27 +11:00
Jan Bartel 557b12a082 416300 Order ServletContainerInitializer callbacks 2013-10-17 18:37:24 +11:00
Joakim Erdfelt a1775c4415 Fixing javadoc 2013-10-07 11:59:04 -07:00
Jan Bartel d505350a9f 418596 Faults in JARs during class scanning should report the jar that caused the problem 2013-10-04 11:02:06 +10:00
Jesse McConnell 856a24b65a [maven-release-plugin] prepare for next development iteration 2013-09-30 14:46:09 -05:00
Jesse McConnell f466f03c6a [maven-release-plugin] prepare release jetty-9.0.6.v20130930 2013-09-30 14:46:00 -05:00
Jesse McConnell 0b3f431d27 set version back to 9.0.6-SNAPSHOT 2013-09-30 12:33:06 -05:00
Jesse McConnell af2e6ff911 Merge branch 'master' into release-9 2013-09-30 12:28:04 -05:00
Jan Bartel 92233ebf83 417561 Refactor annotation related code: change log messages 2013-09-30 13:27:05 +10:00
Jan Bartel afb1b69171 Add some more timing instrumentation to annotation related processing 2013-09-30 13:27:05 +10:00
Jan Bartel df336f3476 417561 Refactor annotation related code - remove unneeded log statements 2013-09-30 13:27:05 +10:00
Jan Bartel 0400289826 417561 Refactor annotation related code - make annotation phase able to be multithreaded 2013-09-30 13:27:05 +10:00
Joakim Erdfelt ac40e7ab6a Fixing various javadoc errors 2013-09-25 08:11:32 -07:00
Jan Bartel 911f271817 417561 Refactor annotation related code
Log a warning if not able to check valid classname when scanning a directory (wars that are not unpacked are still able to be scanned even though Resource.getFile().getName() will return null).
2013-09-20 18:08:19 +10:00
Jesse McConnell 0525498ad3 [maven-release-plugin] prepare for next development iteration 2013-09-19 15:06:31 -05:00
Jesse McConnell c05a725db6 [maven-release-plugin] prepare release jetty-9.0.6.v20130919 2013-09-19 15:06:17 -05:00
Jan Bartel 73d0ed8d71 417561 Refactor annotation related code
Rename and refactor ServletContainerInitializerListener
2013-09-19 22:31:36 +10:00
Jan Bartel d4c035a06f 417561 Refactor annotation related code to remove some deadwood 2013-09-19 15:43:38 +10:00
Jan Bartel f44787075a 417382 - Upgrade to asm 4.1 and refactor annotation parsing 2013-09-17 13:12:54 +10:00
Jan Bartel 810fbdc439 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-05 18:31:53 +10:00
Jan Bartel b8a4bf37e6 416597 Allow classes and jars on the webappcontext extraclasspath to be scanned for annotations 2013-09-05 18:24:12 +10:00
Jesse McConnell ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Jesse McConnell 725e405dac first pass for mod files for distribution 2013-08-22 11:53:58 -05:00
Jan Bartel c80100b4a9 [maven-release-plugin] prepare for next development iteration 2013-08-15 19:13:27 +10:00
Jan Bartel e7e7e45500 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 19:13:13 +10:00
Jan Bartel 716430bb03 [maven-release-plugin] rollback the release of jetty-9.0.5.v20130815 2013-08-15 18:03:49 +10:00
Jan Bartel 3d13c15d35 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 17:22:03 +10:00
Jan Bartel 7947b35134 Reset version for rerun of 9.0.5 2013-08-15 16:47:03 +10:00
Joakim Erdfelt 1abad26e99 Fixing malformed Javadoc warnings in jetty-annotations 2013-08-14 12:46:25 -07:00
Jesse McConnell 4383c9042d [maven-release-plugin] prepare for next development iteration 2013-08-13 14:20:56 -05:00
Jesse McConnell 160d34ec23 [maven-release-plugin] prepare release jetty-9.0.5.v20130813 2013-08-13 14:20:47 -05:00
Greg Wilkins e0382bc4ae 414740 Removed the parent peeking Loader 2013-08-09 17:53:43 +10:00
Jan Bartel 06ef5b7930 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
2013-08-09 15:59:29 +10:00
Jan Bartel b17696325b Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-08-09 15:14:09 +10:00
Jan Bartel 6a22a9f5b9 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-08-09 14:46:25 +10:00
Jan Bartel 66620b77b8 414507 Ensure AnnotationParser ignores parent dir hierarchy when checking for hidden dirnames 2013-08-09 14:19:04 +10:00
Joakim Erdfelt 012804bdd9 414725 - Annotation Scanning should exclude webapp basedir from path validation checks
+ Checking in @Ignore'd test demonstrating the bug
2013-08-08 15:05:31 -07:00
Jan Bartel 1f3ec4b538 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-08 14:31:33 +10:00
Jan Bartel bd1b19b45c Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
2013-08-08 14:24:19 +10:00
Jan Bartel f22217392b Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-08-08 12:28:51 +10:00
Jan Bartel f983629434 414507 AnnotationParser should skip classes in hidden dirs or with . name prefix 2013-08-08 12:09:29 +10:00
Joakim Erdfelt 941989e5cb Tweaking generics. 2013-07-26 14:04:17 -07:00
Jesse McConnell 20bd1e0f96 [maven-release-plugin] prepare for next development iteration 2013-07-26 11:50:17 -05:00
Jesse McConnell 49c3b2c32a [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:49:58 -05:00
Jesse McConnell 6ed360c480 reset for release 2013-07-26 11:23:57 -05:00
Jesse McConnell 1a5117e9ab [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:18:24 -05:00
Jesse McConnell 650e8e93ae [maven-release-plugin] prepare for next development iteration 2013-07-26 10:57:33 -05:00
Jesse McConnell e7e2fce56e [maven-release-plugin] prepare release jetty-7.6.12.v20130726 2013-07-26 10:57:26 -05:00
Simone Bordet 5c7eb9e265 Reverted version to 7.6.12-SNAPSHOT. 2013-07-26 13:36:35 +02:00
Jesse McConnell 49045558ef [maven-release-plugin] prepare for next development iteration 2013-07-25 14:07:12 -05:00
Jesse McConnell 9b888d5c22 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 14:06:53 -05:00
Jesse McConnell de2840ca1e [maven-release-plugin] prepare for next development iteration 2013-07-25 12:52:15 -05:00
Jesse McConnell 3e94867f7f [maven-release-plugin] prepare release jetty-8.1.12.v20130725 2013-07-25 12:52:07 -05:00
Jesse McConnell bc679809f8 [maven-release-plugin] prepare for next development iteration 2013-07-25 11:25:58 -05:00
Jesse McConnell 39ec9b8051 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 11:25:51 -05:00
Jesse McConnell e0ad2c4ee1 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:52:39 -05:00
Jesse McConnell 99712058ca [maven-release-plugin] prepare release jetty-8.1.11.v20130725 2013-07-25 07:52:32 -05:00
Jesse McConnell 767dbe6778 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:48:09 -05:00
Jesse McConnell cfa6076c4f [maven-release-plugin] prepare release jetty-7.6.11.v20130725 2013-07-25 07:48:02 -05:00
Jan Bartel bd2add0ae9 Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release. 2013-07-12 13:53:58 +10:00
Joakim Erdfelt 78b5f7df1f [maven-release-plugin] prepare for next development iteration 2013-06-25 08:29:26 -07:00
Joakim Erdfelt 5f2c937fcb [maven-release-plugin] prepare release jetty-9.0.4.v20130625 2013-06-25 08:29:18 -07:00
Joakim Erdfelt 31faf2fe20 Reverting failed release from friday 2013-06-25 07:42:45 -07:00
Jesse McConnell 57bfda2a08 [maven-release-plugin] prepare for next development iteration 2013-06-21 09:49:25 -05:00
Jesse McConnell c1082ad4d4 [maven-release-plugin] prepare release jetty-9.0.4.v20130621 2013-06-21 09:49:15 -05:00
Joakim Erdfelt f8c457f75e Merge branch 'jetty-9.1' into javawebsocket-jsr 2013-06-19 15:07:15 -07:00
Joakim Erdfelt 2da8c9c306 Merge branch 'master' into javawebsocket-jsr
Conflicts:
	jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
2013-06-17 10:54:10 -07:00
Greg Wilkins 4e4ffaa54c Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
Jesse McConnell eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
Joakim Erdfelt 998643587d Merge from [master] to [javawebsocket-jsr] 2013-05-30 16:44:50 -07:00
Greg Wilkins b59949253d Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
2013-05-30 17:17:54 +10:00
Jan Bartel c53efbaff4 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	example-async-rest/async-rest-jar/pom.xml
	example-async-rest/async-rest-webapp/pom.xml
	example-async-rest/pom.xml
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/jetty-websocket/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http/src/main/java/org/eclipse/jetty/http/gzip/AbstractCompressedStream.java
	jetty-io/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/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/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-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/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-core/pom.xml
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-xml/pom.xml
	pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/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-mongodb-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-05-30 15:36:38 +10:00
Jan Bartel c869aad145 409436 NPE on context restart using dynamic servlet registration 2013-05-30 15:16:43 +10:00
Jan Bartel af02e9b16d Update to version to 8.1.12-SNAPSHOT after last release 2013-05-30 10:52:39 +10:00
Greg Wilkins 10539d5a3f fixed NPE in injection 2013-05-29 09:14:27 +10:00
Greg Wilkins 15e0d50b79 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-23 09:50:27 +10:00
Joakim Erdfelt 598ecd7d7f Merge branch 'master' into javawebsocket-jsr 2013-05-22 09:25:06 -07:00
Jesse McConnell 725dc261c8 Merge branch 'release-8' into jetty-8 2013-05-22 10:44:14 -05:00
Jesse McConnell a1a6f0e5f2 Merge branch 'release-7' into jetty-7 2013-05-22 10:39:24 -05:00
Jesse McConnell 74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
Jesse McConnell 742f6a063d [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:16:39 -05:00
Jesse McConnell bdbd92dbc9 [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:10:07 -05:00
Jesse McConnell 0858e69cb1 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:19:34 -05:00
Jesse McConnell d469b77663 [maven-release-plugin] prepare release jetty-8.1.11.v20130520 2013-05-20 07:19:25 -05:00
Jesse McConnell 497c2f7819 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:15:00 -05:00
Jesse McConnell b32d0260c9 [maven-release-plugin] prepare release jetty-7.6.11.v20130520 2013-05-20 07:14:52 -05:00
Jan Bartel 73bee3af4b 407708 - HttpUpgradeHandler must support injection 2013-05-13 17:47:53 +10:00
Joakim Erdfelt 9f82849900 Merge from [master] to [javawebsocket-jsr] 2013-05-09 12:10:57 -07:00
Jesse McConnell 3d600ed95e [maven-release-plugin] prepare for next development iteration 2013-05-06 18:13:04 -05:00
Jesse McConnell d832f3dc7e [maven-release-plugin] prepare release jetty-9.0.3.v20130506 2013-05-06 18:12:55 -05:00
Jan Bartel f544d6e701 405422 Implement servlet3.1 spec sections 4.4.3 and 8.1.4 for new HttpSessionIdListener class 2013-05-03 18:27:51 +10:00
Jan Bartel 0d181d9a75 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-03 16:59:39 +10:00
Jan Bartel 3df03e18d7 405437 Implement section 13.8.4 Uncovered HTTP methods 2013-04-23 13:52:41 +10:00
Joakim Erdfelt 9463eee427 Merge branch 'master' into javawebsocket-jsr 2013-04-19 09:25:03 -07:00
Jan Bartel 87d4690462 405533 Implement special role ** for security constraints 2013-04-19 15:53:45 +10:00
Greg Wilkins a7073d05a6 updated version to 9.1.0-SNAPSHOT 2013-04-19 13:59:18 +10:00
Jesse McConnell 7baaa14ba1 [maven-release-plugin] prepare for next development iteration 2013-04-17 11:46:39 -05:00
Jesse McConnell e390b54b25 [maven-release-plugin] prepare release jetty-9.0.2.v20140417 2013-04-17 11:46:31 -05:00
Joakim Erdfelt 8088edc96c Merge branch 'master' into javawebsocket-jsr 2013-04-15 12:12:25 -07:00
Joakim Erdfelt fe25ef0454 JSR-356 working on server handlers 2013-04-15 12:11:57 -07:00
Jesse McConnell 0b20467c6f [maven-release-plugin] prepare for next development iteration 2013-04-15 11:40:45 -05:00
Jesse McConnell 3aa4301711 [maven-release-plugin] prepare release jetty-9.0.2.v20140415 2013-04-15 11:40:37 -05:00
Jan Bartel 5637db66e8 405352 Servlet init-param always overridden by WebServlet annotation 2013-04-11 06:36:44 +10:00
Greg Wilkins b8dd8bde14 [maven-release-plugin] prepare for next development iteration 2013-04-08 12:31:34 +10:00
Greg Wilkins bf3771904b [maven-release-plugin] prepare release jetty-9.0.1.v20130408 2013-04-08 12:30:59 +10:00
Jan Bartel 4951b1ccc4 404176 Jetty's AnnotationConfiguration class does not scan non-jar resources on the container classpath 2013-03-28 19:33:52 +11:00
Jesse McConnell acb5919844 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:10:50 -05:00
Jesse McConnell d6ebdc0a4a [maven-release-plugin] prepare release jetty-7.6.10.v20130312 2013-03-12 09:10:42 -05:00
Jesse McConnell 0405c8ded6 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:05:25 -05:00
Jesse McConnell 852178cd01 [maven-release-plugin] prepare release jetty-8.1.10.v20130312 2013-03-12 09:05:14 -05:00
Joakim Erdfelt 897c35c2cb [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
Joakim Erdfelt cc6196af50 [maven-release-plugin] prepare release jetty-9.0.0.v20130308 2013-03-08 11:33:15 -07:00
Joakim Erdfelt 7fc38f6c0f [maven-release-plugin] prepare for next development iteration 2013-03-07 19:14:19 -07:00
Joakim Erdfelt 96d045442f [maven-release-plugin] prepare release jetty-9.0.0.v20130307 2013-03-07 19:14:11 -07:00
Jesse McConnell 778ee1411b [maven-release-plugin] prepare for next development iteration 2013-03-06 10:21:46 -06:00
Jesse McConnell d916078711 [maven-release-plugin] prepare release jetty-9.0.0.v20130306 2013-03-06 10:21:38 -06:00
Joakim Erdfelt 94756a42c3 [maven-release-plugin] prepare for next development iteration 2013-03-01 16:08:32 -07:00
Joakim Erdfelt 96dabe7e62 [maven-release-plugin] prepare release jetty-9.0.0.RC3 2013-03-01 16:08:24 -07:00
Joakim Erdfelt c267c1a9d0 [maven-release-plugin] prepare for next development iteration 2013-03-01 10:26:43 -07:00
Joakim Erdfelt ba15fe04e2 [maven-release-plugin] prepare release jetty-9.0.0.RC3 2013-03-01 10:26:34 -07:00
Jan Bartel 90b5ea2c5e Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2013-03-01 19:08:09 +11:00
Jan Bartel caa0199efe 400312 ServletContextListener.contextInitialized() is not called when added in ServletContainerInitializer.onStartup 2013-03-01 18:09:19 +11:00
Joakim Erdfelt 29b2118870 [maven-release-plugin] prepare for next development iteration 2013-02-26 09:20:45 -07:00
Joakim Erdfelt 2b82b54f6d [maven-release-plugin] prepare release jetty-9.0.0.RC2 2013-02-26 09:20:45 -07:00
Jan Bartel 59ada108b2 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-client/src/test/java/org/eclipse/jetty/client/ExternalSiteTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslBytesServerTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
	jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
	test-jetty-webapp/pom.xml
2013-02-22 12:47:02 +11:00
Jan Bartel 6a48749f0c Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-02-22 11:32:57 +11:00
Jan Bartel ad6e4b37f0 401474 Performance problem in org.eclipse.jetty.annotation.AnnotationParser 2013-02-22 10:47:57 +11:00
Joakim Erdfelt 4dc3ed38c2 [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Joakim Erdfelt ed24f78498 [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:36 -07:00
Jesse McConnell e073ceb06d [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Jesse McConnell 2f2ad287af [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:35 -07:00
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Jesse McConnell 5c58878c3c [maven-release-plugin] prepare for next development iteration 2013-01-31 11:34:38 -06:00
Jesse McConnell ebbe37294f [maven-release-plugin] prepare release jetty-8.1.9.v20130131 2013-01-31 11:34:30 -06:00
Jesse McConnell a5e1e04af1 [maven-release-plugin] prepare for next development iteration 2013-01-31 08:42:20 -06:00
Jesse McConnell b7fb18fd65 [maven-release-plugin] prepare release jetty-7.6.9.v20130131 2013-01-31 08:42:12 -06:00
Greg Wilkins b132663c2b jetty-9 made WebAppContext configuration additive 2013-01-31 12:21:04 +11:00
Jan Bartel 0306d9b532 Make jetty-annotations.xml include plus config 2013-01-25 11:26:29 +11:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell 863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins 27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Jesse McConnell bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell 1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell 70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell 017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00
Greg Wilkins 52464a5ba6 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
	jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
	jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
	test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
	test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
Greg Wilkins 8723408731 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
Greg Wilkins 65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Greg Wilkins 2b13648b0e 392237 fixed many TODOs and many minor code cleanups 2012-10-19 16:17:30 +11:00