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
Joakim Erdfelt
be2cf578ce
400503 - WebSocket - squelch legitimate Exceptions during testing to avoid false positives
2013-06-17 16:34:21 -07:00
Joakim Erdfelt
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
Greg Wilkins
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
Joakim Erdfelt
5c7f6937fd
Giving a different test more time to complete on busy machines
2013-06-14 14:12:04 -07:00
Joakim Erdfelt
64a6d6f0bb
Giving test more time to complete on busy machines
2013-06-14 13:45:24 -07:00
Joakim Erdfelt
b3c32651ff
Merge branch 'master' into websocket-ssl
2013-06-14 11:40:02 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
e4fb7fd397
Removing class that is annoying to simone.
2013-06-14 09:54:03 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
f092eeb94c
Making error message on Session.getRemote() more clear about connection state
2013-06-14 09:27:18 -07:00
Joakim Erdfelt
f34ac9b920
Fixing parseProtocols
2013-06-14 07:40:02 -07:00
Joakim Erdfelt
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
Jesse McConnell
eddb49941d
[Bug 408600] set correct jetty.url in all pom files
2013-06-12 15:52:36 -05:00
Joakim Erdfelt
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
Joakim Erdfelt
a6f50006ee
410372 - Make SSL client certificate information available to server websockets
2013-06-11 12:51:53 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
4cd1bd8ce4
Merge branch 'master' into websocket-ssl
2013-06-11 08:58:32 -07:00
Joakim Erdfelt
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