Joakim Erdfelt
6500931f8c
445374 - Reevaluate org.eclipse.jetty.websocket.jsr356 enablement concepts
...
+ Making key also work inside of WEB-INF/web.xml via context params
+ Making WebSocketUpgradeFilter generic enough to be used in a
web.xml descriptor
+ Adding global={bool} init-param on WebSocketUpgradeFilter to aid
library developers and end users more ways to tweak the filter
order
2014-09-30 07:40:07 -07:00
Joakim Erdfelt
0bf68a07ae
442495 - Bad Context ClassLoader in JSR356 WebSocket onOpen
...
+ Fixing onOpen context classloader to be that of the context
that started the WebSocketUpgradeFilter (which will be the
same as the WebAppContext in most cases)
2014-09-23 11:33:44 +02:00
Joakim Erdfelt
901707b894
444617 - Expose local and remote socket address to applications
...
+ Exposing 2 new automatically added userProperties
* "javax.websocket.endpoint.localAddress"
* "javax.websocket.endpoint.remoteAddress"
these are both java.net.InetSocketAddress objects
2014-09-23 11:33:44 +02:00
Joakim Erdfelt
e93247de42
444771 - JSR356 / EndPointConfig.userProperties are not unique per
...
endpoint upgrade
+ Adding testcase & implementation which honors the
ServerEndpointConfig.userProperties copy at an earlier point.
2014-09-23 11:33:44 +02:00
Joakim Erdfelt
f3693219f8
444517 - Ensure WebSocketUpgradeFilter is always first in filter chain
...
* Using Servlet 3.1's ServletContext.addFilter() mechanisms with its
FilterRegistration to encourage the WebSocketUpgradeFilter to be
first in the filter chain.
Note: this is possible, but can be overridden by another call
to the same ServletContext.addFilter() using the same techniques
to put something in front of the WebSocketUpgradeFilter.
2014-09-23 11:33:43 +02:00
Joakim Erdfelt
0dca1b0794
442495 - Bad Context ClassLoader in JSR356 WebSocket onOpen
...
+ Fixing onOpen context classloader to be that of the context
that started the WebSocketUpgradeFilter (which will be the
same as the WebAppContext in most cases)
2014-09-22 14:37:00 -07:00
Joakim Erdfelt
d6082b2d65
444617 - Expose local and remote socket address to applications
...
+ Exposing 2 new automatically added userProperties
* "javax.websocket.endpoint.localAddress"
* "javax.websocket.endpoint.remoteAddress"
these are both java.net.InetSocketAddress objects
2014-09-22 12:43:37 -07:00
Joakim Erdfelt
1ce66f38a0
444771 - JSR356 / EndPointConfig.userProperties are not unique per
...
endpoint upgrade
+ Adding testcase & implementation which honors the
ServerEndpointConfig.userProperties copy at an earlier point.
2014-09-22 11:59:43 -07:00
Joakim Erdfelt
9b7b54ea0b
444517 - Ensure WebSocketUpgradeFilter is always first in filter chain
...
* Using Servlet 3.1's ServletContext.addFilter() mechanisms with its
FilterRegistration to encourage the WebSocketUpgradeFilter to be
first in the filter chain.
Note: this is possible, but can be overridden by another call
to the same ServletContext.addFilter() using the same techniques
to put something in front of the WebSocketUpgradeFilter.
2014-09-18 11:11:31 -07:00
Joakim Erdfelt
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
Jesse McConnell
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
Jesse McConnell
c034544ab9
reset for release
2014-09-05 08:10:15 -05:00
Jesse McConnell
c23e5f4889
[maven-release-plugin] prepare for next development iteration
2014-08-21 09:13:38 -05:00
Jesse McConnell
3347e11281
[maven-release-plugin] prepare release jetty-9.2.3.v20140821
2014-08-21 09:13:32 -05:00
Greg Wilkins
1c71040eca
moved config plugin to profile
2014-08-15 19:53:52 +10:00
Joakim Erdfelt
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
Joakim Erdfelt
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
Greg Wilkins
853e020210
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-16 15:31:48 +10:00
Simone Bordet
745f757552
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-07-15 18:49:14 +02:00
Simone Bordet
334db9fe72
Updated version to 9.3.0-SNAPSHOT.
2014-06-16 21:33:03 +02:00
Jesse McConnell
c3ee0711ca
[maven-release-plugin] prepare for next development iteration
2014-06-09 13:37:54 -05:00
Jesse McConnell
06b494eeac
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
2014-06-09 13:37:49 -05:00
Jesse McConnell
10b6c574ae
Merge branch 'master' into release-9
2014-06-09 13:07:22 -05:00
Greg Wilkins
bb4d42f139
Merge remote-tracking branch 'origin' into jetty-http2
2014-06-04 15:09:19 +02:00
Greg Wilkins
8f4aeeeb8d
updated version to 10.0.0-SNAPSHOT
2014-06-04 15:08:54 +02:00
Joakim Erdfelt
ce8920dd76
Removing test noise
2014-05-29 11:52:36 -07:00
Jesse McConnell
2e859e4ae2
[maven-release-plugin] prepare for next development iteration
2014-05-26 12:04:15 -05:00
Jesse McConnell
71ad2114c5
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
2014-05-26 12:04:08 -05:00
Jesse McConnell
d59dbe936b
[maven-release-plugin] prepare for next development iteration
2014-05-23 09:59:19 -05:00
Jesse McConnell
edc7646a4c
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
2014-05-23 09:59:13 -05:00
Joakim Erdfelt
f2ea8351b6
429390 - Decoders and Encoders are not registered for non-annotated ClientEndpoint
...
+ Adding EncoderTest to verify reported bug
+ Fixing SimpleEndpointMetadata to propagate the encoder/decoder list
when present.
2014-05-22 13:12:39 -07:00
Joakim Erdfelt
7d662360f1
434077 - AnnotatedServerEndpointTest emits strange exception
...
Adding lock around use of remote, eliminating artificial EofException.
2014-05-06 12:14:00 -07:00
Joakim Erdfelt
f5648a2096
Removing yet another noisy dump
2014-05-06 12:14:00 -07:00
Joakim Erdfelt
5635f02235
433793 - WebSocket / empty protocol list in ServerEndpointConfig.Configurator when using non-exact header name
...
+ Marking header (and parameter) maps as case-insensitive.
2014-05-05 13:46:58 -07:00
Joakim Erdfelt
8e957b5a23
Reducing the noise on websocket testing
2014-05-05 12:09:58 -07:00
Joakim Erdfelt
c03388b640
431459 - Jetty WebSocket compression extensions fails to handle big messages properly
...
+ Setting compression extensions to default unregistered state until
they can be stablized.
2014-05-05 12:09:58 -07:00
Greg Wilkins
dea8d684a6
434077 Avoid close race in websocket echo test
2014-05-05 15:12:45 +02:00
Greg Wilkins
51c5a4c833
425421 ContainerLifeCycle does not start added beans in started state
2014-05-05 14:53:53 +02:00
Jan Bartel
800a6639a3
Ensure annotation-related code is optional for tests with jdk8
2014-04-29 20:55:49 +02:00
Joakim Erdfelt
1fb578165f
433262 - WebSocket / Advanced close use cases
...
+ Improved test case handling of frame reading (to prevent future
false failures)
+ Improved AbstractWebSocketConnection handling of close -> disconnect
to only trigger on successful write (or failure) of close frame flush
attempt.
+ Flusher close on all forms of disconnect, even half-closed.
2014-04-25 07:33:29 -07:00
Greg Wilkins
c5e1e249e7
set version for 9.2.x
2014-03-31 11:35:06 +11:00
Joakim Erdfelt
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
Jan Bartel
b6f36dadb2
Add appropriate headers to allow ServiceLoader mechanism to work with OSGi.
2014-03-10 13:42:05 +11:00
Jesse McConnell
0ec0d452e9
[maven-release-plugin] prepare for next development iteration
2014-03-07 09:10:08 -06:00
Jesse McConnell
1e555567a9
[maven-release-plugin] prepare release jetty-9.1.3.v20140225
2014-03-07 09:10:08 -06:00
Joakim Erdfelt
5d36a4cb73
428594 - File upload with onMessage and InputStream fails
...
+ Adding unit test to verify reported behavior
2014-03-06 13:19:30 -07:00
Jan Bartel
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
Simone Bordet
4031bc7f3b
Reduced websocket memory footprint by releasing the HTTP machinery
...
(request and response) after the upgrade.
2014-02-24 23:44:21 +01:00
Simone Bordet
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
Greg Wilkins
d349d640c0
428859 Do not auto initialise jsr356 websocket if no annotations or EndPoints discovered
2014-02-24 16:31:56 +11:00
Simone Bordet
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
Simone Bordet
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
Simone Bordet
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
Simone Bordet
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
Jesse McConnell
eb0aea46ce
set versions.txt file to new version and fix mistaken developmentVersion
2014-02-10 13:48:29 -06:00
Jesse McConnell
f3d38dfb15
[maven-release-plugin] prepare for next development iteration
2014-02-10 11:17:14 -06:00
Jesse McConnell
8f6cbc9111
[maven-release-plugin] prepare release jetty-9.1.2.v20140210
2014-02-10 11:17:07 -06:00
Joakim Erdfelt
1ff01f36eb
Fixing SessionTest failures on windows due to file locking
2014-01-14 15:09:57 -07:00
Jesse McConnell
91429ea123
Merge branch 'release-9'
2014-01-10 09:11:25 -06:00
Jesse McConnell
b82ec6e668
[maven-release-plugin] prepare for next development iteration
2014-01-08 16:47:09 -06:00
Jesse McConnell
b99623a21d
[maven-release-plugin] prepare release jetty-9.1.1.v20140108
2014-01-08 16:47:01 -06:00
Joakim Erdfelt
29dec203ba
Turning on some leak detection in websocket testing
2014-01-08 14:54:57 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
Joakim Erdfelt
5380430b75
Tweaking idle timeout
2013-12-20 13:22:01 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
5941e9db83
Fixing various warnings / imports
2013-12-12 14:46:40 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
120e0e59ca
Cleanup (Imports / StandardCharset / Dead APIs)
2013-12-11 17:27:58 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
5bb1631c68
Removing conflicting javax.websocket:javax.websocket-client-api artifact
2013-12-11 17:00:28 -07:00
Joakim Erdfelt
1eac013485
422192 - ClientContainer.getOpenSessions() always returns null
...
+ Adding SessionListener and using it judiciously
2013-12-04 12:24:48 -07:00
Joakim Erdfelt
724afdaea6
Merge branch 'release-9.1' into jetty-9.1
2013-11-18 09:15:21 -07:00
Joakim Erdfelt
9172d6115b
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:58:44 -07:00
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
Joakim Erdfelt
e097ec1ae2
import cleanup
2013-11-15 09:00:16 -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
Greg Wilkins
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
Joakim Erdfelt
6f1eb712e9
Cleaning up imports
2013-11-01 10:03:40 -07:00
Joakim Erdfelt
5965e695fa
Cleaning up modules
2013-10-24 14:06:50 -07:00
Joakim Erdfelt
1eca1e7c3c
Making subprotocol negotiation behavior report warnings on bad configuration
2013-10-10 09:04:45 -07:00
Joakim Erdfelt
2944339893
Fixing websocket browser test utility header lookup
2013-10-10 08:43:49 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
d2c3d7cf09
418603 - cannot specify a custom ServerEndpointConfig.Configurator
...
+ Fixing bad assumption on annotations possibly being null
2013-10-03 09:13:37 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
e92f0965c7
Removing scope test
2013-09-26 06:06:23 -07:00
Greg Wilkins
b52d7f09b0
418068 WebSocketClient has lazy or injected Executor
2013-09-26 18:06:55 +10:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Jan Bartel
73d0ed8d71
417561 Refactor annotation related code
...
Rename and refactor ServletContainerInitializerListener
2013-09-19 22:31:36 +10:00
Jan Bartel
d4c035a06f
417561 Refactor annotation related code to remove some deadwood
2013-09-19 15:43:38 +10:00