Joakim Erdfelt
6feeab6ec3
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:58:36 -07:00
Joakim Erdfelt
7bbc0ff4df
[maven-release-plugin] rollback the release of jetty-9.1.0.v20131115
2013-11-15 16:33:52 -07:00
Joakim Erdfelt
1126e68971
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:03:28 -07:00
Joakim Erdfelt
d6418c73d4
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:03:20 -07:00
Joakim Erdfelt
6c372b9440
Reverting <version> to 9.1.0-SNAPSHOT
2013-11-15 15:36:26 -07:00
Jesse McConnell
b5345caed1
[maven-release-plugin] prepare for next development iteration
2013-11-14 15:27:52 -06:00
Jesse McConnell
1582aa196d
[maven-release-plugin] prepare release jetty-9.1.0.v20131114
2013-11-14 15:27:37 -06:00
Jesse McConnell
63f20d4518
[maven-release-plugin] prepare for next development iteration
2013-11-07 10:42:54 -06:00
Jesse McConnell
dc2fd1b9ce
[maven-release-plugin] prepare release jetty-9.1.0.RC2
2013-11-07 10:42:41 -06:00
Joakim Erdfelt
d426138d0b
Fixing logic error in max length for ByteAccumulator
2013-11-06 17:30:49 -07:00
Greg Wilkins
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
Greg Wilkins
eb3bb660b5
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
2013-11-03 18:22:09 +11:00
Mikhail Mazursky
6b0269a16d
[Bug 420930] Use Charset to specify character encoding
...
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-11-02 14:44:36 +06:00
Joakim Erdfelt
6f1eb712e9
Cleaning up imports
2013-11-01 10:03:40 -07:00
Joakim Erdfelt
50a960ef70
410656 - WebSocketSession.suspend() hardcoded to return null
2013-11-01 10:01:42 -07:00
Joakim Erdfelt
513d2ca758
Fixing @WebSocket(maxBinaryMessageSize=#} handling
2013-10-30 09:29:57 -07:00
Joakim Erdfelt
275008d207
attempting to fix occasional test failure
2013-10-23 12:19:22 -07:00
Greg Wilkins
33b10efcaa
Merge remote-tracking branch 'origin/release-9'
2013-10-14 11:12:31 +11:00
Joakim Erdfelt
180d9a55df
418792 - Session getProtocolVersion always returns null
...
+ Backporting just the getProtocolVersion from jetty 9.1
2013-10-07 16:45:21 -07:00
Jesse McConnell
856a24b65a
[maven-release-plugin] prepare for next development iteration
2013-09-30 14:46:09 -05:00
Jesse McConnell
f466f03c6a
[maven-release-plugin] prepare release jetty-9.0.6.v20130930
2013-09-30 14:46:00 -05:00
Jesse McConnell
0b3f431d27
set version back to 9.0.6-SNAPSHOT
2013-09-30 12:33:06 -05:00
Jesse McConnell
0525498ad3
[maven-release-plugin] prepare for next development iteration
2013-09-19 15:06:31 -05:00
Jesse McConnell
c05a725db6
[maven-release-plugin] prepare release jetty-9.0.6.v20130919
2013-09-19 15:06:17 -05:00
Joakim Erdfelt
5445c42ffe
417133 - WebSocket / deflate-frame should accumulate decompress byte buffers properly
...
+ Adding ByteAccumulator to make job easier and more sane (with a
minimum of byte buffer copying.
2013-09-12 13:59:15 -07:00
Joakim Erdfelt
50d98ab527
416763 - WebSocket / Jsr Session.getPathParameters() is empty
...
+ Ensuring this works as intended with new test case
2013-09-06 13:40:49 -07:00
Joakim Erdfelt
be2385276f
WebSocket / Fixing support for permessage-deflate extension
2013-08-28 11:49:54 -07:00
Joakim Erdfelt
20fbd95bf1
395444 - Websockets not working with Chrome (deflate problem)
...
+ Hopefully final fix to deflate-frame
+ Splitting out extension named 'deflate-frame' (last spec'd standard) from
'x-webkit-deflate-frame' (standard in use by chrome + safari)
2013-08-27 14:20:07 -07:00
Joakim Erdfelt
098b1e174b
WebSocket - making flush loop and callback notify more consistent
2013-08-23 10:57:05 -07:00
Greg Wilkins
bddf536caa
fixed header
2013-08-23 20:07:05 +10:00
Greg Wilkins
e4235ea070
415744 - Reduce Future usage in websocket
2013-08-23 19:58:46 +10:00
Joakim Erdfelt
4d9cb44536
WebSocket - Calling setPayload() outside of ContinuationFrame
2013-08-20 16:51:11 -07:00
Joakim Erdfelt
e56fddfc4a
WebSocket - Calling setPayload() outside of TextFrame and BinaryFrame
2013-08-20 16:45:26 -07:00
Joakim Erdfelt
a089780701
WebSocket - Calling setPayload() outside of PingFrame and PongFrame
2013-08-20 16:39:26 -07:00
Joakim Erdfelt
975d9870d2
WebSocket - more code cleanup
2013-08-20 16:28:51 -07:00
Joakim Erdfelt
c6a4af4f78
WebSocket - cleaning up frame initialization and use
2013-08-20 15:45:07 -07:00
Joakim Erdfelt
c548cba71c
WebSocket - fixing windowed parse issue with masked frames
2013-08-20 12:56:32 -07:00
Joakim Erdfelt
34f03cb0e8
WebSocket / releasing (header) buffer acquired during generation
2013-08-20 09:57:57 -07:00
Joakim Erdfelt
8e66da396e
Merge branch 'jetty-9.1-wssplitframe' into jetty-9.1
2013-08-19 15:27:09 -07:00
Joakim Erdfelt
3dbcc04b73
Breaking apart WebSocketFrame into sub-frame types
...
+ Performance improvements?
+ Less copying of data
2013-08-19 15:26:07 -07:00
Simone Bordet
45724b63ec
Improved masking performance by using ints instead of bytes.
2013-08-19 22:11:52 +02:00
Simone Bordet
1c73ce674f
Using direct buffers for reads, to avoid copy of the bytes by the
...
JDK, and because they yield better performance for masking.
2013-08-19 22:11:40 +02:00
Joakim Erdfelt
26faa5f0d7
WebSocket - fixing flush->write->complete spinning loop
2013-08-16 13:08:10 -07:00
Jan Bartel
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
Jan Bartel
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
Jan Bartel
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
Jan Bartel
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
Jan Bartel
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
Joakim Erdfelt
e39b48c90d
Fixing up javadoc issues in WebSocket classes
2013-08-14 10:54:07 -07:00
Jesse McConnell
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
Jesse McConnell
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
Joakim Erdfelt
980effaede
WebSocket - reducing memory footprint of WebSocketFrame by not using boolean fields
2013-08-13 12:09:43 -07:00
Joakim Erdfelt
1e39b7d476
WebSocket / Performance - cleaning up tests from fallout on bug 414913
...
+ Copying payload in test cases for comparison reasons, as the reuse of
payloads by the implementation now means that the payload might be
masked by a random client side mask.
+ Cleaning up Abnormal Close handling for idle timeout cases
+ Fixing logging a tag
+ Fixing intermittent test failure in jsr EchoTest
2013-08-12 16:29:25 -07:00
Joakim Erdfelt
46b3dc10c8
414913 - WebSocket / Performance - reduce ByteBuffer allocation/copying during generation/writing
...
+ Splitting Header bytes from payload bytes.
+ returning List<ByteBuffer> from WriteBytesProvider now
+ returning possibly more than 1 frame per
WriteBytesProvider.getByteBuffers() for submission to
Endpoint.write()'s gathered write of multiple bytebuffers
2013-08-12 16:29:25 -07:00
Joakim Erdfelt
5500f161d7
WebSocket - refining javadoc
2013-08-08 09:46:16 -07:00
Joakim Erdfelt
baeda84402
WebSocket - fixing Frame.getPayloadLength()
2013-08-08 09:45:46 -07:00
Joakim Erdfelt
eb0d7da7f2
JSR-356 Making PongMessage work with @OnMessage annotation
2013-08-06 13:15:13 -07:00
Joakim Erdfelt
2354ad4c3d
Cleaning up javadoc
2013-08-06 09:19:49 -07:00
Joakim Erdfelt
833aa6723d
WebSocket - More concurrency fixes found by FindBugs
2013-08-01 13:51:18 -07:00
Joakim Erdfelt
07041f6439
JSR-356 making HTTP Header map use TreeMap(String.CASE_INSENSITIVE_ORDER)
2013-08-01 10:50:01 -07:00
Joakim Erdfelt
eb9fce2fa5
JSR-356: fixing Session.getProtocolVersion()
2013-07-31 13:41:46 -07:00
Joakim Erdfelt
8a2ccdf8ae
JSR-356 - fixing Session.setMax(Text|Binary)MessageBufferSize
2013-07-31 09:52:51 -07:00
Joakim Erdfelt
9ebf890d51
WebSocket - supporting WriteCallback in jetty RemoteEndpoint
...
+ new RemoteEndpoint.sendBytes(ByteBuffer, WriteCallback)
+ new RemoteEndpoint.sendString(String, WriteCallback)
2013-07-30 15:25:41 -07:00
Joakim Erdfelt
28b3ee8b13
WebSocket - breaking out unfinished MUX extension into its own module
2013-07-30 15:09:40 -07:00
Joakim Erdfelt
b63a6047d3
WebSocket - better protection on metadata cache
2013-07-30 14:42:08 -07:00
Joakim Erdfelt
f8172e5a59
JSR-356 fixing calling of @OnMessage with partial message boolean
2013-07-30 14:27:48 -07:00
Joakim Erdfelt
702b675e86
JSR-356 Fixing dispatching for Streaming reads
2013-07-30 12:49:04 -07:00
Joakim Erdfelt
b363400c84
JSR-356 - making SessionFactory additive to allow multiple impls at the same time.
2013-07-29 09:30:42 -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
fb00eb55cd
JSR-356 Promoting ReflectUtils to websocket-common
2013-07-16 10:43:27 -07:00
Joakim Erdfelt
5d45486b8d
JSR-356 - Cleaning up sendObject(Object) behavior between Basic & Async
2013-07-15 10:43:39 -07:00
Joakim Erdfelt
495d2bcd74
JSR-356 - Fixing @OnMessage message format/decoder detection
2013-07-11 11:00:23 -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
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
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
Joakim Erdfelt
89b22d0c90
Adding timeouts on problematic tests to prevent CI abort
2013-06-19 20:53:23 -07:00
Joakim Erdfelt
f8c457f75e
Merge branch 'jetty-9.1' into javawebsocket-jsr
2013-06-19 15:07:15 -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
d553f9f907
Making error message on Session.getRemote() more clear about connection state
2013-06-14 11:40:37 -07: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
dc0a8a5d40
JSR-356, fixing build
2013-06-05 17:36:23 -07:00
Joakim Erdfelt
ffceb642c5
JSR-356 cleaning up MessageInputStream and MessageReader
2013-06-05 10:34:38 -07:00
Joakim Erdfelt
3f3b9fda61
JSR-356 attempting to rethink the InputStream handling
2013-06-04 15:10:44 -07:00
Joakim Erdfelt
c872b95c04
JSR-356 more work on supporting Streams
2013-05-30 16:25:38 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
eaf8e46570
JSR-356 - Adding Writer support.
...
+ Introducing AppendableByteBuffer and Utf8ByteBuffer
+ Adding MessageWriter implementation based on Utf8ByteBuffer
2013-05-28 12:51:50 -07:00
Joakim Erdfelt
48dea3bb1d
JSR-356 adding basic MessageOutputStream support for writing to an OutputStream
2013-05-23 15:51:40 -07:00
Joakim Erdfelt
9f82849900
Merge from [master] to [javawebsocket-jsr]
2013-05-09 12:10:57 -07:00
Jan Bartel
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
Jesse McConnell
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
Jesse McConnell
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
Joakim Erdfelt
f2528642d9
Making Jetty WebSocket API Echo Examples more consistent (for doc)
2013-05-06 13:47:28 -07:00
Jan Bartel
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
Joakim Erdfelt
9ad5ab1ed5
406449 - Session's disconnect not detected
...
+ Vastly cleaned up IOState and ConnectionState behavior
2013-04-30 15:54:41 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
a4644dc780
JSR-356 working out server endpoint creation
2013-04-23 11:06:01 -07:00
Joakim Erdfelt
9463eee427
Merge branch 'master' into javawebsocket-jsr
2013-04-19 09:25:03 -07:00
Greg Wilkins
a7073d05a6
updated version to 9.1.0-SNAPSHOT
2013-04-19 13:59:18 +10:00
Jesse McConnell
7baaa14ba1
[maven-release-plugin] prepare for next development iteration
2013-04-17 11:46:39 -05:00
Jesse McConnell
e390b54b25
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
2013-04-17 11:46:31 -05:00
Joakim Erdfelt
119a1bb1cf
Guarding ExtensionStack.toString() from NPE
2013-04-17 10:54:19 -05:00
Joakim Erdfelt
b2e675ebad
Merge branch 'master' into javawebsocket-jsr
2013-04-17 07:16:03 -07:00
Joakim Erdfelt
824675d072
Guarding ExtensionStack.toString() from NPE
2013-04-16 06:49:33 -07:00
Joakim Erdfelt
8088edc96c
Merge branch 'master' into javawebsocket-jsr
2013-04-15 12:12:25 -07:00
Jesse McConnell
0b20467c6f
[maven-release-plugin] prepare for next development iteration
2013-04-15 11:40:45 -05:00
Jesse McConnell
3aa4301711
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
2013-04-15 11:40:37 -05:00
Joakim Erdfelt
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
Greg Wilkins
b8dd8bde14
[maven-release-plugin] prepare for next development iteration
2013-04-08 12:31:34 +10:00
Greg Wilkins
bf3771904b
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
2013-04-08 12:30:59 +10:00
Joakim Erdfelt
d1692733f5
JSR-356: MessageHandler(s) layer
2013-04-04 12:03:11 -07:00
Joakim Erdfelt
3a66b3ec3f
JSR-356 first working annotated @ClientEndpoint echo test
2013-03-28 10:51:45 -07:00
Joakim Erdfelt
fc7526b739
[JSR-356] Refactoring annotated callables to handle any-order rule
2013-03-26 17:30:49 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
54fd961354
403380 - Introduce WebSocketTimeoutException to differentiate between EOF on write and Timeout
2013-03-22 13:18:02 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
dd4394aa77
403380 - Introduce WebSocketTimeoutException to differentiate between EOF on write and Timeout
2013-03-19 12:05:29 -07:00
Joakim Erdfelt
96df602e9e
Initial pass at fixing build for websocket PFD
2013-03-18 16:50:07 -07:00
Joakim Erdfelt
8ec9ac4d64
Merge branch 'master' into javawebsocket-jsr
2013-03-18 13:32:08 -07:00
Joakim Erdfelt
8a9f1f94e8
403373 - WebSocket change timeout log level from warn -> info
2013-03-14 10:00:02 -07:00
Joakim Erdfelt
fd8f2b9753
Merge from [master] -> [javawebsocket-jsr]
2013-03-11 10:57:08 -07:00
Joakim Erdfelt
897c35c2cb
[maven-release-plugin] prepare for next development iteration
2013-03-08 11:33:23 -07:00
Joakim Erdfelt
cc6196af50
[maven-release-plugin] prepare release jetty-9.0.0.v20130308
2013-03-08 11:33:15 -07:00
Joakim Erdfelt
7fc38f6c0f
[maven-release-plugin] prepare for next development iteration
2013-03-07 19:14:19 -07:00
Joakim Erdfelt
96d045442f
[maven-release-plugin] prepare release jetty-9.0.0.v20130307
2013-03-07 19:14:11 -07:00
Jesse McConnell
778ee1411b
[maven-release-plugin] prepare for next development iteration
2013-03-06 10:21:46 -06:00
Jesse McConnell
d916078711
[maven-release-plugin] prepare release jetty-9.0.0.v20130306
2013-03-06 10:21:38 -06:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
370bdafc15
Reverting direct ByteBuffer commits
...
+ Reverting commit : 5621f87c81
+ Reverting commit : bbcf0c77b8
2013-02-26 10:41:40 -07:00
Joakim Erdfelt
29b2118870
[maven-release-plugin] prepare for next development iteration
2013-02-26 09:20:45 -07:00
Joakim Erdfelt
2b82b54f6d
[maven-release-plugin] prepare release jetty-9.0.0.RC2
2013-02-26 09:20:45 -07:00
Joakim Erdfelt
7a2b775f03
Reducing log noise
2013-02-23 16:44:49 -07:00
Joakim Erdfelt
bbcf0c77b8
Switching to direct ByteBuffers
2013-02-23 16:44:49 -07:00
Joakim Erdfelt
5621f87c81
Switching to direct ByteBuffers
2013-02-23 16:44:49 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
660f6d2e85
399520 - Websocket Server Connection needs session idle timeouts
2013-02-21 08:21:01 -07:00
Joakim Erdfelt
820e20f042
Fixing license headers
2013-02-15 10:03:14 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
d505f481a4
400255 - Using WebSocket.maxMessageSize results in IllegalArgumentException
2013-02-11 16:24:13 -07:00
Joakim Erdfelt
4dc3ed38c2
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
Joakim Erdfelt
ed24f78498
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:36 -07:00
Jesse McConnell
e073ceb06d
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
Jesse McConnell
2f2ad287af
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:35 -07:00
Joakim Erdfelt
b810ce6535
Adding synchronize for multi-threaded write concerns
2013-02-01 09:20:33 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
1480f3d8fc
399669 - Remove WebSocketConnection in favor of websocket.api.Session
2013-01-31 12:09:04 -07:00
Joakim Erdfelt
32cb1045ba
Fixing logger name
2013-01-31 09:35:27 -07:00
Joakim Erdfelt
b2951bdf5d
396428 - Test for WebSocket masking on client fragments per RFC 6455 Sec 5.1
2013-01-30 13:51:49 -07:00
Joakim Erdfelt
60088fa274
399515 - Websocket-client connect issues should report to websocket onError handlers
2013-01-30 12:15:15 -07:00
Joakim Erdfelt
5e8aa4eeb3
399421 - Add websocket.api.Session.disconnect() for harsh low level connection disconnect
2013-01-29 15:56:30 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
871b64cf38
Bug 399344 - Add missing @OnWebSocketError annotation
2013-01-29 13:22:38 -07:00
Joakim Erdfelt
bfba20565a
Removing out of date mux diagrams
2013-01-23 10:49:07 -07:00
Joakim Erdfelt
f9cb26b5a7
Removing jsr diagrams from common, should only exist in jsr branch (for now)
2013-01-23 10:48:51 -07:00
Joakim Erdfelt
c31f3a5501
Updating diagrams
2013-01-23 10:47:59 -07:00
Joakim Erdfelt
2e216dddb7
Consolidating WebSocketPolicy.setMax*Size() into single setMaxMessageSize()
2013-01-18 09:27:56 -07:00
Joakim Erdfelt
b938245b14
Adding some javadoc, cleaning up package namespaces where appropriate
2013-01-17 15:41:33 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
1dfee4c992
393733 - WebSocketClient interface should support multiple connections
...
+ Reworking Connection Timeout handling
2013-01-16 15:11:57 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
eff1262e49
398105 - Clean up WebSocketPolicy
2013-01-16 15:11:56 -07:00
Jesse McConnell
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
Greg Wilkins
31def06214
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
2012-12-24 19:17:00 +11:00
Joakim Erdfelt
1936a0fc51
Fixing harmless NPE seen during testing.
2012-12-21 14:00:36 -07:00
Joakim Erdfelt
0ef9b23724
Fixing end user callback failure if runtime exception occurs, renaming enque to enqueue
2012-12-19 10:06:23 -07:00
Joakim Erdfelt
ca1c3db642
Removing WriteResult class
2012-12-14 16:12:48 -07:00
Joakim Erdfelt
e308f843db
Replacing FrameBytes tree with WriteBytesProvider class
2012-12-14 16:12:48 -07:00
Joakim Erdfelt
ecb472f30b
Introducing WriteBytesProvider
2012-12-14 16:12:48 -07:00
Greg Wilkins
6bfc19be1b
jetty-9 optimisation to dispatch before parsing so that handling is done in same thread
2012-12-14 09:50:22 +11:00
Joakim Erdfelt
c8c15a4063
Removing test for inputClosed on BlockheadClient to fix test failure.
2012-12-13 13:28:05 -07:00
Joakim Erdfelt
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
Jesse McConnell
bf3c5c7922
add in some handshake state tracking into IOState to help track who initiated closes
2012-12-13 12:18:30 -06:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
11cbe274af
395344 Move JSR-356 (Java WebSocket API) work off to Jetty 9.1.x
2012-11-28 16:55:13 -07:00
Greg Wilkins
7737dc8c76
394854 Implemented Promise
2012-11-23 12:18:51 +11:00
Jesse McConnell
fdc9428c6f
[maven-release-plugin] prepare for next development iteration
2012-11-19 18:06:01 -06:00
Jesse McConnell
d89b6f9b88
[maven-release-plugin] prepare release jetty-9.0.0.M3
2012-11-19 18:05:54 -06:00
Greg Wilkins
97d2130a8f
jetty-9 no debugging checked in
2012-11-19 15:08:53 +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
42ec683297
Merge from 'master' to 'ws-refactor'
2012-11-12 16:22:11 -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
Joakim Erdfelt
09625a64e2
Adding more diagrams for javax.net.websocket layers
2012-11-07 12:01:25 -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
000cfe6986
Fixing UpgradeRequest / UpgradeResponse hierarchy.
2012-11-06 15:45:13 -07:00
Joakim Erdfelt
2e3447f6ef
Making .common pass all existing tests
2012-11-05 17:57:39 -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
d19f177cae
First step
2012-11-02 11:42:44 -07:00