Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-03-31Merged branch 'jetty-9.2.x' into 'master'.Simone Bordet1-0/+2
2015-03-27Adding some websocket client upgrade loggingJoakim Erdfelt1-0/+2
2015-03-26Organised importsGreg Wilkins138-135/+280
2015-03-25[maven-release-plugin] prepare for next development iterationJesse McConnell8-8/+8
2015-03-25[maven-release-plugin] prepare release jetty-9.2.11.M0jetty-9.2.11.M0Jesse McConnell8-8/+8
2015-03-18454934 - WebSocketClient / connectToServer can block indefinitely during ↵Joakim Erdfelt2-2/+37
upgrade failure + Handling EOF and Timeout in a clearer way inside UpgradeConnection
2015-03-18454934 - WebSocketClient / connectToServer can block indefinitely during ↵Joakim Erdfelt2-2/+37
upgrade failure + Handling EOF and Timeout in a clearer way inside UpgradeConnection
2015-03-17Increasing logging level for when websocket fails to open due to exceptionJoakim Erdfelt1-1/+1
2015-03-16Merge branch 'jetty-9.2.x'Joakim Erdfelt2-0/+21
Conflicts: jetty-start/src/main/java/org/eclipse/jetty/start/Main.java jetty-start/src/test/java/org/eclipse/jetty/start/LicensingTest.java
2015-03-12Fixing buildJoakim Erdfelt4-9/+11
2015-03-12Cleaning up cdi-websocket in prep for mergeJoakim Erdfelt3-124/+1
2015-03-12Delaying decoration of websocket endpointsJoakim Erdfelt4-26/+21
2015-03-12Using Jetty component listeners for CDIJoakim Erdfelt10-259/+103
2015-03-12453834 - CDI Support for WebSocketJoakim Erdfelt8-2/+298
+ Breaking down jetty-cdi into 3 modules * cdi-core * cdi-servlet * cdi-websocket + Creating WebSocketScope for cdi-websocket + Creating @Produces for jetty websocket api session and javax.websocket.Session + Unit tests for new functionality
2015-03-12This developer is a dummyJoakim Erdfelt1-3/+2
2015-03-12453834 - CDI Support for WebSocketJoakim Erdfelt18-99/+481
+ 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-12453834 - CDI Support for WebSocketJoakim Erdfelt2-1/+8
2015-03-12Stragglers to the new year. tsk. tsk.Joakim Erdfelt4-4/+4
2015-03-12cleaning up build warningsJoakim Erdfelt2-38/+2
2015-03-12453834 - CDI Support for WebSocketJoakim Erdfelt45-310/+716
+ Adding scopes to websocket to help with CDI integration
2015-03-12Rename EnhancedInstantiator to DecoratedObjectFactoryJoakim Erdfelt27-132/+133
2015-03-12453834 - CDI Support for WebSocketJoakim Erdfelt13-30/+126
+ Attempting to get new socket @Inject working
2015-03-12453834 - CDI Support for WebSocketJoakim Erdfelt26-60/+162
+ Changing util.Decorators to util.EnhancedInstantiator to reflect true usage + Adding EnhancedInstantiator to JSR-356
2015-03-12Rethinking DecoratorsJoakim Erdfelt1-0/+19
2015-03-12461919 - Use osgi-friendly serviceloader mechanism for WebSocketServletFactoryJan Bartel2-0/+21
2015-03-10[maven-release-plugin] prepare for next development iterationJesse McConnell8-8/+8
2015-03-10[maven-release-plugin] prepare release jetty-9.2.10.v20150310jetty-9.2.10.v20150310Jesse McConnell8-8/+8
2015-03-07Merged branch 'jetty-9.2.x' into 'master'.Simone Bordet1-4/+4
2015-03-07Introduced LeakDetector.id() to be consistent in logging the resource ID.Simone Bordet1-4/+4
2015-03-06Merge branch 'jetty-9.2.x'Joakim Erdfelt32-116/+92
Conflicts: jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientUploadDuringServerShutdown.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SynDataReplyDataLoadTest.java jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/TooFastClientTest.java
2015-03-06460769 - ClientUpgradeRequest sends cookies in the wrong formatJoakim Erdfelt2-2/+20
+ Simplifying HTTP Client "Cookie:" header based on rfcs
2015-03-06Cleaning up LeakTrackingByteBufferPool / LeakDetectorJoakim Erdfelt30-114/+70
+ 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-02-24[maven-release-plugin] prepare for next development iterationJesse McConnell8-8/+8
2015-02-24[maven-release-plugin] prepare release jetty-9.2.9.v20150224jetty-9.2.9.v20150224Jesse McConnell8-8/+8
2015-02-17[maven-release-plugin] prepare for next development iterationJesse McConnell8-8/+8
2015-02-17[maven-release-plugin] prepare release jetty-9.2.8.v20150217jetty-9.2.8.v20150217Jesse McConnell8-8/+8
2015-02-13Making WebSocket use new Upgrade mechanismJoakim Erdfelt4-29/+142
+ Also fixes websocket server prefill bytes issue + Adjusting client side to also use/benefit from new Upgrade mechanism
2015-02-13Merge remote-tracking branch 'origin/jetty-9.2.x'Greg Wilkins5-9/+35
Conflicts: jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java jetty-http/src/main/java/org/eclipse/jetty/http/HttpVersion.java jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2015-02-13459845 Support upgradeGreg Wilkins5-9/+35
Added the concept of UpgradeFrom and UpgradeTo connections that support transferring a buffer with content before opening new connection. Aded EndPoint.update method as utility
2015-02-12Merge branch 'jetty-9.2.x'Joakim Erdfelt3-2/+122
2015-02-12Adding TooFastClientTest for websocket serverJoakim Erdfelt3-2/+122
+ test performs a client upgrade + 2 websocket frames all at once. not waiting for the upgrade response before sending those frames. + currently set to @Ignore until we can address how to copy this extra buffer information from the Http side to the WebSocket side.
2015-02-04Merge branch 'jetty-9.2.x'Joakim Erdfelt5-6/+11
2015-02-04459006 - master branch does not build on norwegian localeJoakim Erdfelt5-6/+11
+ 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-01-16[maven-release-plugin] prepare for next development iterationJesse McConnell8-8/+8
2015-01-16[maven-release-plugin] prepare release jetty-9.2.7.v20150116jetty-9.2.7.v20150116Jesse McConnell8-8/+8
2015-01-16[maven-release-plugin] prepare for next development iterationJesse McConnell8-8/+8
2015-01-16[maven-release-plugin] prepare release jetty-9.2.7.v20150116Jesse McConnell8-8/+8
2015-01-16[maven-release-plugin] prepare for next development iterationJesse McConnell8-8/+8
2015-01-16[maven-release-plugin] prepare release jetty-9.2.7.v20140116Jesse McConnell8-8/+8
2015-01-16[maven-release-plugin] prepare for next development iterationJesse McConnell8-8/+8

Back to the top