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
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
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
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
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
1480f3d8fc
399669 - Remove WebSocketConnection in favor of websocket.api.Session
2013-01-31 12:09:04 -07: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
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
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
ecb472f30b
Introducing WriteBytesProvider
2012-12-14 16:12:48 -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
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
11cbe274af
395344 Move JSR-356 (Java WebSocket API) work off to Jetty 9.1.x
2012-11-28 16:55:13 -07:00
2d851212ba
Validating obtaining Local/Remote address from connection object
2012-11-27 15:23:55 -07:00
d8b1444609
Changing to ClientUpgrade(Request|Response)
2012-11-27 15:00:22 -07:00
7737dc8c76
394854 Implemented Promise
2012-11-23 12:18:51 +11:00
42ec683297
Merge from 'master' to 'ws-refactor'
2012-11-12 16:22:11 -07:00
80f5fa1a18
Attempting to get Mux sub-channel to flow thru server as well
2012-11-12 16:02:41 -07:00
dd0b1a39b8
Stubbing out mux client/server specific pieces
2012-11-12 16:02:41 -07:00
8548331735
Ripping out javax.net.websocket.extension.* SPI as it is going away
2012-11-12 12:36:39 -07:00
802e97e6fb
Removing WebSocketClient.getConnection() as inappropriate
2012-11-07 11:00:46 -07:00
4a8a1228fc
Moving client-side mux specifics to internal
2012-11-07 06:06:08 -07:00
473ff032ae
Promoting ClientUpgradeRequest and ClientUpgradeResponse to non-internal use
2012-11-07 06:05:36 -07:00
fc371fc7e6
UpgradResponse headers are now case insensitive
2012-11-06 17:07:55 -07:00
9be64bab11
Making changes to client / server from api / common
2012-11-06 16:58:54 -07:00
17c6e04f47
Making rest of the modules use websocket-common (instead of old websocket-core)
2012-11-05 17:58:06 -07:00
e310b0a0ec
Attempting to get Mux sub-channel to flow thru server as well
2012-11-02 11:20:36 -07:00
52464a5ba6
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
88ed9ff710
Stubbing out mux client/server specific pieces
2012-11-01 13:43:33 -07:00
3e2aee293e
Cleaning up close handshake and noisy tests
2012-10-23 12:16:29 -07:00
2b13648b0e
392237 fixed many TODOs and many minor code cleanups
2012-10-19 16:17:30 +11:00
57abd6fded
Per hybi list, adding no-cache to outgoing client request to prevent bad
...
intermediaries from attempting to cache the upgrade response.
2012-10-15 07:18:35 -07:00
0cc7b5f907
Bug 391590 - WebSocket client needs ability to set requested extensions
...
* Adding UpgradeRequest.addExtensions(String ... extConfigs) interface
* Implementing in WebSocket Client & WebSocket Server
* Fixing case sensitive ClientUpgradeRequest.getHeaderValues(String key)
2012-10-10 11:19:06 -07:00
cae79aabc5
Fixing naming
2012-10-10 11:15:44 -07:00
2748a9381e
jetty-9: Added support for connect timeout.
2012-10-08 11:05:26 +02:00
41ea028706
Adding websocket client example
2012-10-04 14:02:36 -07:00
d23215f3f4
Bug 391140 - Implement x-webkit-deflate-frame extension as-used by Chrome/Safari
2012-10-04 10:11:50 -07:00
cda1c4588f
Reworking EventDriver to be mroe generic and not use reflection in 100% of cases
2012-09-26 13:43:17 -07:00
1cfa277c6c
jetty-9 osgi support
2012-09-24 13:04:57 +08:00
68ee346b8a
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
2012-09-21 11:45:51 +10:00
857498b115
Upgrading to junit-dep-4.10.jar (banning junit.jar)
2012-09-20 11:52:59 -07:00
b10a10797d
Making websocket-core have a unique package org.eclipse.jetty.websocket.core to conform to osgi requirements
2012-09-18 10:01:01 -07:00
e46617ad8a
Moving maskers from core to client, where it belongs
2012-09-17 14:38:27 -07:00
515804a463
Fixing connection.onOpen()
2012-09-14 15:10:54 -07:00
88cbfed7e0
jetty-9 - Made SelectorManager.connection[Opened|Closed]() concrete, since they are overridden only by SelectChannelConnector.
2012-09-14 23:30:21 +02:00
6ebd96e9bd
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-09-14 10:41:23 -07:00
c7404731c9
Starting removal of WebSocketPolicy.getBufferSize()
2012-09-14 10:41:11 -07:00
22ba57b8d2
jetty-9 refactored onOpen and onClose
2012-09-14 17:38:47 +10:00
3ba074ecc8
Adding .STACKS=(boolean) support to StdErrLog configuration
2012-09-06 12:33:38 -07:00
7231c82b69
Merged branch 'jetty-9' into jetty-9-client.
2012-09-06 08:41:48 +02:00
4f36513744
More work around close handshake testing
2012-09-04 14:53:34 -07:00
c3776764f4
jetty-9 ConcurrentScheduler refinements
2012-09-03 15:24:36 +10:00
83dbca6553
jetty-9 reworked the schedulers
2012-08-31 13:22:58 +10:00
4de5b0ad63
Merged branch 'jetty-9' into jetty-9-client.
2012-08-30 17:24:49 +02:00
353978726b
jetty-9 reverted isHead change
2012-08-27 11:14:19 +10:00
cb5dd493fb
jetty-9 merged jetty-9-aggregation
2012-08-27 10:24:34 +10:00
726898ffd8
jetty-9 fixed after merged
2012-08-24 20:39:03 +10:00
171ad66962
Fixed compilation errors after merging branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 12:20:44 +02:00
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
afbaa78e66
Marking client tests appropriately
2012-08-23 16:12:17 -07:00
28ae24fc35
Fixing testBlockReceiving
2012-08-22 11:06:57 -07:00
4ed72ad585
Fixing websocket-client issues around fillInterested on physical connection
2012-08-20 15:05:47 -07:00
6ffaa478c4
standardize license headers
2012-08-17 16:09:49 -05:00
b36b41afd7
Fixing websocket-client upgrade connection -> websocket connection handling
2012-08-17 13:48:04 -07:00
9c63ed975e
Reworking client connection handling per discussion with simone
2012-08-14 09:44:21 -07:00
1f78fc6250
Attempting to get client connection working
2012-08-13 13:59:46 -07:00
889d20ba55
Removing throws IOException on WSConnection.close()
2012-08-08 12:42:57 -07:00
32c5f6c093
jetty-9 reduced LazyList usage
2012-08-08 11:58:50 +10:00
e3132d41d8
Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
...
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 18:35:34 +02:00
0865a9cfb0
jetty-9 removed more AsyncConnection names
2012-08-02 18:10:29 +10:00
b52930be14
jetty-9 merged Async and non-Async classes for EndPoint and Connection
2012-08-02 16:08:49 +10:00
96b5c05674
jetty-9 one connector passing most tests
2012-08-02 11:51:54 +10:00
a97fe106f9
Reworking OpCode from enum to static class
2012-07-31 15:15:21 -07:00
da2b457eaa
Fixing compile issue
2012-07-30 05:38:51 -07:00
822abe514e
Jetty9 - Improved idle timeout handling.
...
Idle timeouts are not enforced anymore by polling the AsyncEndPoints from the SelectorManager,
but instead the AsyncEndPoints now take a SchedulerExecutorService as parameter and perform
their own enforcing of the idle timeout.
Also removed a few Timer usages (replaced by SchedulerExecutorService) and fixed XML files
referencing old APIs.
2012-07-24 10:38:28 +02:00
d2a0cb5c50
Jetty9 - Fixed compilation problems.
2012-07-23 15:38:27 +02:00
6aba6d1e8c
Jetty9 - Refactored SelectorManager and SelectChannelEndPoint.
...
Simplified Selectable interface, and improved idle timeout checking.
2012-07-20 13:04:28 +02:00
dfeb761306
Jetty9 - Now calling SelectorManager.newConnection() from a single call site rather than having to duplicate the call in every newEndPoint() implementation.
2012-07-19 18:43:23 +02:00
ebb7806edc
Jetty9 - Implemented abstract methods on SelectorManager that were always implemented in the same way, making them consistent.
2012-07-18 19:47:10 +02:00
b0549d8bf9
Introducing IncomingFrames and OutgoingFrames interfaces for everything to use, including Extensions
2012-07-12 11:21:35 -07:00
d3a7ddbef0
Fixing license headers
2012-07-11 11:53:19 -07:00
d7f3bbb260
Fixing build issue
2012-07-11 11:43:12 -07:00
1f25e9cee1
Setting client tests to @Ignore
2012-07-10 14:03:11 -07:00
23ecb2e29c
Fixing build
2012-07-10 13:44:09 -07:00
87ca4eb25b
Fixing build issues
2012-07-06 15:09:03 -07:00
d70174f159
Cleaning up all of the old uncompilable websocket source
2012-07-03 11:31:16 -07:00
f27fff4902
Initial work on websocket-client using SPDY as example
2012-07-02 15:59:35 -07:00
b6acc45820
maskgen -> masker + new packaging
2012-06-20 09:12:30 -05:00
e768c37e50
Establishing BaseFrame
2012-06-18 10:08:10 -07:00
6d09fb70fd
Moving MaskGen into org.eclipse.jetty.websocket.generator package space
2012-06-12 13:57:12 -07:00
c7b2297216
Moving classes around, stubbing out new classes for jetty-9 refactor
2012-06-12 13:15:40 -07:00
d52de82a80
Splitting up websocket module into core/client/servlet modules
2012-06-12 12:43:29 -07:00
Joakim Erdfelt
Jesse McConnell
Simone Bordet
Greg Wilkins
Hugues Malphettes