b95e454f7d
417022 - Access current HttpConnection from Request not ThreadLocal
...
+ Adjusting WebSocketServerFactory.upgrade() to receive HttpConnection
from Request object instead of ThreadLocal.
2014-03-11 12:12:44 -07:00
b6f36dadb2
Add appropriate headers to allow ServiceLoader mechanism to work with OSGi.
2014-03-10 13:42:05 +11:00
0ec0d452e9
[maven-release-plugin] prepare for next development iteration
2014-03-07 09:10:08 -06:00
1e555567a9
[maven-release-plugin] prepare release jetty-9.1.3.v20140225
2014-03-07 09:10:08 -06:00
5d36a4cb73
428594 - File upload with onMessage and InputStream fails
...
+ Adding unit test to verify reported behavior
2014-03-06 13:19:30 -07:00
6959d911d5
428597 javax-websocket-client-impl and javax-websocket-server-impl jars Manifests do not export packages for OSGI
2014-03-06 16:47:10 +11:00
4031bc7f3b
Reduced websocket memory footprint by releasing the HTTP machinery
...
(request and response) after the upgrade.
2014-02-24 23:44:21 +01:00
f465a13d6d
428435 - Large streaming message fails in MessageWriter.
...
Fixed buffering, synchronization and callback notification in the
websocket stream implementation classes.
2014-02-24 14:28:10 +01:00
d349d640c0
428859 Do not auto initialise jsr356 websocket if no annotations or EndPoints discovered
2014-02-24 16:31:56 +11:00
1ac6b82912
428232 - Rework batch mode / buffering in websocket.
...
Introduced the automatic batch mode, akin to Jetty 8's WebSocket
implementation.
Now, if there are no more frames to process, and the previous frames
have been aggregated, FrameFlusher auto-flushes the aggregated frames.
This simplifies applications because they don't need to call flush()
explicitly.
2014-02-18 18:31:49 +01:00
4bdca367dd
428232 - Rework batch mode / buffering in websocket.
...
Refactored FrameFlusher to handle aggregation of frames to support
JSR 356's batch mode.
Now FrameFlusher can aggregate frames as long as the FlushMode they
were sent is AUTO. When a frame that has FlushMode SEND arrives,
it will trigger the flush of the aggregate buffer (and eventually
also other queued frames).
A special BINARY frame is used to implement explicit flush()
invocations.
2014-02-18 18:31:48 +01:00
8e5c06b95c
428232 - Rework batch mode / buffering in websocket.
...
Refactored OutgoingFrames.outgoingFrame() to take an additional
parameter, FlushMode. This is in preparation for handling this new
parameter in FrameFlusher.
2014-02-18 18:31:48 +01:00
ad15b27a01
427700 - Outgoing extensions that create multiple frames should flush
...
them in order and atomically.
Refactored PerMessageDeflateExtension and DeflateFrameExtension
introducing superclass CompressExtension that factors in common
functionalities.
2014-02-14 22:21:59 +01:00
eb0aea46ce
set versions.txt file to new version and fix mistaken developmentVersion
2014-02-10 13:48:29 -06:00
f3d38dfb15
[maven-release-plugin] prepare for next development iteration
2014-02-10 11:17:14 -06:00
8f6cbc9111
[maven-release-plugin] prepare release jetty-9.1.2.v20140210
2014-02-10 11:17:07 -06:00
1ff01f36eb
Fixing SessionTest failures on windows due to file locking
2014-01-14 15:09:57 -07:00
91429ea123
Merge branch 'release-9'
2014-01-10 09:11:25 -06:00
b82ec6e668
[maven-release-plugin] prepare for next development iteration
2014-01-08 16:47:09 -06:00
b99623a21d
[maven-release-plugin] prepare release jetty-9.1.1.v20140108
2014-01-08 16:47:01 -06:00
29dec203ba
Turning on some leak detection in websocket testing
2014-01-08 14:54:57 -07:00
9df519c40f
423948 - Cleanup and consolidate testing utilities in WebSocket
...
+ Created websocket-common-tests.jar artifact
+ Consolidated duplicate code from other websocket-* modules
into the websocket-common test artifact
2014-01-08 10:47:45 -07:00
b59057c184
424863 - IllegalStateException "Unable to find decoder for type <javax.websocket.PongMessage>"
...
+ Expanding testing of PongMessage
+ Ensuring that .addMessage(MessageHandler.Whole<PongMessage>) works
+ Ensuring that ping or pong messages all goto assigned message
handler for PongMessage, for both extends Endpoint and
annotated @OnMessage
2014-01-06 17:54:57 -07:00
8016065823
424706 - The setMaxIdleTimeout of javax.websocket.Session does not take any affect
...
+ Making sure that JsrSession updates Connection on use of
setMaxIdleTimeout after a connection has been opened.
2014-01-06 15:07:02 -07:00
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
5380430b75
Tweaking idle timeout
2013-12-20 13:22:01 -07:00
6d70aab61d
423915 - WebSocket / Active connection from IOS that goes into airplane mode not disconnected on server side
...
+ Working testcase for JSR-356
2013-12-12 16:58:42 -07:00
5941e9db83
Fixing various warnings / imports
2013-12-12 14:46:40 -07:00
bc7afdc172
423476 - WebSocket / JSR / @OnMessage(maxMessageSize=20000000) not properly supported
...
+ Correcting @OnMessage handling of max message size for TEXT/BINARY
from both @ClientEndpoint and @ServerEndpoint usage
+ Testcases to prevent regression.
2013-12-12 13:20:49 -07:00
120e0e59ca
Cleanup (Imports / StandardCharset / Dead APIs)
2013-12-11 17:27:58 -07:00
eb2f3acfbd
423804 - WebSocket / JSR improper use of ServerEndpointConfig.Configurator.getNegotiatedSubprotocol()
...
+ Correcting BasicServerEndpointConfigurator response for no subprotocol
+ Correcting JsrCreator assumption for no subprotocol
2013-12-11 17:00:28 -07:00
5bb1631c68
Removing conflicting javax.websocket:javax.websocket-client-api artifact
2013-12-11 17:00:28 -07:00
1eac013485
422192 - ClientContainer.getOpenSessions() always returns null
...
+ Adding SessionListener and using it judiciously
2013-12-04 12:24:48 -07:00
724afdaea6
Merge branch 'release-9.1' into jetty-9.1
2013-11-18 09:15:21 -07:00
9172d6115b
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:58:44 -07:00
6feeab6ec3
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:58:36 -07:00
7bbc0ff4df
[maven-release-plugin] rollback the release of jetty-9.1.0.v20131115
2013-11-15 16:33:52 -07:00
1126e68971
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:03:28 -07:00
d6418c73d4
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:03:20 -07:00
6c372b9440
Reverting <version> to 9.1.0-SNAPSHOT
2013-11-15 15:36:26 -07:00
e097ec1ae2
import cleanup
2013-11-15 09:00:16 -07:00
b5345caed1
[maven-release-plugin] prepare for next development iteration
2013-11-14 15:27:52 -06:00
1582aa196d
[maven-release-plugin] prepare release jetty-9.1.0.v20131114
2013-11-14 15:27:37 -06:00
63f20d4518
[maven-release-plugin] prepare for next development iteration
2013-11-07 10:42:54 -06:00
dc2fd1b9ce
[maven-release-plugin] prepare release jetty-9.1.0.RC2
2013-11-07 10:42:41 -06:00
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
6f1eb712e9
Cleaning up imports
2013-11-01 10:03:40 -07:00
5965e695fa
Cleaning up modules
2013-10-24 14:06:50 -07:00
1eca1e7c3c
Making subprotocol negotiation behavior report warnings on bad configuration
2013-10-10 09:04:45 -07:00
2944339893
Fixing websocket browser test utility header lookup
2013-10-10 08:43:49 -07:00
a0ddb2c5d7
418632 - WebSocket / Jsr annotated @OnMessage with InputStream fails to be called
...
+ Fixed load order issue with binary vs text
+ Fixed decoder assignment for InputStream
+ Added unit tests to prevent regression of this feature
2013-10-03 16:07:49 -07:00
d2c3d7cf09
418603 - cannot specify a custom ServerEndpointConfig.Configurator
...
+ Fixing bad assumption on annotations possibly being null
2013-10-03 09:13:37 -07:00
b966545a95
417152 - WebSocket / Do all setup in websocket specific ServletContainerInitializer
...
+ removing etc/jetty-websockets.xml (now irrelevant)
2013-09-26 10:13:12 -07:00
e92f0965c7
Removing scope test
2013-09-26 06:06:23 -07:00
b52d7f09b0
418068 WebSocketClient has lazy or injected Executor
2013-09-26 18:06:55 +10:00
edf0e4f707
Removing websocket.mod ini-template, as using the mod is the same as the ini-template
2013-09-24 09:02:04 -07:00
cd236bc016
417152 - WebSocket / Do all setup in websocket specific ServletContainerInitializer
...
+ Removed WebSocketConfiguration class entirely + annotation handlers
+ Renamed ServerAppliationConfigListener to
WebSocketServerContainerInitializer
+ Embedded jetty code that used to use:
WebSocketContainer.configureContext(context) now uses
WebSocketServerContainerInitializer.configureContext(context)
2013-09-23 13:30:14 -07:00
73d0ed8d71
417561 Refactor annotation related code
...
Rename and refactor ServletContainerInitializerListener
2013-09-19 22:31:36 +10:00
d4c035a06f
417561 Refactor annotation related code to remove some deadwood
2013-09-19 15:43:38 +10:00
aa5705fd78
417490 - WebSocket / @PathParam annotated parameters are null when the servlet mapping uses a wildcard
...
+ Fixing ServletUpgradeRequest.getRequestPath() to conform to behavior
found in WebSocketUpgradeFilter.doFilter()
2013-09-18 06:35:12 -07:00
f44787075a
417382 - Upgrade to asm 4.1 and refactor annotation parsing
2013-09-17 13:12:54 +10:00
7f85842666
417134 - WebSocket / Jsr ServerEndpointConfig.Configurator.getNegotiatedExtensions() is never used
...
+ Extensions pre-negotiated via
ServerEndpointConfig.Configurator.getNegotiatedExtensions are not
properly handled.
+ Added JsrBrowserDebugTool (Jsr version of BrowserDebugTool)
2013-09-12 15:25:02 -07:00
eecc17ee67
WebSocket / cleaning up example
2013-09-12 12:23:53 -07:00
cda13d76d4
Adding example of websocket streaming read/write
2013-09-12 12:19:45 -07:00
0dcea8f2a2
Make sure client also has values set.
2013-09-12 10:49:30 -07:00
43c92f8117
416812 - Don't start WebSocketClient for every context
...
turn off for all contexts in demo
2013-09-12 20:44:13 +10:00
4b3541b7d1
WebSocket / making sure that filter always sees the correct target path, regardless of servlets
2013-09-11 08:56:19 -07:00
dc59080fca
WebSocket / Fixing pathmap matching when query parameters are provided
2013-09-11 07:24:25 -07:00
aa9aea00be
Adding back missing enable check, correcting javadoc
2013-09-09 19:04:55 -07:00
d3421070cb
Adding back ENABLE attribute for JSR-356
2013-09-09 19:01:23 -07:00
aeac72a684
416812 - Don't start WebSocketClient for every context
...
+ Lazy initializing WebSocketClient connection manager
to avoid holding threads that the selector manager
will allocate.
2013-09-09 12:06:57 -07:00
7e3ef36f16
Revert "416812 Only start WebSocketContainer if enabled by attribute"
...
This reverts commit a1cba900c5
2013-09-09 09:28:33 -07:00
a1cba900c5
416812 Only start WebSocketContainer if enabled by attribute
2013-09-09 12:27:15 +10:00
ed0f49f819
416763 - WebSocket / Jsr Session.getPathParameters() is empty
...
+ Adding support for `extends Endpoint` based endpoints as well
2013-09-06 14:35:22 -07:00
eeb8a51c88
416764 - WebSocket / Jsr Session.getRequestURI() is missing scheme + host + port + query parameters
...
+ Adding test cases to verify behavior.
2013-09-06 13:47:49 -07:00
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
714bbf943a
Removing @ServerEndpoint caching, its just getting in the way
2013-09-06 12:28:33 -07:00
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
e36ce2743e
414635 Modular start.d and jetty.base property
...
+ More *.mod definition updates
+ Some safety checks in Module edge addition to prevent duplicates
+ Minor updates to README in jetty-start
2013-08-23 15:47:50 -07:00
2e94149ea3
Merge branch 'jetty-9.1' into jetty-9.1-altstart
2013-08-23 11:49:41 -07:00
e4235ea070
415744 - Reduce Future usage in websocket
2013-08-23 19:58:46 +10:00
0032c1443d
add spdy and websocket mod
2013-08-22 13:23:29 -05:00
00e5daa37e
Adding some WebSocket examples
2013-08-21 11:13:45 -07:00
4d9cb44536
WebSocket - Calling setPayload() outside of ContinuationFrame
2013-08-20 16:51:11 -07:00
e56fddfc4a
WebSocket - Calling setPayload() outside of TextFrame and BinaryFrame
2013-08-20 16:45:26 -07:00
8c77fe2404
WebSocket - addressing bug in Partial message support
2013-08-20 15:31:12 -07:00
34f03cb0e8
WebSocket / releasing (header) buffer acquired during generation
2013-08-20 09:57:57 -07:00
3dbcc04b73
Breaking apart WebSocketFrame into sub-frame types
...
+ Performance improvements?
+ Less copying of data
2013-08-19 15:26:07 -07:00
4016ba571c
JSR-356 working javax.websocket demo in the distribution.
2013-08-15 12:20:06 -07:00
00d160a1c9
Merge branch 'release-9.1' into jetty-9.1
2013-08-14 14:37:19 -05:00
6daf39b10b
Fixing javadoc generation in jetty-all
...
+ Added missing javax artifacts to jetty-all pom
+ Moved javax.websocket versioning to top level pom
2013-08-14 12:14:47 -07:00
657e78aff2
[maven-release-plugin] prepare for next development iteration
2013-08-14 13:28:42 -05:00
590fae2bc4
[maven-release-plugin] prepare release jetty-9.1.0.M0
2013-08-14 13:28:32 -05:00
e39b48c90d
Fixing up javadoc issues in WebSocket classes
2013-08-14 10:54:07 -07:00
980effaede
WebSocket - reducing memory footprint of WebSocketFrame by not using boolean fields
2013-08-13 12:09:43 -07:00
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
d3d4f7abed
WebSocket - quick fix to prevent jenkins test hang
2013-08-08 09:46:31 -07:00
12f6853900
WebSocket - enabling WebSocket on distribution
2013-08-06 09:20:02 -07:00
dfd3d5af29
WebSocket - refactoring bits and pieces to make testing easier.
2013-08-02 09:33:15 -07:00
ed95ffbfea
Fixed lifecycle management.
2013-08-02 15:05:50 +02:00
89b33f5b88
WebSocket - fixing message (buffer) size settings and checks
2013-08-01 16:06:44 -07:00
cbaf68be20
Fixing license headers
2013-08-01 07:48:03 -07:00
11bb7431d2
JSR-356 some more tests
2013-08-01 07:47:14 -07:00
589b03d64c
Adding example on how to get the HttpSession into your socket.
2013-08-01 06:11:01 -07:00
e2f02a7a8a
JSR-356 fixing ServerContainer.setDefault*() method behavior
2013-07-31 14:25:54 -07:00
0fd0ecc887
JSR-356 - making ClientContainer a use jetty LifeCycle properly
2013-07-31 10:34:31 -07:00
8a2ccdf8ae
JSR-356 - fixing Session.setMax(Text|Binary)MessageBufferSize
2013-07-31 09:52:51 -07:00
f8172e5a59
JSR-356 fixing calling of @OnMessage with partial message boolean
2013-07-30 14:27:48 -07:00
702b675e86
JSR-356 Fixing dispatching for Streaming reads
2013-07-30 12:49:04 -07:00
37feaea34b
JSR-356 adding support for javax.websocket.server.ServerApplicationConfig
2013-07-29 15:55:22 -07:00
b363400c84
JSR-356 - making SessionFactory additive to allow multiple impls at the same time.
2013-07-29 09:30:42 -07:00
e5655fc2cd
JSR-356 tweaking use of configureContext
2013-07-26 14:10:03 -07:00
6029826aa4
JSR-356 using Spec 6.4 properly for access to ServerContainer
2013-07-26 14:04:17 -07:00
ca23911075
JSR-356 - Changing to ServerContainer access.
...
+ Using technique as outlined in JSR-356 spec, Section 6.4
2013-07-26 14:04:17 -07:00
daac0e6784
JSR-356 Adding etc/jetty-websockets.xml for JSR configuration
2013-07-25 09:59:34 -07:00
b549410932
JSR-356 - Making WebSocketUpgradeFilter an attribute in the ServletContext
2013-07-25 09:43:47 -07:00
d967dafe45
JSR-356 - Refactoring Annotated method parameter detection and use
2013-07-24 12:32:15 -07:00
70a57f223f
Expanding EchoCase.toString
2013-07-24 12:32:15 -07:00
e69b41e9cd
JSR-356 Adding suppport for @PathParam
2013-07-16 16:56:03 -07:00
ba50e6b053
JSR-356 Adding echo tests on primitives
2013-07-16 14:05:59 -07:00
9a8580b580
JSR-356 Improving Debugging of Annotated EventDrivers
2013-07-15 15:59:22 -07:00
2f01bdcdec
JSR-356 fixing javadoc describing class
2013-07-15 14:26:14 -07: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
25a0639463
Updating version to 9.1
2013-06-19 15:26:53 -07:00
bae9f3dc6a
Bumping up to released javax.websocket artifacts
2013-06-18 13:11:45 -07:00
6d73ab86dd
Using released version of test-helper
2013-05-10 14:35:14 -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
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
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
1f45b3678b
Updating version
2013-04-15 12:39:15 -07:00
2ae436f803
Fixing missing license
2013-04-15 12:39:03 -07:00
fe25ef0454
JSR-356 working on server handlers
2013-04-15 12:11:57 -07: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
d1692733f5
JSR-356: MessageHandler(s) layer
2013-04-04 12:03:11 -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
96df602e9e
Initial pass at fixing build for websocket PFD
2013-03-18 16:50:07 -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
Joakim Erdfelt
Jan Bartel
Jesse McConnell
Simone Bordet
Greg Wilkins