5640 Commits

Author SHA1 Message Date
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
Jan Bartel
a74c9f176c 392237 Split jaas from jetty-plus into jetty-jaas and port the test-jaas-webapp from codehaus 2012-10-29 18:21:37 +11:00
Greg Wilkins
add3c2b381 392237 improved names and examples for documentation 2012-10-29 17:59:39 +11:00
Greg Wilkins
77a7ff3122 392237 more embedded examples 2012-10-29 16:11:15 +11:00
Jan Bartel
3ae56b8450 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractLastAccessTimeTest.java
2012-10-29 16:09:10 +11:00
Jan Bartel
3d198a94fb Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-29 16:06:38 +11:00
Jan Bartel
8b90057b68 371170 MongoSessionManager LastAccessTimeTest fails 2012-10-29 16:05:46 +11:00
Jan Bartel
ec089948fb 392237 Make rfc2616 webapp work in jetty-9 2012-10-29 15:53:51 +11:00
Jan Bartel
d1dfc56e04 Merge remote-tracking branch 'origin/jetty-8' 2012-10-29 15:07:26 +11:00
Jan Bartel
a8a015d8c2 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-29 14:44:12 +11:00
Jan Bartel
7c03c793d5 392812 MongoSessionIDManager never purges old sessions 2012-10-29 12:49:38 +11:00
Jan Bartel
16b159fe8d 393015 Mongodb purge not rescheduled 2012-10-29 12:48:01 +11:00
Jan Bartel
3ef7a8b263 393014 Mongodb purgevalid using query for purgeinvalid 2012-10-29 11:29:34 +11:00
Greg Wilkins
b87dc6ce83 jetty-9 removed old http client 2012-10-29 10:33:58 +11:00
Jan Bartel
262ef1386d License headers 2012-10-28 08:28:17 +11:00
Jan Bartel
b8d6b4da8b Making session tests work; incorporating renewing session id keeping old object. 2012-10-27 18:44:35 +11:00
Jan Bartel
4c08f90a3c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-27 18:33:14 +11:00
Jan Bartel
0efdc471db Add space to license for license-checker recognition 2012-10-27 18:31:34 +11:00
Simone Bordet
605b0360e1 HTTP client: reviewed API.
The API were inconsistent: sometimes using the C format for getters and setters
(e.g. String host(), void host(String)), sometimes using the JavaBeans format.

Now the API stick with the JavaBean format apart the "fluent" API in Request,
that is in the fluent format (i.e. C setter format, but returning this instead of void).
2012-10-26 23:42:18 +02:00
Simone Bordet
5e7f6988e4 HTTP client: introduced InputStreamContentProvider. 2012-10-26 17:40:28 +02:00
Simone Bordet
6ef412b776 Fixed case of writing a zero-length buffer that is not the last content:
we should return FLUSH instead of DONE, waiting for the last content flag.
2012-10-26 17:39:57 +02:00