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
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
ce37be598c
JSR-356 fixing Reader and Boolean parameter id detection.
2013-07-11 11:29:46 -07:00
495d2bcd74
JSR-356 - Fixing @OnMessage message format/decoder detection
2013-07-11 11:00:23 -07:00
022b8d4a12
JSR-356 - adding more examples of using Primitives for @OnMessage
2013-07-10 16:35:50 -07:00
5bb66f028a
Dialing back the logging level
2013-07-10 11:53:14 -07:00
33c11dffaa
JSR-356 - cleaning up Decoder and Encoder lifecycle.
2013-07-09 14:16:06 -07:00
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
981102fda5
398467 Servlet 3.1 Non Blocking IO
...
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
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
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
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
31faf2fe20
Reverting failed release from friday
2013-06-25 07:42:45 -07:00
1a190a176e
Making testcase more consistent
2013-06-25 07:38:26 -07:00
8927c18840
reset versions for release
2013-06-21 15:28:26 -05:00
018a51a04e
Merge branch 'master' into release-9
2013-06-21 15:18:46 -05:00
ebe98022ab
Making autobahn server disconnect happy
2013-06-21 12:46:10 -07:00
73fd838b41
Addressing WebSocket server side disconnect issue that autobahn found
2013-06-21 12:10:06 -07:00
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
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
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
89b22d0c90
Adding timeouts on problematic tests to prevent CI abort
2013-06-19 20:53:23 -07:00
25a0639463
Updating version to 9.1
2013-06-19 15:26:53 -07:00
f8c457f75e
Merge branch 'jetty-9.1' into javawebsocket-jsr
2013-06-19 15:07:15 -07:00
bae9f3dc6a
Bumping up to released javax.websocket artifacts
2013-06-18 13:11:45 -07:00
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
43867ff075
Reworking SSL tests
2013-06-18 08:37:16 -07:00
a6ef027232
Finish reverting change to ServletUpgradeRequest from websocket-ssl branch that was missed
2013-06-18 07:05:35 -07:00
be2cf578ce
400503 - WebSocket - squelch legitimate Exceptions during testing to avoid false positives
2013-06-17 16:34:21 -07:00
2da8c9c306
Merge branch 'master' into javawebsocket-jsr
...
Conflicts:
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
2013-06-17 10:54:10 -07:00
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
5c7f6937fd
Giving a different test more time to complete on busy machines
2013-06-14 14:12:04 -07:00
64a6d6f0bb
Giving test more time to complete on busy machines
2013-06-14 13:45:24 -07:00
b3c32651ff
Merge branch 'master' into websocket-ssl
2013-06-14 11:40:02 -07:00
ce68faf9aa
Reverting incompatible API change to WebSocketCreator.
...
+ Added javadoc about casting of parameters and note about
future change to API (possibly in 9.1)
2013-06-14 11:39:14 -07:00
e4fb7fd397
Removing class that is annoying to simone.
2013-06-14 09:54:03 -07:00
4a2b6ec596
405313 - Websocket client SSL hostname verification is broken, always defaults to raw IP as String
...
+ After discussion with simone, we have changed from using IP address to
hostnames in both websocket and spdy.
2013-06-14 09:40:49 -07:00
f092eeb94c
Making error message on Session.getRemote() more clear about connection state
2013-06-14 09:27:18 -07:00
f34ac9b920
Fixing parseProtocols
2013-06-14 07:40:02 -07:00
83bd15559b
Merge branch 'master' into websocket-ssl
...
Conflicts:
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
2013-06-13 16:05:26 -07:00
eddb49941d
[Bug 408600] set correct jetty.url in all pom files
2013-06-12 15:52:36 -05:00
a535381b53
410537 - Exceptions during @OnWebSocketConnect not reported to @OnWebSocketError
...
+ Fixed EventDriver behavior with regards to unhandled throwables during
calls to the various onMethod() calls
+ Adding testcase to verify intended behavior
2013-06-12 11:05:01 -07:00
a6f50006ee
410372 - Make SSL client certificate information available to server websockets
2013-06-11 12:51:53 -07:00
7b79b4c5f9
410370 - WebSocketCreator.createWebSocket() should use servlet specific parameters
...
+ Changing method signature of
Object createWebSocket(UpgradeRequest req, UpgradeResponse resp)
to
Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp)
2013-06-11 11:22:24 -07:00
4cd1bd8ce4
Merge branch 'master' into websocket-ssl
2013-06-11 08:58:32 -07:00
536b8d9504
410469 - UpgradeRequest is sent twice when using SSL, one fails warning about WritePendingException
...
+ Removing manual connectionOpened() in favor of letting endpoint notify.
2013-06-11 08:56:53 -07:00
ae9a776d06
410386 - WebSocket Session.getUpgradeRequest().getRequestURI() returns bad URI on server side
...
+ Prior commit fixed this
+ Adding test to prevent regression in the future
2013-06-10 14:20:14 -07:00
e61c161ebd
410175 - WebSocketSession#isSecure() doesn't return true for SSL session on the server side
...
+ Fixing server side support for Session.isSecure()
+ Standardizing the WSURI translation into new
org.eclipse.jetty.websocket.api.util.WSURI class
+ Adding testcase for SSL on server side
2013-06-10 13:48:18 -07:00
d2794584e1
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00
dc0a8a5d40
JSR-356, fixing build
2013-06-05 17:36:23 -07:00
ffceb642c5
JSR-356 cleaning up MessageInputStream and MessageReader
2013-06-05 10:34:38 -07:00
b01e6432a5
Merge branch 'master' into javawebsocket-jsr
2013-06-05 10:20:50 -07:00
82b5acb0cf
409978 - Websocket shouldn't create HttpSession if not present
...
+ Preventing creation of HttpSession
+ Adding Local/Remote address information lookup in
ServletWebSocketRequest
2013-06-05 09:22:23 -07:00
3f3b9fda61
JSR-356 attempting to rethink the InputStream handling
2013-06-04 15:10:44 -07:00
c872b95c04
JSR-356 more work on supporting Streams
2013-05-30 16:25:38 -07:00
4c455e4f9b
JSR-356 - cleaning up Writer support
...
+ Eliminating AppendableByteBuffer in favor of direct CharBuffer use
+ Renaming Utf8ByteBuffer to Utf8CharBuffer to better suit usage
2013-05-28 15:09:48 -07:00
eaf8e46570
JSR-356 - Adding Writer support.
...
+ Introducing AppendableByteBuffer and Utf8ByteBuffer
+ Adding MessageWriter implementation based on Utf8ByteBuffer
2013-05-28 12:51:50 -07:00
48dea3bb1d
JSR-356 adding basic MessageOutputStream support for writing to an OutputStream
2013-05-23 15:51:40 -07:00
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
97854b6c5b
JSR-356 adding support for ClientEndpointConfig.Configurator
2013-05-22 15:15:05 -07:00
598ecd7d7f
Merge branch 'master' into javawebsocket-jsr
2013-05-22 09:25:06 -07:00
dd3a918136
408118 - NullPointerException when parsing request cookies
...
+ Added NPE guard for non-Jetty containers.
2013-05-21 11:34:56 -07:00
f403a1e185
407386 - Cookies not copied in ServletWebSocketRequest
...
+ Adding missing to super.setCookies()
+ Adding test case to prevent regression
2013-05-21 11:34:56 -07:00
5397f16559
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-17 14:09:17 +10:00
b22d280e2a
398467 Servlet 3.1 Non Blocking IO
...
Cleaned up exceptions and HttpOutput.write
2013-05-16 19:00:00 +10:00
cbac0ea5fa
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-16 07:24:49 +10:00
4dd80e9128
398467 Servlet 3.1 Non Blocking IO
...
More refinements to avoid duplicate code and optimise common paths
2013-05-14 17:52:46 +10:00
ceabca5fbe
Merge branch 'master' into javawebsocket-jsr
2013-05-11 07:16:49 -07:00
34b28503e6
Removing rogue src file from jetty 7/8 merge
2013-05-11 07:16:34 -07:00
6d73ab86dd
Using released version of test-helper
2013-05-10 14:35:14 -07:00
61ce6583bc
Adding more info to api diff report
2013-05-09 15:39:13 -07:00
b71140d4b9
Adding clirr for reporting api differences
2013-05-09 14:46:47 -07:00
ce0435e099
Cleaning up test output
2013-05-09 14:29:59 -07:00
9f82849900
Merge from [master] to [javawebsocket-jsr]
2013-05-09 12:10:57 -07:00
2fb23e705c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
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-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-spec-webapp/src/main/java/com/acme/AnnotationTest.java
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-05-09 11:29:45 +10:00
4a95621c8b
Creating basic websocket-client examples
2013-05-08 14:18:23 -07:00
c114e925ef
Using subprotocols (its more websockety) in example instead
2013-05-08 12:31:48 -07:00
3fa029ed88
Using query parameters in example instead
2013-05-08 12:26:51 -07:00
281f150831
Adding more websocket servlet examples
2013-05-08 12:22:37 -07:00
63c7556c2a
407469 - Method parameters for @OnWebSocketError should support Throwable
...
+ Simple javadoc fix, code already uses Throwable.
2013-05-08 11:27:51 -07:00
f92aab9b88
407470 - Javadoc for @OnWebSocketFrame incorrectly references WebSocketFrame object
...
+ Simple javadoc change, code already uses Frame, not WebSocketFrame.
2013-05-08 11:27:51 -07:00
08161b5bf7
Cleaning up examples for doc
2013-05-08 11:27:51 -07:00
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
f2528642d9
Making Jetty WebSocket API Echo Examples more consistent (for doc)
2013-05-06 13:47:28 -07:00
e7ecfd2b2b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
9ad5ab1ed5
406449 - Session's disconnect not detected
...
+ Vastly cleaned up IOState and ConnectionState behavior
2013-04-30 15:54:41 -07:00
ef77b854fa
404911 - WebSocketCloseTest fails spuriously
...
+ Renabling test
+ Using EventQueue from jetty-test-helper instead
+ Standarizing HttpResponseHeaderParser into websocket-common so that
remaining bytebuffer logic is maintained in one place.
+ Making BlockingClient also use HttpResponseHeaderParser
2013-04-26 15:37:46 -07:00
092a91008c
JSR-356 fixing EndpointConfig use with extends Endpoint
2013-04-26 09:30:02 -07:00
c91c3f2f60
JSR-356: adding WebSocketConfiguration and reworking ServerContainer init
2013-04-24 14:33:46 -07:00
a4644dc780
JSR-356 working out server endpoint creation
2013-04-23 11:06:01 -07:00
7c0f30fc2c
Bumping up version to 9.0.3-SNAPSHOT
2013-04-22 11:03:25 -07:00
9463eee427
Merge branch 'master' into javawebsocket-jsr
2013-04-19 09:25:03 -07:00
a7073d05a6
updated version to 9.1.0-SNAPSHOT
2013-04-19 13:59:18 +10:00
d34bd7aec7
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-18 12:16:24 +10:00
754dfa979e
JSR-356: adding example of mixed pathspec
2013-04-17 14:25:47 -07:00
df77322ff1
JSR-356: Reworking PathSpec
2013-04-17 13:54:14 -07:00
43459d4b33
Adding benchmark for PathMappings
2013-04-17 11:17:27 -07:00
7baaa14ba1
[maven-release-plugin] prepare for next development iteration
2013-04-17 11:46:39 -05:00
e390b54b25
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
2013-04-17 11:46:31 -05:00
119a1bb1cf
Guarding ExtensionStack.toString() from NPE
2013-04-17 10:54:19 -05:00
b2e675ebad
Merge branch 'master' into javawebsocket-jsr
2013-04-17 07:16:03 -07:00
824675d072
Guarding ExtensionStack.toString() from NPE
2013-04-16 06:49:33 -07:00
1f45b3678b
Updating version
2013-04-15 12:39:15 -07:00
2ae436f803
Fixing missing license
2013-04-15 12:39:03 -07:00
8088edc96c
Merge branch 'master' into javawebsocket-jsr
2013-04-15 12:12:25 -07:00
fe25ef0454
JSR-356 working on server handlers
2013-04-15 12:11:57 -07:00
0b20467c6f
[maven-release-plugin] prepare for next development iteration
2013-04-15 11:40:45 -05:00
3aa4301711
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
2013-04-15 11:40:37 -05:00
db21b42b4f
Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds).
2013-04-15 17:44:35 +10:00
07b844bf85
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-11 15:55:04 +10:00
dc5480aafe
JSR-356: adding more PathParamSpec tests and fixes
2013-04-10 16:51:47 -07:00
36f0cf41ff
JSR-356 initial pass at PathParam based PathSpec
2013-04-09 16:13:54 -07:00
e0d353629f
JSR-356 - updates to Session tracking and start of PathMappings
...
+ Refactored websocket-commons Session creation to be factory based
+ Introduced new org.eclipse.jetty.websocket.common.SessionFactory
+ Made websocket-client and websocket-server use new SessionFactory
+ Introduced JsrSessionFactory to allow for consistent Session creation
even in the Jsr (no more duplciate Session creation)
+ Using JsrSessionFactory in javax-websocket-client-impl
+ Introducing PathMappings to hopefully replace jetty-util's PathMap
+ Using standard ClientEndpointConfig when appropriate.
+ Introducing JettyClientEndpointConfig for annotation based
configurations
+ Renaming EchoSocket used in javax.websocket client testing to
JettyEchoSocket to better indicate that its the Jetty server side
implementation and not the javax.websocket client side socket.
+ Changed IncomingFrames.incomingError() parameter from
WebSocketException to Throwable to match behavior on the JSR
2013-04-09 11:21:59 -07:00
b8dd8bde14
[maven-release-plugin] prepare for next development iteration
2013-04-08 12:31:34 +10:00
bf3771904b
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
2013-04-08 12:30:59 +10:00
4dea484853
Merge branch 'master' into javawebsocket-jsr
2013-04-04 12:03:30 -07:00
d1692733f5
JSR-356: MessageHandler(s) layer
2013-04-04 12:03:11 -07:00
024936c2de
Temporarily ignoring this test that fails spuriously (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=404911 ).
2013-04-04 17:11:01 +02:00
72219d016b
404610 - Reintroduce ability to disallow TLS renegotiation.
2013-04-04 17:11:01 +02:00
7523c5234c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-jsp/pom.xml
2013-04-04 13:31:33 +11:00
3a66b3ec3f
JSR-356 first working annotated @ClientEndpoint echo test
2013-03-28 10:51:45 -07:00
fc7526b739
[JSR-356] Refactoring annotated callables to handle any-order rule
2013-03-26 17:30:49 -07:00
3c59f15a5c
Some basic @ServerEndpoint scanning tests
2013-03-25 09:56:04 -07:00
725887620c
Some basic @ServerEndpoint scanning tests
2013-03-25 09:56:01 -07:00
a498107c42
Parameter identification refactor + Decoder and PathParam integration
2013-03-22 13:18:02 -07:00
0bab7b2c6d
reverting dispatched session open
2013-03-22 13:18:02 -07:00
bf335f496d
403817 - Use of WebSocket Session.close() results in invalid status code
...
+ Fixing WebSocketSession.close() to delgate NORMAL close properly
2013-03-22 13:18:02 -07:00
54fd961354
403380 - Introduce WebSocketTimeoutException to differentiate between EOF on write and Timeout
2013-03-22 13:18:02 -07:00
04d86bd49e
402984 - WebSocket Upgrade must honor case insensitive header fields in upgrade request
2013-03-22 13:18:02 -07:00
bfb92dc18b
reverting dispatched session open
2013-03-21 07:13:16 -07:00
23ce4235d8
403817 - Use of WebSocket Session.close() results in invalid status code
...
+ Fixing WebSocketSession.close() to delgate NORMAL close properly
2013-03-20 09:28:07 -07:00
dd4394aa77
403380 - Introduce WebSocketTimeoutException to differentiate between EOF on write and Timeout
2013-03-19 12:05:29 -07:00
4d52c3ca8e
402984 - WebSocket Upgrade must honor case insensitive header fields in upgrade request
2013-03-19 11:28:23 -07:00
96df602e9e
Initial pass at fixing build for websocket PFD
2013-03-18 16:50:07 -07:00
8ec9ac4d64
Merge branch 'master' into javawebsocket-jsr
2013-03-18 13:32:08 -07:00
279dff381c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-osgi/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlets/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
2013-03-18 16:00:23 +11:00
8a9f1f94e8
403373 - WebSocket change timeout log level from warn -> info
2013-03-14 10:00:02 -07:00
fd8f2b9753
Merge from [master] -> [javawebsocket-jsr]
2013-03-11 10:57:08 -07:00
897c35c2cb
[maven-release-plugin] prepare for next development iteration
2013-03-08 11:33:23 -07:00
cc6196af50
[maven-release-plugin] prepare release jetty-9.0.0.v20130308
2013-03-08 11:33:15 -07:00
f01e4f0b2c
402757 - WebSocket client module can't be used with WebSocket server module in the same WAR.
...
Introduced a shaded artifact that relocates the websocket-common classes, so they cannot
be shared with the server.
The shaded artifact has classifier "hybrid", and users will need to exclude the websocket-common
dependency manually when using the classified artifact.
2013-03-08 19:05:48 +01:00
7fc38f6c0f
[maven-release-plugin] prepare for next development iteration
2013-03-07 19:14:19 -07:00
96d045442f
[maven-release-plugin] prepare release jetty-9.0.0.v20130307
2013-03-07 19:14:11 -07:00
778ee1411b
[maven-release-plugin] prepare for next development iteration
2013-03-06 10:21:46 -06:00
d916078711
[maven-release-plugin] prepare release jetty-9.0.0.v20130306
2013-03-06 10:21:38 -06:00
3be67fa5d1
402008 - Websocket blocking write hangs when remote client dies (or is killed) without going thru Close handshake
...
+ Fixing close and callback failure notificiations to address issues
with suddenly killed clients.
2013-03-05 13:54:23 -07:00
2d74857ffa
402008 - Strange behavior when clients are suddenly killed
...
+ Fixing close and callback failure notificiations to address issues
with suddenly killed clients.
2013-03-05 13:11:50 -07:00
79630de1f1
402148 - Update Javadoc for WebSocketServlet for new API
2013-03-01 09:31:29 -07:00
9e78529a17
402154 - WebSocket / Session.setIdleTimeout(ms) should support in-place idle timeout changes
...
+ Made WebSocketSession delegate idle timeouts to LogicalConnection,
that way the EndPoint or Mux can manage the idle timeout accordingly.
2013-03-01 09:24:03 -07:00
e6fed09129
402075 - Massive old gen growth when hit by lots of non persistent connections.
...
Replaced usages of TimerScheduler with ScheduledExecutorScheduler.
2013-03-01 15:19:51 +01:00
c4af34d4e1
Adding smaller example of the WebSocketCreator use
2013-02-27 08:54:01 -07:00
370bdafc15
Reverting direct ByteBuffer commits
...
+ Reverting commit : 5621f87c81bbcf0c77b8
2013-02-26 10:41:40 -07:00
29b2118870
[maven-release-plugin] prepare for next development iteration
2013-02-26 09:20:45 -07:00
2b82b54f6d
[maven-release-plugin] prepare release jetty-9.0.0.RC2
2013-02-26 09:20:45 -07:00
42475b1564
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-02-26 12:50:30 +11:00
283cd58147
Merge branch 'jetty-7' into jetty-8
2013-02-25 16:54:16 -07:00
2ed0dc8fff
Fixing websocket testcase
2013-02-25 16:53:32 -07:00
7a2b775f03
Reducing log noise
2013-02-23 16:44:49 -07:00
bbcf0c77b8
Switching to direct ByteBuffers
2013-02-23 16:44:49 -07:00
5621f87c81
Switching to direct ByteBuffers
2013-02-23 16:44:49 -07:00
dbf3662f90
Refinement of factorymethod approach in WebSocketClient (for cometd to use)
2013-02-22 10:49:49 -07:00
12814b02ed
Making WebSocketClient connection stuff pluggable via factory methods
2013-02-22 10:43:47 -07:00
e95301b906
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/SafariD00.java
2013-02-22 18:37:29 +11:00
95f166b374
Merge branch 'jetty-7' into jetty-8
2013-02-21 17:34:19 -07:00
c7dd114cb6
401317 - Make Safari 5.x websocket support minVersion level error more clear
...
+ Making error message about minVersion configurable more clear on both
the Logging on the server side, and the HTTP/1.1 400 error response
line
2013-02-21 17:23:17 -07:00
61470cde2e
401427 - WebSocket messages sent from onConnect fail to be read by jetty websocket-client
...
+ Adding carryover of bytes remaining from UpgradeConnection to
AbstractWebSocketConnection.parser
2013-02-21 15:32:37 -07:00
660f6d2e85
399520 - Websocket Server Connection needs session idle timeouts
2013-02-21 08:21:01 -07:00
246db2b08d
401177 - Make org.eclipse.jetty.websocket.api.WebSocketAdapter threadsafe
...
+ Making some subtle changes to address thread safety of the WebSocketAdapter
2013-02-21 07:30:28 -07:00
22fe9d419e
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Rounding out the Encoders / Decoders base implementation
2013-02-20 15:58:04 -07:00
54a4818511
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Defining Decoders and Encoders
+ Trying to work out the Type assignment matching for Decoders
2013-02-19 16:24:34 -07:00
6e5ab19c58
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Trying to noodle out the @WebSocketMessage validation with Decoders in
the mix
2013-02-15 14:33:15 -07:00
7d1f774c0e
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Adding support for @WebSocketClient method scanning of
@WebSocketOpen
@WebSocketClose
@WebSocketError
2013-02-15 12:26:35 -07:00
820e20f042
Fixing license headers
2013-02-15 10:03:14 -07:00
2faba0bf4b
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Start of @WebSocketClient class/method scanning with tests
2013-02-14 16:24:07 -07:00
4fb1bc80da
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Refactoring EventDriver to be more pluggable (for jsr endpoints)
2013-02-13 13:37:26 -07:00
43231d8451
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Restarting branch, copying over work from November with new JSR-356
Draft 012 api in mind.
2013-02-12 16:19:35 -07:00
9ae3c94b22
399520 - Websocket needs session idle timeouts
...
+ Integrated suggestions about AbstractConnection.onReadTimeout()
+ Enabled tests on client side
2013-02-12 13:51:06 -07:00
ebaffcfd27
399535 - Websocket-client connect should have configurable connect timeout
...
+ Made default value for connectTimeout be exposed from SelectorManager.
+ Added javadoc on time unit.
2013-02-12 12:56:46 -07:00
5c68d23138
400512 - ClientUpgradeRequet.addExtension() should fail if extension is not installed
2013-02-12 11:37:16 -07:00
4daba06175
400255 - Using WebSocket.maxMessageSize results in IllegalArgumentException
...
+ Adding testcase that replicated failure reported in issue
+ Fixing AnnotatedEventDriver error with input size
+ Fixing WebSocketSession detection of isOpen()
+ Fixing BigEchoSocket test for session.isOpen()
2013-02-11 16:50:01 -07:00
d505f481a4
400255 - Using WebSocket.maxMessageSize results in IllegalArgumentException
2013-02-11 16:24:13 -07:00
4dc3ed38c2
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
ed24f78498
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:36 -07:00
e073ceb06d
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
2f2ad287af
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:35 -07:00
b810ce6535
Adding synchronize for multi-threaded write concerns
2013-02-01 09:20:33 -07:00
89d8972e74
399689 - Websocket RFC6455 extension handshake fails if server doesn't have extension
...
+ Fixing the fix that fixed the negotation to fix a bad fixation of the
negotiated extensions
2013-01-31 16:14:30 -07:00
552ec4ae36
399689 - Websocket RFC6455 extension handshake fails if server doesn't have extension
...
+ Correcting logic in HandshakeRFC6455 with regards to negotiated extensions
2013-01-31 15:36:30 -07:00
261809380a
395444 - Disabling Websocket Compress Extensions (not working with Chrome / deflate problem)
...
+ Adding test case example of many server messages in a row
+ Disabling various compression extensions till a solution is found
2013-01-31 12:41:20 -07:00
242f7f0f45
399568 - OSGi tests can't find websocket classes
...
+ Changing classloading in WebSocketServlet to be more OSGi friendly
2013-01-31 12:15:22 -07:00
1480f3d8fc
399669 - Remove WebSocketConnection in favor of websocket.api.Session
2013-01-31 12:09:04 -07:00
1aa6e63d25
395232 - UpgradeRequest object passed to createWebSocket() has null Session
...
+ Server side UpgradeRequest.getSession() now has HttpSession (if
it has already been created)
2013-01-31 11:26:17 -07:00
5c58878c3c
[maven-release-plugin] prepare for next development iteration
2013-01-31 11:34:38 -06:00
ebbe37294f
[maven-release-plugin] prepare release jetty-8.1.9.v20130131
2013-01-31 11:34:30 -06:00
32cb1045ba
Fixing logger name
2013-01-31 09:35:27 -07:00
a5e1e04af1
[maven-release-plugin] prepare for next development iteration
2013-01-31 08:42:20 -06:00
b7fb18fd65
[maven-release-plugin] prepare release jetty-7.6.9.v20130131
2013-01-31 08:42:12 -06:00
728201fa3e
Making Simone jubilantly happy :-)
2013-01-30 14:02:52 -07:00
b2951bdf5d
396428 - Test for WebSocket masking on client fragments per RFC 6455 Sec 5.1
2013-01-30 13:51:49 -07:00
25b0bd73a6
399516 - Websocket UpgradeException should contain HTTP Request/Response information
...
+ Added UpgradeException.requestURI and UpgradeException.responseStatusCode
2013-01-30 13:13:29 -07:00
60088fa274
399515 - Websocket-client connect issues should report to websocket onError handlers
2013-01-30 12:15:15 -07:00
f46ad8bbab
Using HttpCookieStore.Empty from jetty-util instead
2013-01-30 09:56:09 -07:00
5e8aa4eeb3
399421 - Add websocket.api.Session.disconnect() for harsh low level connection disconnect
2013-01-29 15:56:30 -07:00
cd38a7999e
399397 - websocket-client needs better upgrade failure checks
...
+ Adding checks on response status code and Connection header (along
with unit tests)
2013-01-29 14:44:56 -07:00
4f48bc7e7b
399343 - OnWebSocketConnect should use api.Session parameter instead.
...
+ Changed method signature for WebSocketListener and the various
@OnWebSocket* annotations
2013-01-29 13:22:38 -07:00
871b64cf38
Bug 399344 - Add missing @OnWebSocketError annotation
2013-01-29 13:22:38 -07:00
335611815c
399173: UpgradeRequest.getParameterMap() should never return null
...
+ Making api.UpgradeRequest never return null, but also have no logic on
how to populate the parameter map
+ Using MultiMap in websocket-client for parameter map parsing
+ Using HttpServletRequest.getParameterMap() as-is in websocket-server
+ Adding unit testing for both sides
2013-01-28 17:11:51 -07:00
7adc77a5d5
Adding -tests classifier artifacts to deploy/release to aide in quickstart documentation
2013-01-25 12:19:17 -07:00
3975ae74cb
Moving test from jetty-parent to jetty-client module
2013-01-25 12:06:17 -07:00
7211ce230e
Removing unused websocket-core files, detrius from old merge
2013-01-23 10:50:37 -07:00
bfba20565a
Removing out of date mux diagrams
2013-01-23 10:49:07 -07:00
f9cb26b5a7
Removing jsr diagrams from common, should only exist in jsr branch (for now)
2013-01-23 10:48:51 -07:00
c31f3a5501
Updating diagrams
2013-01-23 10:47:59 -07:00
2e216dddb7
Consolidating WebSocketPolicy.setMax*Size() into single setMaxMessageSize()
2013-01-18 09:27:56 -07:00
1ca0f004c3
Updated signature of setConnectTimeout(int) to setConnectTimeout(long)
...
to comply with field type and getter type.
Removed check that was throwing an exception if connect timeout was set
after start.
2013-01-18 10:35:20 +01:00
b938245b14
Adding some javadoc, cleaning up package namespaces where appropriate
2013-01-17 15:41:33 -07:00
e0b3c1b926
Making sure cookies are set
2013-01-16 15:11:57 -07:00
4660f35210
393733 - WebSocketClient interface should support multiple connections
...
+ Removing deprecated methods from Session
+ Fixing client side UpgradeConnection to handle extension via new
ExtensionStack object
+ Making ExtensionStack.getNegotiatedExtensions() return
List<ExtensionConfig> instead of List<String>
+ Fixing tests that relied on changes
2013-01-16 15:11:57 -07:00
1dfee4c992
393733 - WebSocketClient interface should support multiple connections
...
+ Reworking Connection Timeout handling
2013-01-16 15:11:57 -07:00
f20f0481b4
93733 - WebSocketClient interface should support multiple connections
...
+ Cleaning up no longer used items in WebSocketClient
+ Adding back Connect Timeout handling (unreliable atm)
+ Making ConnectPromise a FuturePromise with Runnable, no longer need
FutureTask
+ Making sure Session is properly opened
+ Removing need for EventDriver.awaitActiveSession()
2013-01-16 15:11:57 -07:00
acaa2aa4de
393733 - WebSocketClient interface should support multiple connections
...
* Initial pass at merging functions of WebSocketClientFactory into
WebSocketClient itself, eliminating the need for the factory.
* Introducing ConnectPromise to separate the connect future from
the client itself, hopefully allowing for multiple connections
from the client instance.
2013-01-16 15:11:56 -07:00
eff1262e49
398105 - Clean up WebSocketPolicy
2013-01-16 15:11:56 -07:00
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
31def06214
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
2012-12-24 19:17:00 +11:00
5b7c19e38d
Reducing test logging noise by squelching stack traces in test cases where they are expected
2012-12-21 14:22:10 -07:00
1936a0fc51
Fixing harmless NPE seen during testing.
2012-12-21 14:00:36 -07:00
0ef9b23724
Fixing end user callback failure if runtime exception occurs, renaming enque to enqueue
2012-12-19 10:06:23 -07:00
ca1c3db642
Removing WriteResult class
2012-12-14 16:12:48 -07:00
e308f843db
Replacing FrameBytes tree with WriteBytesProvider class
2012-12-14 16:12:48 -07:00
ecb472f30b
Introducing WriteBytesProvider
2012-12-14 16:12:48 -07:00
6bfc19be1b
jetty-9 optimisation to dispatch before parsing so that handling is done in same thread
2012-12-14 09:50:22 +11:00
c8c15a4063
Removing test for inputClosed on BlockheadClient to fix test failure.
2012-12-13 13:28:05 -07:00
60598c5c73
396518 - Websocket AB Tests should test for which side disconnected and closed.wasClean
...
+ adding AbstractWebSocketConnection.onWriteWebSocketClose() to allow
for different behavior between client vs server TCP disconnect logic.
2012-12-13 13:28:05 -07:00
bf3c5c7922
add in some handshake state tracking into IOState to help track who initiated closes
2012-12-13 12:18:30 -06:00
a386a46045
396518 - Websocket AB Tests should test for which side disconnected and closed.wasClean
...
* Adding stubbed out example in Fuzzer for wasClean.
2012-12-13 09:33:12 -07:00
9bbfcd7e62
More websocket threading issues
...
* Using new IOState object in AbstractWebSocketConnection to better
manage close handshake state and replies.
* Cleaning up many bad BufferPool.release() calls against ByteBuffers
that didn't arrive from BufferPool.acquire()
* Removing many ByteBuffer.wrap() calls.
* Fixing FrameCompression / MessageCompression extension handling
of ByteBuffers
2012-12-12 11:06:15 -07:00
756b13700b
Handling properly connect exceptions, notifying the failure to the websocket client.
2012-12-12 18:34:22 +01:00
f3d53918b5
Guarding against NPE if the masker is null.
2012-12-12 14:14:18 +01:00
9a71d75003
Fixing threading issue in testcase
2012-12-11 13:01:54 -07:00
d161673ff7
Add masker to client factory
2012-12-11 07:44:52 -06:00
a2a5a97bfe
add some methods to the ServletWebSocketRequest and rename one method
2012-12-10 12:16:06 -06:00
4ff9c2cea1
Setting problematic test to @Ignore
2012-12-10 10:20:48 -07:00
baaf94eeae
Fixing write of large websocket frames (25MB+)
...
+ Using ForkInvoker from util
+ Using FrameBytes logic from SPDY
+ Fixing bad flush logic
+ Fixing lazy BufferPool.release() logic
+ Fixing Buffer reuse issue
+ Fixing BlockheadServer to use ExtensionStack
+ Moving WriteResultFuture helper classes out of tests into main
+ Introducing common IOState handling for common close handshake use
2012-12-10 09:23:18 -07:00
3e151901bf
jetty-9 Use public HttpField
2012-12-08 01:41:01 +11:00
a20d984d30
jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap
2012-12-08 01:41:00 +11:00
Greg Wilkins
Jan Bartel
Joakim Erdfelt
Jesse McConnell
Simone Bordet