Jan Bartel
|
2acdf9f839
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-client/src/test/java/org/eclipse/jetty/client/WebSocketUpgradeTest.java
jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD08Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD00Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD06Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD08Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
|
2012-11-05 17:27:49 +11:00 |
|
Jan Bartel
|
f3af8c8650
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2012-11-05 16:28:25 +11:00 |
|
Jan Bartel
|
69cf9285c6
|
JETTY-1549 jetty-maven-plugin fails to reload the LoginService properly
|
2012-11-05 14:58:53 +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
|
add3c2b381
|
392237 improved names and examples for documentation
|
2012-10-29 17:59:39 +11:00 |
|
Jan Bartel
|
b8d6b4da8b
|
Making session tests work; incorporating renewing session id keeping old object.
|
2012-10-27 18:44:35 +11:00 |
|
Greg Wilkins
|
2b13648b0e
|
392237 fixed many TODOs and many minor code cleanups
|
2012-10-19 16:17:30 +11:00 |
|
Greg Wilkins
|
9d62229dec
|
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.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/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
|
2012-10-15 12:15:44 +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 |
|
Jan Bartel
|
785e06d347
|
390108 Servlet 3.0 API for programmatic login doesn't appear to work
|
2012-10-12 19:00:28 +11:00 |
|
Jan Bartel
|
ce3ba58887
|
390163 Implement ServletRegistration.Dynamic.setServletSecurity
|
2012-09-29 16:15:55 +10:00 |
|
Jan Bartel
|
c7e36470c5
|
390503 http-method-omission element not being processed
|
2012-09-28 20:16:52 +10:00 |
|
Jan Bartel
|
286df12f03
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
|
2012-09-28 19:27:07 +10:00 |
|
Greg Wilkins
|
eacd75bbfd
|
390161 jetty-9 do not share DeferredAuthentication
|
2012-09-27 10:13:23 +10:00 |
|
Greg Wilkins
|
73401791d7
|
390161 jetty-9 do not share DeferredAuthentication
|
2012-09-24 11:40:03 +10:00 |
|
Greg Wilkins
|
879cdf4b82
|
jetty-9 further lifecycle improvements
|
2012-09-21 16:17:00 +10:00 |
|
Greg Wilkins
|
68ee346b8a
|
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
|
2012-09-21 11:45:51 +10:00 |
Simone Bordet
|
40382bad3a
|
jetty-9 - Removed references to JUnit 3.x.
|
2012-09-20 18:23:02 +02:00 |
Jesse McConnell
|
a8994178f5
|
[maven-release-plugin] prepare for next development iteration
|
2012-09-10 14:18:11 -05:00 |
|
Jesse McConnell
|
92180a9700
|
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
|
2012-09-10 14:18:01 -05:00 |
|
Jesse McConnell
|
10e4027579
|
[maven-release-plugin] prepare for next development iteration
|
2012-09-10 13:59:34 -05:00 |
|
Jesse McConnell
|
57a6258f96
|
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
|
2012-09-10 13:59:10 -05:00 |
|
Jesse McConnell
|
1ec8b2621b
|
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
|
2012-09-10 13:47:05 -05:00 |
|
Jesse McConnell
|
4180d7e1f5
|
prepare for release
|
2012-09-10 12:59:04 -05:00 |
|
Greg Wilkins
|
73ebe89019
|
jetty-9 refactored configuration
|
2012-09-10 20:26:14 +10:00 |
|
Jesse McConnell
|
d37deeea74
|
[maven-release-plugin] prepare for next development iteration
|
2012-09-03 13:33:18 -05:00 |
|
Jesse McConnell
|
b418b0dd57
|
[maven-release-plugin] prepare for next development iteration
|
2012-09-03 13:33:16 -05:00 |
|
Jesse McConnell
|
41e9b1f6e2
|
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
|
2012-09-03 13:33:10 -05:00 |
|
Jesse McConnell
|
6c0b0af2fe
|
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
|
2012-09-03 13:33:08 -05:00 |
|
Jan Bartel
|
c7b9081a52
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2012-08-30 16:16:44 +10:00 |
|
Jesse McConnell
|
f7793ae94d
|
[Bug 387896] populate session in SessionAuthentication as a valueBound in addition to activation so it is populate when needed
|
2012-08-28 11:24:14 -05:00 |
|
Simone Bordet
|
06b2de17d5
|
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
|
2012-08-24 11:52:29 +02:00 |
|
Jesse McConnell
|
fd1ab0ed55
|
merge from master
|
2012-08-23 16:44:30 -05:00 |
|
Greg Wilkins
|
c1a454c278
|
avoided race in FormAuth by not sending redirect until after session attribute set
|
2012-08-20 22:29:08 +10:00 |
|
Greg Wilkins
|
1d89bef7a2
|
jetty-9 fixed context restart for constraint test
|
2012-08-20 10:21:07 +10:00 |
|
Greg Wilkins
|
4f30fb17a6
|
jetty-9 removed debugs
|
2012-08-20 09:23:47 +10:00 |
|
Greg Wilkins
|
4ff7ae6106
|
jetty-9 removed redirect race from form auth
|
2012-08-20 09:22:03 +10:00 |
|
Greg Wilkins
|
2900b4df02
|
jetty-9 some post merge fixes
|
2012-08-18 10:37:09 +10:00 |
Joakim Erdfelt
|
3d1d76d214
|
Merge from jetty-8 to jetty-9 (license header standarization)
|
2012-08-17 13:44:22 -07:00 |
|
Jesse McConnell
|
5de0cee1eb
|
merge from master + license block standardization
|
2012-08-17 14:50:43 -05:00 |
|
Jesse McConnell
|
5eaf946956
|
patch over some nasties that are exposed with starting and stopping server, needs more investigation
|
2012-08-17 11:43:10 -05:00 |
|
Jesse McConnell
|
8c0897839a
|
replace old AbstractHttpConnection with HttpChannel to get request for session listener
|
2012-08-17 09:18:47 -05:00 |
|
Greg Wilkins
|
086e74bed8
|
jetty-9 merged jetty-8
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java
|
2012-08-17 23:35:42 +10:00 |
|
Jesse McConnell
|
00ed549898
|
standardize license header blocks
|
2012-08-16 19:11:27 -05:00 |
|
Jesse McConnell
|
c82871b10f
|
Merge branch 'master' into jetty-8
|
2012-08-16 17:10:35 -05:00 |
|
Simone Bordet
|
360bdfa051
|
Jetty9 - Code cleanups: using generics, diamond operator, removed warnings, etc.
|
2012-08-13 11:46:09 +02:00 |
|
Greg Wilkins
|
03ebcc881c
|
jetty-9 include more modules
|
2012-08-09 19:31:50 +10:00 |
|
Greg Wilkins
|
32c5f6c093
|
jetty-9 reduced LazyList usage
|
2012-08-08 11:58:50 +10:00 |