Simone Bordet
3dca610f7b
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-13 23:39:23 +02:00
Simone Bordet
ebee9f12f9
Fixed SessionTrackingTest.
...
Introduced WebSocketSession.Listener that can be used to be notified
of session opening and close, so that tests can be written more reliably.
2016-06-13 23:23:15 +02:00
Simone Bordet
77de314ce1
Fixes #639 - ServerContainer stores WebSocket sessions twice.
...
ServerContainer now delegates session storage to WebSocketServerFactory.
2016-06-13 23:23:14 +02:00
Simone Bordet
e578c79b41
Code cleanups.
2016-06-13 23:23:14 +02:00
Jesse McConnell
20c1301203
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-07 11:56:27 -05:00
Joakim Erdfelt
dd8afc34b9
Merge branch 'jetty-9.3.x' into bugs/388
2016-06-06 08:37:36 -07:00
Joakim Erdfelt
8758cbb607
Fixes #388 - Provide pluggable RemoteEndpoint service
2016-06-06 07:44:46 -07:00
Greg Wilkins
f3b3741a58
Issue #533 Do not hide file resource exception
...
Throw IOException rather than MUE for file exception
2016-04-23 09:43:21 +10:00
Joakim Erdfelt
3624339ec6
Merge branch 'jetty-9.3.x'
2016-03-16 10:29:29 -07:00
Greg Wilkins
1c5a1fc6a2
Issue #431
...
Suppress stack traces from unit tests
2016-03-16 18:19:40 +11:00
Joakim Erdfelt
dcfa0b8910
Merge branch 'jetty-9.3.x'
2016-03-15 07:49:28 -07:00
Joakim Erdfelt
684c96a156
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-03-15 07:47:52 -07:00
Joakim Erdfelt
032e984674
Issue #424 - Jetty impl. of Websocket ServerEndpointConfig.Configurator lifecycle out of spec
2016-03-15 07:44:46 -07:00
Joakim Erdfelt
e7081d7b84
Merge branch 'jetty-9.3.x'
2016-03-08 15:53:50 -07:00
Joakim Erdfelt
db4b920ae4
Issue #407 - JSR356 Server WebSocket Sessions no longer being tracked
2016-03-08 15:15:21 -07:00
Joakim Erdfelt
98448262ea
Making servlet context base resource discovery more robust
2016-03-08 15:14:54 -07:00
Simone Bordet
d4cd34d2ba
Merged branch 'jetty-9.3.x' into 'master'.
2016-03-07 17:01:20 +01:00
Simone Bordet
3b0f577aed
Removed DEBUG logging during tests.
2016-03-07 16:40:34 +01:00
Greg Wilkins
779317dc30
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-02-16 16:03:34 +01:00
Greg Wilkins
1585dc1c20
Issue #83 Ignored
2016-02-16 16:00:51 +01:00
Simone Bordet
56c0bc768c
Merged branch 'jetty9.3.x' into 'master'.
2016-01-21 17:52:37 +01:00
Joakim Erdfelt
9f8df9a1a8
485969 - WebSocket upgrade response should honor HttpConfiguration server version settings
2016-01-15 13:23:43 -07:00
Greg Wilkins
c5cbc64e77
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-01-14 11:00:06 +11:00
Joakim Erdfelt
57224ec3ca
481986 - Dead JSR 356 Server Session still being tracked after Session/Connection closure
...
+ Removing SessionListener
+ Work in CDI layer for WebSocketContainerScope is reused for
session tracking on the parent scope of the WebSocketSession only.
no more multi-listener behavior
+ Reworked JsrSession ID behavior to not be based on AtomicLong
+ AbstractWebSocketConnection now has .hashCode and .equals
2016-01-12 16:15:51 -07:00
Jan Bartel
a8193c0eb8
485063 After stopping JettyWebAppContext, it still contains reference to old WebAppClassLoader via ServerContainer bean
2016-01-07 11:12:11 +11:00
Jan Bartel
a934db118d
485063 After stopping JettyWebAppContext, it still contains reference to old WebAppClassLoader via ServerContainer bean
2016-01-07 11:11:10 +11:00
Joakim Erdfelt
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
Joakim Erdfelt
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
Joakim Erdfelt
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
Joakim Erdfelt
31cd3fee84
Merge branch 'jetty-9.3.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathSpecSet.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
2015-12-17 12:51:57 -07:00
Joakim Erdfelt
3bec195d08
484440 - Swap WebSocket PathMappings for new jetty-http PathMappings
...
+ Deprecated jetty-server ServletPathSpec and RegexPathSpec
+ Moved all other code to using new jetty-http versions
2015-12-17 11:42:27 -07:00
Greg Wilkins
3527c6a71b
StringUtil.csvSplit(String)
...
Conflicts:
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
2015-12-08 14:54:33 -07:00
Simone Bordet
9aa6dc1e7d
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-08 13:02:55 +01:00
Simone Bordet
9c673e542d
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2015-12-08 13:02:20 +01:00
Simone Bordet
e6f23a692e
482270 - Expose upgrade request locales.
...
Exposed as a user property.
2015-12-08 12:04:22 +01:00
Joakim Erdfelt
b9c1535552
481567 - permessage-deflate causing data-dependent ju.zip.DataFormatException: invalid stored block lengths
...
+ Reworked PerMessageDeflateExtensionTest to test with different
modes (http/ws vs https/wss), different messages sizes, and
input buffer sizes (these various configurations do trigger
the reported bug)
+ Made CompressExtension loop over the input buffer if the buffer
happens to not be entirely consumed.
2015-12-07 13:15:29 -07:00
Greg Wilkins
ff0d1b4c14
481903 Module Descriptions
2015-11-12 10:48:04 +11:00
Joakim Erdfelt
1e8d0db743
478829 - WebsocketSession not cleaned up / memory leak
...
+ Reducing looping references Session -> otherObj -> Session
+ Using Container LifeCycle bean management more consistently
+ All sessions are now child beans
+ A stopped session that hasn't been closed, will auto-close now
+ Using SessionListener more consistently
+ Client ConnectionManager no longer tracks Sessions
+ EventDriver stop cleans up its Session references
+ Moving all DummyConnection test classes to websocket-common:tests
2015-10-01 18:18:20 -07:00
Joakim Erdfelt
b865b50cb6
Extracting IBlockheadClient for refactoring prep
2015-09-30 12:47:31 -07:00
Joakim Erdfelt
25b692046f
Merge branch 'jetty-9.2.x'
2015-08-07 09:40:11 -07:00
Joakim Erdfelt
a71c543a7e
Revert "Removing old websocket extensions x-webkit-deflate-frame and deflate-frame"
...
This reverts commit ec9504aab8
.
2015-08-07 07:37:06 -07:00
Joakim Erdfelt
39f9f3ad44
Removing old websocket extensions x-webkit-deflate-frame and deflate-frame
...
Conflicts:
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
2015-08-06 15:16:11 -07:00
Greg Wilkins
3e401a62e9
StringUtil.csvSplit(String)
2015-06-19 16:48:53 +10:00
Joakim Erdfelt
7c737a587b
Removing [version] sections in modules
2015-06-12 09:14:34 -07:00
Joakim Erdfelt
916efd6aa7
469860 - Add module metadata versioning to support backwards compat
...
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
2015-06-10 10:59:18 -07:00
Joakim Erdfelt
ec9504aab8
Removing old websocket extensions x-webkit-deflate-frame and deflate-frame
2015-05-14 07:45:25 -07:00
Joakim Erdfelt
ed22d7e0de
464727 - Update Javadoc for Java 8 DocLint
2015-04-22 16:11:01 -07:00
Greg Wilkins
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
Joakim Erdfelt
0301de099d
Delaying decoration of websocket endpoints
2015-03-12 10:09:52 -07:00
Joakim Erdfelt
3008ab85e5
This developer is a dummy
2015-03-12 10:09:52 -07:00
Joakim Erdfelt
87246263b8
453834 - CDI Support for WebSocket
...
+ Verifying ServletContextHandler behavior of Decorators
+ Marking old ServletContextHandler methods as deprecated
+ Updates to DecoratedObjectFactory
+ Removing customized weld scopes/context (for now)
+ Deferring JSR356 ServerContainer endpoint init
till Container.doStart() to allow weld to init properly first
+ Removing JSR356 BasicServerEndpointConfigurator in favor
of ContainerDefaultEndpointConfigurator
+ Only decorating server endpoints if they were created by
ContainerDefaultEndpointConfigurator, all others are trusted
to be complete and injected already.
2015-03-12 10:09:52 -07:00
Joakim Erdfelt
5b5c2369d5
Stragglers to the new year. tsk. tsk.
2015-03-12 10:09:30 -07:00
Joakim Erdfelt
4435ba3c2b
cleaning up build warnings
2015-03-12 10:09:30 -07:00
Joakim Erdfelt
1f3097ff16
453834 - CDI Support for WebSocket
...
+ Adding scopes to websocket to help with CDI integration
2015-03-12 10:09:30 -07:00
Joakim Erdfelt
0c930c8640
Rename EnhancedInstantiator to DecoratedObjectFactory
2015-03-12 10:06:03 -07:00
Joakim Erdfelt
d6911b431f
453834 - CDI Support for WebSocket
...
+ Attempting to get new socket @Inject working
2015-03-12 10:04:50 -07:00
Joakim Erdfelt
5c3e30d136
453834 - CDI Support for WebSocket
...
+ Changing util.Decorators to util.EnhancedInstantiator to reflect true
usage
+ Adding EnhancedInstantiator to JSR-356
2015-03-12 10:04:50 -07:00
Joakim Erdfelt
74ee154bb1
Cleaning up LeakTrackingByteBufferPool / LeakDetector
...
+ Making use of LeakTrackingByteBufferPool more consistent
+ Using MappedByteBufferPool.Tagged where appropriate in test cases
+ Adding leak count tracking to LeakDetector
+ Adding leak count tracking to LeakTrackingByteBufferPool
+ Renaming websocket LeakTrackingBufferPool to
LeakTrackingBufferPoolRule to reflect junit @Rule usage
+ Making websocket LeakTrackingBufferPoolRule always use
MappedByteBufferPool.Tagged
+ Fixed various grammar concerns
2015-03-06 14:27:58 -07:00
Joakim Erdfelt
741d7891f3
459006 - master branch does not build on norwegian locale
...
+ Adding appropriate locale settings to testcases to prevent
machine specific locale from changing the expectations.
Bug: 496006
Also-by: Kristian Rosenvold <kristian@zenior.no>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2015-02-04 10:41:04 -07:00
Joakim Erdfelt
f7b382064f
457017 - Reflective call to websocket methods that fail have ambiguous
...
exceptions
+ Making JSR onOpen close and use onError properly, as well we
unwrapping the InvocationTargetException cause as to WHY the call to
onOpen failed.
2015-01-08 12:06:53 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Joakim Erdfelt
93520df3f9
445374 - Reevaluate org.eclipse.jetty.websocket.jsr356 enablement concepts
...
+ Since SCI adds filters, but init() isn't run till later, that means
the context attribute for the WebSocketUpgradeFilter isn't present
during jsr356 runs. Added ability for manual filter creation to call
setToAttribute() as a pre-init step, allowing the init() itself to
bypass the set to attribute for that specific filter instance.
+ This also means ServletException is now thrown out from the
various configureContext() static methods.
2014-09-30 10:56:48 -07:00
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
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
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
Joakim Erdfelt
ce8920dd76
Removing test noise
2014-05-29 11:52:36 -07: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
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
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
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
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
Joakim Erdfelt
1ff01f36eb
Fixing SessionTest failures on windows due to file locking
2014-01-14 15:09:57 -07: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
1eac013485
422192 - ClientContainer.getOpenSessions() always returns null
...
+ Adding SessionListener and using it judiciously
2013-12-04 12:24:48 -07:00
Joakim Erdfelt
e097ec1ae2
import cleanup
2013-11-15 09:00:16 -07: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
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
Joakim Erdfelt
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
Jan Bartel
f44787075a
417382 - Upgrade to asm 4.1 and refactor annotation parsing
2013-09-17 13:12:54 +10:00
Joakim Erdfelt
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
Joakim Erdfelt
eecc17ee67
WebSocket / cleaning up example
2013-09-12 12:23:53 -07:00
Joakim Erdfelt
cda13d76d4
Adding example of websocket streaming read/write
2013-09-12 12:19:45 -07:00
Joakim Erdfelt
0dcea8f2a2
Make sure client also has values set.
2013-09-12 10:49:30 -07:00
Greg Wilkins
43c92f8117
416812 - Don't start WebSocketClient for every context
...
turn off for all contexts in demo
2013-09-12 20:44:13 +10:00
Joakim Erdfelt
4b3541b7d1
WebSocket / making sure that filter always sees the correct target path, regardless of servlets
2013-09-11 08:56:19 -07:00
Joakim Erdfelt
dc59080fca
WebSocket / Fixing pathmap matching when query parameters are provided
2013-09-11 07:24:25 -07:00
Joakim Erdfelt
aa9aea00be
Adding back missing enable check, correcting javadoc
2013-09-09 19:04:55 -07:00
Joakim Erdfelt
d3421070cb
Adding back ENABLE attribute for JSR-356
2013-09-09 19:01:23 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
7e3ef36f16
Revert "416812 Only start WebSocketContainer if enabled by attribute"
...
This reverts commit a1cba900c5
.
2013-09-09 09:28:33 -07:00
Greg Wilkins
a1cba900c5
416812 Only start WebSocketContainer if enabled by attribute
2013-09-09 12:27:15 +10:00
Joakim Erdfelt
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
Joakim Erdfelt
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
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
714bbf943a
Removing @ServerEndpoint caching, its just getting in the way
2013-09-06 12:28:33 -07:00
Jesse McConnell
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
Joakim Erdfelt
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
Joakim Erdfelt
2e94149ea3
Merge branch 'jetty-9.1' into jetty-9.1-altstart
2013-08-23 11:49:41 -07:00
Greg Wilkins
e4235ea070
415744 - Reduce Future usage in websocket
2013-08-23 19:58:46 +10:00
Jesse McConnell
0032c1443d
add spdy and websocket mod
2013-08-22 13:23:29 -05:00
Joakim Erdfelt
00e5daa37e
Adding some WebSocket examples
2013-08-21 11:13:45 -07: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
8c77fe2404
WebSocket - addressing bug in Partial message support
2013-08-20 15:31:12 -07:00
Joakim Erdfelt
34f03cb0e8
WebSocket / releasing (header) buffer acquired during generation
2013-08-20 09:57:57 -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
Joakim Erdfelt
4016ba571c
JSR-356 working javax.websocket demo in the distribution.
2013-08-15 12:20:06 -07:00
Joakim Erdfelt
e39b48c90d
Fixing up javadoc issues in WebSocket classes
2013-08-14 10:54:07 -07: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
d3d4f7abed
WebSocket - quick fix to prevent jenkins test hang
2013-08-08 09:46:31 -07:00
Joakim Erdfelt
dfd3d5af29
WebSocket - refactoring bits and pieces to make testing easier.
2013-08-02 09:33:15 -07:00
Simone Bordet
ed95ffbfea
Fixed lifecycle management.
2013-08-02 15:05:50 +02:00