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 |