Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,255 Commits 68 Branches 465 Tags 360 MiB
Commit Graph

270 Commits

Author SHA1 Message Date
Jesse McConnell 20c1301203 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 11:56:27 -05:00
Jesse McConnell 39ef0ec7d6 fix bad test target dir usage 2016-06-07 11:55:48 -05:00
Greg Wilkins 6163ee7293 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-14 16:32:51 +10:00
Greg Wilkins e1b0967e59 removed needless warning 2016-04-14 16:32:26 +10:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Greg Wilkins 3527c6a71b StringUtil.csvSplit(String) 
Conflicts:
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
 2015-12-08 14:54:33 -07:00
Simone Bordet 9aa6dc1e7d Merged branch 'jetty-9.3.x' into 'master'. 2015-12-08 13:02:55 +01:00
Simone Bordet 9c673e542d Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-12-08 13:02:20 +01:00
Jan Bartel 66e596511d 483620 Servlet annotation mapping to "/" should override webdefault.xml mapping 2015-12-04 15:58:07 +11:00
Greg Wilkins a311c8bde1 480904 - jetty-util Loader simplification 
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader.    Multiple loaders will never be tried.

A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).

The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
 2015-11-19 12:14:05 +11:00
Greg Wilkins ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +11:00
Jan Bartel e1bade217f 479839 Regression when starting application with excessive scan times 2015-10-16 15:43:48 +11:00
Jan Bartel 27a41a4f77 479839 Regression when starting application with excessive scan times 2015-10-16 15:16:43 +11:00
Joakim Erdfelt f4133dfd35 javadoc fix 2015-10-01 15:56:26 -07:00
Jan Bartel 697b0cccf2 477895 Prevent leak of handles to deleted files after redeploy 2015-09-30 13:39:31 +10:00
Jan Bartel 4743c19a8c 474961 Close input stream for classes in AnnotationParser after scanning 2015-08-19 11:12:40 +10:00
Jan Bartel 3de7fc77c7 474558 Debug log ServletContainerInitializer @HandlesTypes contents 2015-08-19 10:25:36 +10:00
Greg Wilkins 3e401a62e9 StringUtil.csvSplit(String) 2015-06-19 16:48:53 +10:00
Joakim Erdfelt 7c737a587b Removing [version] sections in modules 2015-06-12 09:14:34 -07:00
Joakim Erdfelt 916efd6aa7 469860 - Add module metadata versioning to support backwards compat 
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
 2015-06-10 10:59:18 -07:00
Greg Wilkins 5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Joakim Erdfelt 77c02af49f Fixing javadoc visibility 2015-04-23 17:07:28 -07:00
Joakim Erdfelt cffeea3ed6 464727 - Update Javadoc for Java 8 DocLint 
+ Fixing javadoc in jetty-annotations
 2015-04-22 12:05:53 -07:00
Greg Wilkins 1cb0449be3 Organised imports 2015-03-26 12:32:15 +11:00
Joakim Erdfelt e92bcccc84 Using new Decorator 2015-03-12 10:09:53 -07:00
Joakim Erdfelt aea4713d27 Minor test class cleanup while testing some annotation scanning behavior reported 2015-01-16 15:18:01 -07:00
Joakim Erdfelt 6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Jan Bartel 381227cd9d 456486 Jar containing ServiceContainerInitializer impl not found in TCCL in osgi 2015-01-01 17:25:10 +01:00
Jan Bartel 1ab6d7398c 447979 Refactor to make MetaData responsible for progressively ordering web-inf jars 2014-10-24 12:48:15 +11:00
Jan Bartel 21d590a74a 442759 Allow specific ServletContainerInitializers to be excluded 2014-08-28 16:52:26 +10:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Simone Bordet 745f757552 Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[]. 2014-07-15 18:49:14 +02:00
Greg Wilkins 55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Jan Bartel d2b08da8a4 Refactoring for ease of customization. 2014-05-27 19:22:28 +02:00
Jan Bartel 609945fe7c 433656 Change to Opcode.ASM5 breaks jetty-osgi 2014-04-28 15:36:36 +02:00
Jan Bartel b4542a031b 433512 Jetty throws RuntimeException when webapp compiled with jdk8 -parameters 2014-04-25 16:36:01 +02:00
Greg Wilkins b3be247423 merged quickstart changes 2014-03-14 13:07:00 +11:00
Jan Bartel b6f36dadb2 Add appropriate headers to allow ServiceLoader mechanism to work with OSGi. 2014-03-10 13:42:05 +11:00
Greg Wilkins 18e19260ff Apply changes resulting from the quickstart project 2014-02-13 12:31:14 +11:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Jan Bartel aca8e4d44c 424380 Augment class / Jar scanning timing log events 2013-12-20 11:00:46 +11:00
Jan Bartel 2d3d912173 423361 Ensure ServletContainerInitializers called before injecting Listeners 2013-12-13 15:03:46 +11:00
Jan Bartel dfe5889bc4 423361 Make all listeners injectable irrespective of method of declaration (descriptor, api, annotation) 2013-12-12 14:44:38 +11:00
Jan Bartel 8b544e4327 423556 HttpSessionIdListener should be resource injectable 2013-12-09 17:05:52 +11:00
Jan Bartel 5f204b8812 423395 Ensure @WebListeners are injected 2013-12-06 15:46:51 +11:00
Greg Wilkins f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Jan Bartel fc6493b5b1 Remove accidental checkin of println 2013-10-28 13:09:26 +11:00
Jan Bartel c5fe3bcfd3 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenAnnotationConfiguration.java
 2013-10-21 17:27:45 +11:00
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
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
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
Joakim Erdfelt 1abad26e99 Fixing malformed Javadoc warnings in jetty-annotations 2013-08-14 12:46:25 -07: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
Joakim Erdfelt f8c457f75e Merge branch 'jetty-9.1' into javawebsocket-jsr 2013-06-19 15:07:15 -07: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
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 74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
Jan Bartel 73bee3af4b 407708 - HttpUpgradeHandler must support injection 2013-05-13 17:47:53 +10: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
Jan Bartel 87d4690462 405533 Implement special role ** for security constraints 2013-04-19 15:53:45 +10: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
Jan Bartel 5637db66e8 405352 Servlet init-param always overridden by WebServlet annotation 2013-04-11 06:36:44 +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
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
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
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01: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
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
Greg Wilkins fac580c374 Merge remote-tracking branch 'origin/jetty-8' into jetty-9 
Conflicts:
	VERSION.txt
	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-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/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java
	jetty-annotations/pom.xml
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AbstractDiscoverableAnnotationHandler.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.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/Generator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
	jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java
	jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
	jetty-io/src/main/java/org/eclipse/jetty/io/BufferUtil.java
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
	jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
	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-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
	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-runner/pom.xml
	jetty-security/pom.xml
	jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java
	jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
	jetty-server/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/main/java/org/eclipse/jetty/server/bio/SocketConnector.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
	jetty-server/src/test/resources/jetty-logging.properties
	jetty-servlet/pom.xml
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
	jetty-servlets/pom.xml
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
	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-server/pom.xml
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/pom.xml
	jetty-start/src/test/java/org/eclipse/jetty/start/CommandLineBuilderTest.java
	jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-webapp/pom.xml
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
	jetty-websocket/pom.xml
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/MessageSender.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java
	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
	test-jetty-webapp/src/main/webapp/WEB-INF/web.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
 2012-10-12 21:19:21 +11:00
Greg Wilkins 8c3fa91b26 jetty-9 reverted to more start.ini rather than start.d usage as we will not be using plugins. More configuration documentation added 2012-10-11 16:15:57 +11:00
Jan Bartel ce3ba58887 390163 Implement ServletRegistration.Dynamic.setServletSecurity 2012-09-29 16:15:55 +10:00
Jan Bartel 0ab5773963 390560 The method AnnotationParser.getAnnotationHandlers(String) always returns a empty collection. 2012-09-28 00:26:22 +10:00
Simone Bordet 40382bad3a jetty-9 - Removed references to JUnit 3.x. 2012-09-20 18:23:02 +02:00
Jan Bartel c5395cff85 389452 if web-fragment metadata-complete==true still scan its related jar if there there is a ServletContainerInitializer, ensure webapp restarts work 2012-09-17 17:13:20 +10:00
Jan Bartel 394c478b19 389452 if web-fragment metadata-complete==true still scan its related jar if there there is a ServletContainerInitializer 
Also some refactoring to simplify scanning for annotations/classes.
 2012-09-14 16:51:53 +10:00
Simone Bordet 7231c82b69 Merged branch 'jetty-9' into jetty-9-client. 2012-09-06 08:41:48 +02:00
Greg Wilkins 2dfcebfc04 jetty-9 distribution working 2012-09-06 14:54:55 +10:00
Simone Bordet 4de5b0ad63 Merged branch 'jetty-9' into jetty-9-client. 2012-08-30 17:24:49 +02:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Jan Bartel 3bcfc29469 384280 Implement preliminary ServletRegistrations 2012-07-12 16:27:26 +10:00
Jesse McConnell 81d72052c8 merged master to jetty-8 2012-07-11 14:04:49 -05:00
Jesse McConnell aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Jan Bartel 96fe2d6c3f JETTY-1523 It is imposible to map servlet to "/" using WebApplicationInitializer 2012-07-04 17:11:11 +02:00
Jan Bartel 2131a40559 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-07 13:54:30 +02:00
Greg Wilkins 5e83df20c8 various sonar/findbug code cleanups 2012-04-25 00:00:54 +10:00
Jesse McConnell 2086937a09 Merge branch 'master' into jetty-8 2012-03-08 05:35:14 -06:00
Simone Bordet c559383bb2 Fixed test refactoring common parts and always destroying the "env" subcontext at end of tests. 2012-03-08 12:16:51 +01:00
Jan Bartel 5111a2c640 373603 NullPointer in WebServletAnnotation 2012-03-08 10:26:34 +11:00
Jan Bartel c3643d9937 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-21 12:37:23 +11:00
Jan Bartel 0b1becf58d 364936 use Resource for opening URL streams 2011-12-08 12:16:36 +11:00
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'" 
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
 2011-11-30 16:27:30 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Jan Bartel 73a8065132 357209 JSP tag listeners not called 2011-09-12 14:47:09 +10:00
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Joakim Erdfelt f6d45d5650 293739 - Deprecate static Jetty Log usage in favor of named logs 
+ Finished conversion of the rest of jetty 7.x
 2011-08-24 13:14:28 -07:00
Jan Bartel 6081e74fe6 353285 - ServletSecurity annotation ignored 2011-07-29 12:03:35 +10:00
Jan Bartel f1b743a114 Enable annotations by default (because they are needed by servlet 3.0) 2011-07-11 18:00:34 +10:00
Greg Wilkins 17e907c2fb git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +10:00
Jesse McConnell 6e62a61af3 341006 move inner enums out into separate files 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2913 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-03-25 21:04:39 +00:00
Joakim Erdfelt f3a2a575aa Fixing broken javadoc and imports 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2673 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-01-21 20:49:28 +00:00
Greg Wilkins e10c14c77a 332937 Added Destroyable interface and reworked dependent lifecycles, specially of JNDI 
Also added Dumpable interface to improve and standardize the output of nested structures while debugging

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2615 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-12-21 11:27:02 +00:00
Jan Bartel b4edc055a1 332796 - Annotations inheritance does not work with jetty7 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2612 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-12-17 11:50:16 +00:00
Jan Bartel bd272143e2 320073 ensure Decorators get called in reverse order of addition; refactor TagLibConfiguration and Descriptor classes 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2187 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-07-27 23:59:16 +00:00
Greg Wilkins b4f4c0ae36 320073 further improved configuration 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2175 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-07-26 09:40:47 +00:00