Commit Graph

14447 Commits

Author SHA1 Message Date
Joakim Erdfelt 53c9435183 Issue #207 - Support javax.websocket version 1.1 2017-06-26 11:20:14 -07:00
Joakim Erdfelt 31174ba434 Issue #207 - Support javax.websocket version 1.1
# Conflicts:
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/DecoderFactory.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/EncoderFactory.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageHandlerFactory.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageHandlerWrapper.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/AnnotatedEndpointMetadata.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/AnnotatedEndpointScanner.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/IJsrMethod.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/IJsrParamId.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrEvents.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdBase.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdBinary.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdDecoder.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdOnClose.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdOnError.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdOnMessage.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdOnOpen.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdPong.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdText.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnCloseCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnErrorCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageBinaryCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageBinaryStreamCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessagePongCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageTextCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageTextStreamCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnOpenCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/Param.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/client/AnnotatedClientEndpointMetadata.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JsrClientEndpointImpl.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/client/SimpleEndpointMetadata.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/PrimitiveDecoderMetadataSet.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/PrimitiveEncoderMetadataSet.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/BinaryArrayPartialMessage.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/BinaryPartialOnMessage.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/BinaryWholeMessage.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/TextPartialMessage.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/TextPartialOnMessage.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/TextWholeMessage.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/CoderMetadata.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/CoderMetadataSet.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/DecoderMetadata.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/DecoderMetadataSet.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadata.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadataSet.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/EndpointMetadata.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/MessageHandlerMetadata.java
2017-06-26 11:20:11 -07:00
Joakim Erdfelt 357fae18ae Issue #207 - Support javax.websocket version 1.1 2017-06-26 11:19:02 -07:00
Joakim Erdfelt 1f196f5276 Issue #207 - Support javax.websocket version 1.1 2017-06-26 11:19:01 -07:00
Joakim Erdfelt 94ea9f5b05 Issue #207 - Support javax.websocket version 1.1 2017-06-26 11:18:59 -07:00
Joakim Erdfelt c8ffaec032 Issue #207 - Support javax.websocket version 1.1 2017-06-26 11:18:58 -07:00
Joakim Erdfelt c5954fc5d6 Trailing merge fixes 2017-06-26 11:18:57 -07:00
Joakim Erdfelt c4f7d03138 Issue #207 - Support javax.websocket version 1.1
WIP

# Conflicts:
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/encoders/DualEncoder.java
2017-06-26 11:18:41 -07:00
Joakim Erdfelt b3edcce8e7 Issue #207 - Support javax.websocket version 1.1
WIP

# Conflicts:
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScanner_GoodSignaturesTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScanner_InvalidSignaturesTest.java
2017-06-26 10:57:23 -07:00
Joakim Erdfelt 9a6644ec7b Issue #207 - Support javax.websocket version 1.1
WIP
2017-06-26 10:57:08 -07:00
Joakim Erdfelt 56abb626a4 Issue #207 - Support javax.websocket version 1.1
WIP

# Conflicts:
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
2017-06-26 10:57:05 -07:00
Joakim Erdfelt cd15a57a5e Issue #207 - Support javax.websocket version 1.1
WIP

# Conflicts:
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectPromise.java
2017-06-26 10:56:45 -07:00
Joakim Erdfelt 9acd03f0d9 Issue #207 - Support javax.websocket version 1.1
WIP
2017-06-26 10:55:20 -07:00
Joakim Erdfelt 0a6fd16b52 Issue #207 - Support javax.websocket version 1.1
WIP
2017-06-26 10:55:18 -07:00
Joakim Erdfelt cbf8c971aa 467246 - Support javax.websocket version 1.1
WIP
2017-06-26 10:55:17 -07:00
Joakim Erdfelt 3906f9595f 467246 - Support javax.websocket version 1.1
+ WIP
2017-06-26 10:55:04 -07:00
WalkerWatch 0bfc41e068 Script doco update 2017-06-22 17:18:01 -04:00
S K 3cca6642d1 Issue #1622 - HeaderFilter does not work if response has been committed (#1628)
Signed-off-by: S K (xz64) <xz64.xyz@gmail.com>
2017-06-22 08:18:30 +02:00
Jan Bartel 064feaccc7 Issue #1639 2017-06-21 16:27:44 +02:00
Greg Wilkins 11b5cf5a2b Issue #1637 Thread per HTTP/2 Connection
This fix simplifies the EWYK scheduler by factoring out the preallocated producer into a
ReservedThreadExecutor class.   A shared ReservedThreadExecutor can then be used by multiple
EWYK instances to avoid over allocation of threads.

Squashed commit of the following:

commit c435dc20e25bd274d69423be1be7b0565925f249
Merge: 58a5a9a 90e5b56
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 21 10:48:22 2017 +0200

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3

commit 58a5a9a655ee1a72a66f54ac8c95d7c9d73afe85
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Jun 14 15:56:43 2017 +0200

    Code cleanups.

commit 4e5296216b52948523572352cba391438ff6b494
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 14 07:34:58 2017 +0200

    refixed Producing to Reproducing

commit a1f8682f86d1f0803121162e3f14d7768286d3ed
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 14 07:26:29 2017 +0200

    fixed Producing to Reproducing

commit 9468932e062d2271d8dc1d43a78544757732fff5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 16:33:44 2017 +0200

    fixed javadoc

commit 9d4941eb97638fec09b3fe34d423538d17943b6f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 16:05:27 2017 +0200

    Renamed Preallocated to ReservedThread

commit 6d3379ab64c6dcc2a7aa8ec7088afd77863816c2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 12:28:52 2017 +0200

    Added configuration in modules

commit 1bd1adea4682538e1546c2ae53f4c9340dafb3bb
Merge: 83418a9 6702248
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 10:09:29 2017 +0200

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3

commit 83418a91320c8bfc54465ca02efdce0d2c874a0e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 10:08:35 2017 +0200

    javadoc

commit 62918fd39189fed3414fec4a7c8380c21e90a4b8
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Jun 10 00:04:06 2017 +0200

    Improved EatWhatYouKill implementation

    Simplified by abstracting out PreallocatedExecutor
    Removed invocation execution
    HTTP2 now uses a shared PreallocationExcecutor between connection
2017-06-21 11:48:41 +02:00
Greg Wilkins 90e5b5603b Issue #1618 Async dispatch encoded passed URI 2017-06-21 10:28:26 +02:00
WalkerWatch de976e8777 Updating SSL documentation for clarity. 2017-06-20 09:08:19 -04:00
Joakim Erdfelt 166b4b9e47 Issue #1618 - new testcase for startAsync(req,resp).dispatch() behavior with regards to URL/URI 2017-06-19 13:38:19 -07:00
Joakim Erdfelt 2416430527 Issue #1618 - updating testcase expectations for getPathInfo to match javadoc 2017-06-19 08:39:39 -07:00
Joakim Erdfelt 59e919bfe5 Issue #1618 - adding testcase to verify AsyncContext dispatch encoding 2017-06-19 08:33:12 -07:00
Joakim Erdfelt 166f44fad2 Updating test to use HttpTester 2017-06-19 08:23:56 -07:00
Joakim Erdfelt 9e0fd7faa0 Issue #1625 - Support new IANA declared websocket close status codes 2017-06-16 14:23:29 -07:00
Joakim Erdfelt 0532852730 Merge pull request #1624 from olamy/feature/jetty_run_mojo_reactor_output_directory
run mojo use build.outputDirectory from reactor projects
2017-06-16 06:32:32 -07:00
olivier lamy 43f778946f use outputDirectory from reactor projects rather than having to install dependencies first #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-16 10:46:21 +10:00
Joakim Erdfelt 10da4fce1d Merge pull request #1613 from xz64/header_filters
Add general purpose HeaderFilter
2017-06-15 10:40:21 -07:00
S K (xz64) 4af81674d2 add general purpose header filters
Signed-off-by: S K (xz64) <xz64.xyz@gmail.com>
2017-06-15 09:08:38 -07:00
Simone Bordet 6c9009cabf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-06-13 19:26:55 +02:00
stephane martin 4f1e583b85 HTTP/2 :authority: declaration should omit default ports in jetty-client (#1611)
Change-Id: I2b4f8e8373e3ba16361a37fd1f6549a4a2d97d60
Signed-off-by: Stéphane Martin <stephane.martin@neotys.com>
2017-06-13 19:26:19 +02:00
Jan Bartel 09bc4f3d8b Merge pull request #1575 from olamy/feature/hazelcast_session_management
add Hazelcast session management #1571
2017-06-13 15:58:28 +02:00
Joakim Erdfelt 67022482e5 Issue #1605 - common executor and bufferpool for jsr356 client 2017-06-12 09:23:23 -07:00
Jan Bartel 10a6e5fa5e Issue #1600 2017-06-09 11:55:21 +02:00
Greg Wilkins c6b9ce0401 Stop module
Moved jetty-stop.xml to jetyt-home
Created stop module
2017-06-08 12:53:04 +02:00
Greg Wilkins 5066dd7d13 update BOM to use ${project.version} 2017-06-08 08:55:10 +02:00
olivier lamy 3f5b61ab1c update versions for new modules
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:03:56 +10:00
olivier lamy 90e8f6620e use set rather than put, recommendation from hazelcast
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:23 +10:00
olivier lamy 08c3255a57 do not include hazelcast-client for embedded mode
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:23 +10:00
olivier lamy 2d787cb1ff fix typo
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:23 +10:00
olivier lamy a63e91d324 apply changes after review #1571
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:23 +10:00
olivier lamy 0c3b3dffce revert change for session-configuration-infinispan.adoc. will be part of an other pr
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:23 +10:00
olivier lamy d0ab064789 add entry in chapter.adoc for hazelcast session management #1571
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:23 +10:00
olivier lamy 98f8405771 add documentation page for Hazelcast session management #1571
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:23 +10:00
olivier lamy fd972c0848 Hazelcast session management #1571
fix modules configuration

Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:22 +10:00
olivier lamy 8a300613df add Hazelcast session management #1571
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:22 +10:00
Joakim Erdfelt caff2b932d Issue #1605 - restoring default behavior of ContainerProvider.getWebSocketContainer()
+ Allowing users to reconfigure JettyClientContainerProvider to restore
  the Jetty 9.4.x behavior for singletons and ServerContainer behaviors
2017-06-07 14:16:16 -07:00
Joakim Erdfelt c85e50a83c Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-06-07 11:48:56 -07:00