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

5660 Commits

Author SHA1 Message Date
Jesse McConnell 32d0f950a9 set for dev 2012-11-06 08:15:05 -06:00
Jesse McConnell 0411045449 [maven-release-plugin] prepare for next development iteration 2012-11-05 13:54:10 -06:00
Jesse McConnell 87b67d477b [maven-release-plugin] prepare release jetty-9.0.0.M2 2012-11-05 13:53:54 -06:00
Jesse McConnell 063efdc484 Updating VERSION.txt top section 2012-11-05 11:57:40 -06:00
Jesse McConnell 0d78b07595 Merge branch 'master' into release-9 2012-11-05 11:56:52 -06:00
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 fff825a997 393494 HashSessionManager can't delete unrestorable sessions on Windows 2012-11-05 16:26:20 +11:00
Jan Bartel 69cf9285c6 JETTY-1549 jetty-maven-plugin fails to reload the LoginService properly 2012-11-05 14:58:53 +11:00
Jan Bartel 0c84eefdcc Rename AggregateLifeCycle to ContainerLifeCycle in javadoc 2012-11-05 12:16:39 +11:00
Greg Wilkins 36ddd3f5d6 393368 min websocket version 2012-11-05 11:02:50 +11:00
Thomas Becker accc3b321a config fix 2012-11-02 17:16:13 +01:00
Thomas Becker 971bf4dec7 393281: Add getters to expose ReferrerPushStrategy Config 2012-11-02 14:27:11 +01:00
Thomas Becker 3d3e077509 393281: Add User-Agent filter to ReferrerPushStrategy 2012-11-02 13:21:42 +01:00
Jan Bartel ce1c1107eb Fix license headers 2012-11-02 23:09:09 +11:00
Jan Bartel 4e7932f519 Add production warning; rename test-annotation.war to test-spec.war for jetty-9 2012-11-02 16:56:17 +11:00
Jan Bartel 2f735cf5a9 Adding jetty-jaas module to build for jetty-9 2012-11-02 15:43:59 +11:00
Jan Bartel 94c05e6c2e Porting test webapps from codehaus to jetty-9 2012-11-02 15:43:05 +11:00
Joakim Erdfelt 949996931a Fixing license (for check plugin) 2012-11-01 21:25:25 -07:00
Greg Wilkins bca34dd87b jetty-9 cleanups for doco fetches 2012-11-02 14:27:33 +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 5ad2161259 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-02 13:19:27 +11:00
Greg Wilkins e076e8a8f0 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 13:19:07 +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 13f6940fc3 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 13:16:53 +11:00
Joakim Erdfelt b6cca66914 Fixing compile issue. File.getName(Locale) is not allowed. 2012-11-01 19:12:36 -07:00
Greg Wilkins 65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Greg Wilkins ba06103442 393383 delay onClose call until closeOut is done 2012-11-02 10:28:23 +11:00
Jesse McConnell 2ab0ef25bd resolve issues between jetty 8 and jetty 9 maven plugin that jan noticed 2012-11-01 12:08:07 -05:00
Jesse McConnell e93a254306 [Bug 393218] add xsd=application/xml mime mapping to defaults 2012-11-01 10:57:17 -05:00
Greg Wilkins 3683653052 393303 use jetty-web.xml to explicitly add the jetty packages that need visability. This commit also sucked in some changes made to help with the documentation process (improving deployer configuration management 2012-11-01 20:20:45 +11:00
Jan Bartel 8186794775 JETTY-1550 virtual WEB-INF not created if project has overlays 2012-11-01 15:37:17 +11:00
Jan Bartel ced624e203 Enable jetty-maven-plugin for test webapp. 2012-11-01 11:45:23 +11:00
Jan Bartel e466fa06b9 393291 Confusing log entry about (non) existing webAppSourceDirectory 2012-11-01 11:44:40 +11:00
Joakim Erdfelt 171fa2db67 More use of StringUtil.truncate 2012-10-31 13:27:21 -07:00
Joakim Erdfelt 01c9e650fb First working TEXT echo thru the muxer (as test case) 2012-10-31 11:07:10 -07:00
Jesse McConnell b5fd095055 added test case to validate the existing regex rewrite rule as wired up 2012-10-31 10:24:51 -05:00
Simone Bordet 62f8e13397 HTTP client: renamed Request.aborted() to Request.isAborted() to comply with the naming convention. 2012-10-31 13:21:15 +01:00
Joakim Erdfelt 61c607076a Mux interrim work. 2012-10-30 16:17:03 -07:00
Simone Bordet b3c1accab9 HTTP client: fixed bug in redirects: the new host was overwritten with the old one. 2012-10-30 22:37:25 +01:00
Simone Bordet 0d762bcdbc HTTP client: refactored response listeners to support lambdas. 2012-10-30 19:22:29 +01:00
Simone Bordet 8d51961516 HTTP client: refactored request listeners to support lambdas. 2012-10-30 19:22:29 +01:00
Thomas Becker 1d6ec310b5 393160: fix connection leaks in NextProtoNegoClientConnection and NextProtoNegoServerConnection 2012-10-30 18:48:38 +01:00
Joakim Erdfelt a1bf37f2a5 Trying to fix intellij scope concern 2012-10-30 08:35:01 -07:00
Simone Bordet 33d97b8dd4 HTTP client: refactored "last exchange" concept out of HttpConversation into HttpExchange. 2012-10-30 12:56:21 +01:00
Simone Bordet 7f37ddbc25 HTTP client: added TestTracker rule. 2012-10-30 12:15:21 +01:00
Simone Bordet ebb76ecfb9 392959 - Review HttpClient.getConversation(long). 
Modified to HttpClient.getConversation(long, boolean) in order
to specify whether the conversation must be created or not.
 2012-10-30 12:15:21 +01:00
Simone Bordet 1173916da1 HTTP client: renamed ResponseListener.Timed to Schedulable. 2012-10-30 12:15:21 +01:00
Joakim Erdfelt 6108d0df0c 393075 Jetty WebSocket client cannot connect to Tomcat WebSocket Server 
* Adding testcase to repliate behavior as reported by bug.
 2012-10-29 11:18:01 -07:00
Jan Bartel 8c817c49e5 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-10-29 18:22:48 +11:00