Commit Graph

1017 Commits

Author SHA1 Message Date
Greg Wilkins 67b5caadbb jetty-9 cleaned up serverClasses to minimum 2012-11-19 17:42:52 +11:00
Greg Wilkins 97d2130a8f jetty-9 no debugging checked in 2012-11-19 15:08:53 +11:00
Greg Wilkins 4ff9bdc54d jetty-9 alternative websocket discovery 2012-11-15 21:23:43 +11:00
Joakim Erdfelt deed4e3db1 Fixing license header 2012-11-13 14:56:10 -07:00
Joakim Erdfelt d229364f9d Fixing jetty-osgi for new websocket artifacts 2012-11-13 12:50:27 -07:00
Joakim Erdfelt 169498cd9d Fixing Frame Decompress to work in Chrome 20.x 2012-11-12 20:52:54 -07:00
Joakim Erdfelt d67fdfdd85 Splitting out websocket-servlet to make it more friendly for WebAppClassloader 2012-11-12 19:42:32 -07:00
Joakim Erdfelt 42ec683297 Merge from 'master' to 'ws-refactor' 2012-11-12 16:22:11 -07:00
Joakim Erdfelt 80f5fa1a18 Attempting to get Mux sub-channel to flow thru server as well 2012-11-12 16:02:41 -07:00
Joakim Erdfelt dd0b1a39b8 Stubbing out mux client/server specific pieces 2012-11-12 16:02:41 -07:00
Joakim Erdfelt 884f1a3eff New ExtensionStack to manage Extensions easier and more consistently 2012-11-12 16:02:05 -07:00
Joakim Erdfelt 8548331735 Ripping out javax.net.websocket.extension.* SPI as it is going away 2012-11-12 12:36:39 -07:00
Greg Wilkins f336511f87 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	VERSION.txt
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
2012-11-08 14:58:10 +11:00
Greg Wilkins b3274a6baa Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	VERSION.txt
2012-11-08 14:41:01 +11:00
Greg Wilkins eaf65a2902 393075 1xx 204 and 304 ignore all headers suggesting content 2012-11-08 14:37:07 +11:00
Joakim Erdfelt 09625a64e2 Adding more diagrams for javax.net.websocket layers 2012-11-07 12:01:25 -07:00
Joakim Erdfelt 802e97e6fb Removing WebSocketClient.getConnection() as inappropriate 2012-11-07 11:00:46 -07:00
Joakim Erdfelt 4a8a1228fc Moving client-side mux specifics to internal 2012-11-07 06:06:08 -07:00
Joakim Erdfelt 473ff032ae Promoting ClientUpgradeRequest and ClientUpgradeResponse to non-internal use 2012-11-07 06:05:36 -07:00
Joakim Erdfelt fc371fc7e6 UpgradResponse headers are now case insensitive 2012-11-06 17:07:55 -07:00
Joakim Erdfelt 9be64bab11 Making changes to client / server from api / common 2012-11-06 16:58:54 -07:00
Joakim Erdfelt 414f964afd Making changes to client / server from api / common 2012-11-06 16:58:49 -07:00
Joakim Erdfelt a7968c07be Rolling Extension and ExtensionConfig change into rest of websocket-common 2012-11-06 15:51:23 -07:00
Joakim Erdfelt 11ff35ccbb Adding missing @Override's 2012-11-06 15:50:27 -07:00
Joakim Erdfelt e625689a1c Using Extension interface, not AbstractExtension 2012-11-06 15:49:57 -07:00
Joakim Erdfelt b6a4e04b38 Removing RequestedExtensionConfig in favor of new ExtensionConfig class implementation in .api 2012-11-06 15:49:16 -07:00
Joakim Erdfelt 48e0cf1fb7 Consolidating duplicate functionality of ExtensionRegistry and ExtensionFactory 2012-11-06 15:48:44 -07:00
Joakim Erdfelt 3d94916790 Making ExtensionConfig an object, not an interface 2012-11-06 15:47:31 -07:00
Joakim Erdfelt 5eb5eb818f Brining over important getters for jetty Extension 2012-11-06 15:46:49 -07:00
Joakim Erdfelt 000cfe6986 Fixing UpgradeRequest / UpgradeResponse hierarchy. 2012-11-06 15:45:13 -07:00
Joakim Erdfelt 57c97505c8 Removing providedon javax.net.websocket 2012-11-06 15:42:06 -07:00
Joakim Erdfelt 17c6e04f47 Making rest of the modules use websocket-common (instead of old websocket-core) 2012-11-05 17:58:06 -07:00
Joakim Erdfelt 2e3447f6ef Making .common pass all existing tests 2012-11-05 17:57:39 -07:00
Joakim Erdfelt b37bd2b665 Exclude Continuations from Frame.Type 2012-11-05 17:57:04 -07:00
Joakim Erdfelt 053f91c8a0 Refactoring .core to .common and updating for .api 2012-11-05 17:18:44 -07:00
Joakim Erdfelt c1ce7780a6 Updating rest for websocket-api 2012-11-05 12:01:42 -07:00
Joakim Erdfelt eb2e42d402 Updating jetty-websocket-api classes 2012-11-05 12:01:26 -07:00
Jesse McConnell bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell 1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell 70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell 017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00
Jesse McConnell eac9414f01 Merge branch 'jetty-7' into jetty-8 2012-11-05 11:52:18 -06:00
Joakim Erdfelt 53f1892f7b Fixing license header 2012-11-05 10:40:20 -07:00
Jan Bartel f3af8c8650 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-05 16:28:25 +11:00
Greg Wilkins 36ddd3f5d6 393368 min websocket version 2012-11-05 11:02:50 +11:00
Joakim Erdfelt d19f177cae First step 2012-11-02 11:42:44 -07:00
Joakim Erdfelt e310b0a0ec Attempting to get Mux sub-channel to flow thru server as well 2012-11-02 11:20:36 -07:00
Joakim Erdfelt 949996931a Fixing license (for check plugin) 2012-11-01 21:25:25 -07: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