Commit Graph

1300 Commits

Author SHA1 Message Date
Joakim Erdfelt e5655fc2cd JSR-356 tweaking use of configureContext 2013-07-26 14:10:03 -07:00
Joakim Erdfelt 6029826aa4 JSR-356 using Spec 6.4 properly for access to ServerContainer 2013-07-26 14:04:17 -07:00
Joakim Erdfelt 6076e05bf6 JSR-356 fixing oddly worded exception 2013-07-26 14:04:17 -07:00
Joakim Erdfelt ca23911075 JSR-356 - Changing to ServerContainer access.
+ Using technique as outlined in JSR-356 spec, Section 6.4
2013-07-26 14:04:17 -07:00
Joakim Erdfelt daac0e6784 JSR-356 Adding etc/jetty-websockets.xml for JSR configuration 2013-07-25 09:59:34 -07:00
Joakim Erdfelt b549410932 JSR-356 - Making WebSocketUpgradeFilter an attribute in the ServletContext 2013-07-25 09:43:47 -07:00
Joakim Erdfelt d7d4e415ea JSR-356 - making use of ServiceLoader technique for finding Extensions 2013-07-24 14:46:59 -07:00
Joakim Erdfelt d967dafe45 JSR-356 - Refactoring Annotated method parameter detection and use 2013-07-24 12:32:15 -07:00
Joakim Erdfelt 70a57f223f Expanding EchoCase.toString 2013-07-24 12:32:15 -07:00
Joakim Erdfelt e69b41e9cd JSR-356 Adding suppport for @PathParam 2013-07-16 16:56:03 -07:00
Joakim Erdfelt ba50e6b053 JSR-356 Adding echo tests on primitives 2013-07-16 14:05:59 -07:00
Joakim Erdfelt fb00eb55cd JSR-356 Promoting ReflectUtils to websocket-common 2013-07-16 10:43:27 -07:00
Joakim Erdfelt 05c5342752 JSR-356 Improving MessageHandler manipulation 2013-07-15 16:00:02 -07:00
Joakim Erdfelt 9a8580b580 JSR-356 Improving Debugging of Annotated EventDrivers 2013-07-15 15:59:22 -07:00
Joakim Erdfelt 2f01bdcdec JSR-356 fixing javadoc describing class 2013-07-15 14:26:14 -07:00
Joakim Erdfelt 179a78e502 JSR-356 Promoting UpgradeRequest.getUserPrinicpal() to API 2013-07-15 11:49:30 -07:00
Joakim Erdfelt 6bd2f8fd3e JSR-356 - Fixing StackOverflowError on Session.getProtocolVersion() 2013-07-15 11:39:56 -07:00
Joakim Erdfelt 2362a4e8b3 JSR-356 - Handling ClientContainer.setMax(Text|Binary)MessageBufferSize better
+ The Jetty API is more configurable than the JSR, this forces the
   Jetty side API to be consistent for whatever value the end user
   specifies.
2013-07-15 10:43:39 -07:00
Joakim Erdfelt b3aee8e4d5 JSR-356 - fixing NPE on Extension.getParameters() 2013-07-15 10:43:39 -07:00
Joakim Erdfelt 5d45486b8d JSR-356 - Cleaning up sendObject(Object) behavior between Basic & Async 2013-07-15 10:43:39 -07:00
Greg Wilkins 987aa846cc 398467 Servlet 3.1 Non Blocking IO
ensure that EOF is checked after all calls to nextContent
2013-07-15 14:28:22 +10:00
Jan Bartel bd2add0ae9 Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release. 2013-07-12 13:53:58 +10:00
Joakim Erdfelt ce37be598c JSR-356 fixing Reader and Boolean parameter id detection. 2013-07-11 11:29:46 -07:00
Joakim Erdfelt 495d2bcd74 JSR-356 - Fixing @OnMessage message format/decoder detection 2013-07-11 11:00:23 -07:00
Joakim Erdfelt 022b8d4a12 JSR-356 - adding more examples of using Primitives for @OnMessage 2013-07-10 16:35:50 -07:00
Joakim Erdfelt 5bb66f028a Dialing back the logging level 2013-07-10 11:53:14 -07:00
Joakim Erdfelt 33c11dffaa JSR-356 - cleaning up Decoder and Encoder lifecycle. 2013-07-09 14:16:06 -07:00
Joakim Erdfelt 46e9493c85 JSR-356 - reworked Config to maintain user provided config
+ If a user provided config is supplied, then that config should
  be used for init(EndpointConfig) and other various accesses to
  the configuration object.  This refactor stops using an internal
  EndpointConfig object always and moves the internal config
  fields into the JsrSession object instead.
2013-07-09 14:16:06 -07:00
Greg Wilkins 981102fda5 398467 Servlet 3.1 Non Blocking IO
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
Joakim Erdfelt 0cf6977a35 JSR-356 - fixing reflected detection of interface generic class type.
+ Used by Decoders, Encoders, and MessageHandlers
2013-06-27 09:28:02 -07:00
Greg Wilkins e4716e05e1 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	aggregates/jetty-all/pom.xml
	examples/async-rest/async-rest-jar/pom.xml
	examples/async-rest/async-rest-webapp/pom.xml
	examples/async-rest/pom.xml
	examples/embedded/pom.xml
	examples/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/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/jetty-osgi-npn/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/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-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-server/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/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-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-06-27 09:12:28 +10:00
Joakim Erdfelt 78b5f7df1f [maven-release-plugin] prepare for next development iteration 2013-06-25 08:29:26 -07:00
Joakim Erdfelt 5f2c937fcb [maven-release-plugin] prepare release jetty-9.0.4.v20130625 2013-06-25 08:29:18 -07:00
Joakim Erdfelt 31faf2fe20 Reverting failed release from friday 2013-06-25 07:42:45 -07:00
Joakim Erdfelt 1a190a176e Making testcase more consistent 2013-06-25 07:38:26 -07:00
Jesse McConnell 8927c18840 reset versions for release 2013-06-21 15:28:26 -05:00
Jesse McConnell 018a51a04e Merge branch 'master' into release-9 2013-06-21 15:18:46 -05:00
Joakim Erdfelt ebe98022ab Making autobahn server disconnect happy 2013-06-21 12:46:10 -07:00
Joakim Erdfelt 73fd838b41 Addressing WebSocket server side disconnect issue that autobahn found 2013-06-21 12:10:06 -07:00
Jesse McConnell 57bfda2a08 [maven-release-plugin] prepare for next development iteration 2013-06-21 09:49:25 -05:00
Jesse McConnell c1082ad4d4 [maven-release-plugin] prepare release jetty-9.0.4.v20130621 2013-06-21 09:49:15 -05:00
Jan Bartel 4f6732a7e9 Use dependencyManagement to control servlet-api and jsp related jars; update to latest servlet-api and el jars post spec finalization. 2013-06-21 18:41:35 +10:00
Joakim Erdfelt 9959bbd946 JSR-356 - allow WebSocketContainer.connectToServer(Class<?>, URI) to work with classes that extend Endpoint (not just annotated classes) 2013-06-20 12:11:52 -07:00
Joakim Erdfelt 89b22d0c90 Adding timeouts on problematic tests to prevent CI abort 2013-06-19 20:53:23 -07:00
Joakim Erdfelt 25a0639463 Updating version to 9.1 2013-06-19 15:26:53 -07:00
Joakim Erdfelt f8c457f75e Merge branch 'jetty-9.1' into javawebsocket-jsr 2013-06-19 15:07:15 -07:00
Joakim Erdfelt bae9f3dc6a Bumping up to released javax.websocket artifacts 2013-06-18 13:11:45 -07:00
Joakim Erdfelt 931cfa10ce Merge branch 'master' into javawebsocket-jsr
Conflicts:
	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java
2013-06-18 12:41:20 -07:00
Joakim Erdfelt 43867ff075 Reworking SSL tests 2013-06-18 08:37:16 -07:00
Joakim Erdfelt a6ef027232 Finish reverting change to ServletUpgradeRequest from websocket-ssl branch that was missed 2013-06-18 07:05:35 -07:00