Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,578 Commits 69 Branches 465 Tags 360 MiB
Commit Graph

461 Commits

Author SHA1 Message Date
Joakim Erdfelt a9c329859d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-12 13:18:12 -07:00
Joakim Erdfelt 2e8f9fc748 Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch" 
This reverts commit 38c112764d.
 2017-07-12 11:28:32 -07:00
Joakim Erdfelt 986e49ab35 Issue #1650 - fixing Suspend/Resume in websockets 2017-07-06 16:24:07 -07:00
Joakim Erdfelt 2d65605de1 Issue #1650 - fixing CDI + websocket integration 2017-07-03 09:19:17 -07:00
Joakim Erdfelt 38c112764d Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch 2017-06-28 16:42:37 -07:00
Joakim Erdfelt 67cccd610a Post cherry-pick cleanup of jetty-9.4.x...master jetty-websocket 2017-06-26 13:11:33 -07:00
Joakim Erdfelt 52ded32ea0 Restoring JSR356 Session.setMax*MessageBufferSize() spec behavior 2017-06-26 11:59:51 -07:00
Joakim Erdfelt ae2bda4dc8 Post-merge cleanup 2017-06-26 11:59:33 -07:00
Joakim Erdfelt 55fd254161 Issue #207 - All websocket tests moved to /websocket-tests/ module 
# Conflicts:
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
 2017-06-26 11:59:09 -07:00
Joakim Erdfelt 92573f1f30 Issue #207 - testing JsrSessionTest needs started ClientContainer 2017-06-26 11:57:23 -07:00
Joakim Erdfelt 262781b732 Issue #207 - testing JsrEndpointFunctions need started ClientContainer 2017-06-26 11:57:22 -07:00
Joakim Erdfelt 6b203f5187 Issue #207 - more test fixes 2017-06-26 11:57:20 -07:00
Joakim Erdfelt 79f30041a1 Issue #207 - More test fixes 
# Conflicts:
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/BinaryStreamTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java
 2017-06-26 11:55:36 -07:00
Joakim Erdfelt 4cea9f307a Issue #207 - Adding missing JSR356 Server @PathParam ArgIdentifier 2017-06-26 11:53:24 -07:00
Joakim Erdfelt 88b2c47904 Issue #207 - moved some JSR356 tests to websocket-tests 
# Conflicts:
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EncoderTest.java
 2017-06-26 11:51:47 -07:00
Joakim Erdfelt fcb8693c52 Issue #207 - testcase rework due to new async behaviors 
# Conflicts:
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectionManager.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/RegexMatcher.java
 2017-06-26 11:49:53 -07:00
Joakim Erdfelt affda23876 Issue #207 - ongoing testing improvements 2017-06-26 11:43:26 -07:00
Joakim Erdfelt b93925e03e Issue #207 - more work on policy / buffer behaviors 2017-06-26 11:43:21 -07:00
Joakim Erdfelt fa10576bc6 Issue #207 - initial pass through for Stream backpressure 2017-06-26 11:43:18 -07:00
Joakim Erdfelt c3bb6ae535 Issue #207 - Cleaning up Args vs Signature classes 
# Conflicts:
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/reflect/ArgSwitch.java
 2017-06-26 11:37:11 -07:00
Joakim Erdfelt 2ee819c2c6 Issue #207 - adding addMessageHandler(<lambda>) tests 2017-06-26 11:33:34 -07:00
Joakim Erdfelt 1c4d658be2 Issue #207 - Careful distinction between container policy, vs session policy 
# Conflicts:
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
 2017-06-26 11:33:09 -07:00
Joakim Erdfelt 70d4850ed1 Issue #207 - working @PathParam support 2017-06-26 11:31:42 -07:00
Joakim Erdfelt 75c5793f38 Issue #207 - @PathParam support fixes 
+ Arg.tag is now exposed for general use
+ JsrEndpointFunctions now decode (into primitives) the URI template
  exposed @PathParam static arguments
+ JsrEndpointFunctions simplified tracking of static args
+ ServerContainer.assertValidEndpoint() now validates
  added endpoints with @PathParam immediately (per spec)
  using a UriTemplate where each variable is an empty string
 2017-06-26 11:31:37 -07:00
Joakim Erdfelt f790bf75d8 Issue #207 - prevent overlapping websocket streaming dispatch 
+ when FIN==true, wait for dispatch to return before processing
  more frames
 2017-06-26 11:31:36 -07:00
Joakim Erdfelt 527e5f8e4c Issue #207 - improving errors for Encoders/Decoders 2017-06-26 11:31:33 -07:00
Joakim Erdfelt 43ef087efd Issue #207 - Support javax.websocket version 1.1 
+ Correcting tests
 2017-06-26 11:29:12 -07:00
Joakim Erdfelt 9ffb266ccb Issue #207 - Support javax.websocket version 1.1 
+ Cleaning up WebSocketPolicy usage

# Conflicts:
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java
 2017-06-26 11:28:45 -07:00
Joakim Erdfelt bfe0584356 Issue #207 - Support javax.websocket version 1.1 
+ Correcting jsr server PathParam static args sort issue
 2017-06-26 11:25:45 -07:00
Joakim Erdfelt 2fac7f07aa Issue #207 - Support javax.websocket version 1.1 
+ Removing more EventDriver references
+ Fixing bad implementation exposed by testcases

# Conflicts:
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/AbstractJsrEventDriver.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrAnnotatedEventDriver.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointImpl.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEventDriverFactory.java
 2017-06-26 11:24:30 -07:00
Joakim Erdfelt c03037e757 Fixing up javadoc 2017-06-26 11:23:37 -07:00
Joakim Erdfelt 66f424cfaf Issue #207 - Support javax.websocket version 1.1 2017-06-26 11:23:36 -07:00
Joakim Erdfelt 4c01fd96c8 Issue #207 - Support javax.websocket version 1.1 
# Conflicts:
#	jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointMetadata.java
#	jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrPathParamId.java
#	jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrServerEndpointImpl.java
#	jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrServerExtendsEndpointImpl.java
#	jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/SimpleServerEndpointMetadata.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/OnPartialTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScanner_GoodSignaturesTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScanner_InvalidSignaturesTest.java
 2017-06-26 11:23:00 -07:00
Joakim Erdfelt df584babc0 Issue #207 - Support javax.websocket version 1.1 2017-06-26 11:22:41 -07:00
Joakim Erdfelt a1333786a9 Issue #207 - Support javax.websocket version 1.1 
# Conflicts:
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderFactoryTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EncoderFactoryTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/MessageHandlerFactoryTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdDecoderTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/decoders/PrimitiveDecoderMetadataSetTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/metadata/DecoderMetadataSetTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadataSetTest.java
 2017-06-26 11:22:27 -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 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 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 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
Joakim Erdfelt d0513ecbe6 Restoring JSR356 Session.setMax*MessageBufferSize() spec behavior 2017-06-20 13:40:05 -07:00
Joakim Erdfelt 00beb607fc Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-13 10:40:02 -07:00
Joakim Erdfelt 67022482e5 Issue #1605 - common executor and bufferpool for jsr356 client 2017-06-12 09:23:23 -07:00
Joakim Erdfelt 76ace004b6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-09 09:17:43 -07: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