11a544d6ac
Updating to version 9.3.22-SNAPSHOT
2017-08-01 11:26:37 -07:00
bb1d69ca52
Updating to version 9.3.21.M0
2017-08-01 10:47:04 -07:00
a9c329859d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-12 13:18:12 -07:00
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
ee8d4c1587
gitattributes followup
2017-07-06 16:24:31 -07:00
38c112764d
Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch
2017-06-28 16:42:37 -07:00
67cccd610a
Post cherry-pick cleanup of jetty-9.4.x...master jetty-websocket
2017-06-26 13:11:33 -07:00
ae2bda4dc8
Post-merge cleanup
2017-06-26 11:59:33 -07:00
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
262781b732
Issue #207 - testing JsrEndpointFunctions need started ClientContainer
2017-06-26 11:57:22 -07:00
ad29d65229
Issue #207 - more test induced fixes
...
# Conflicts:
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/IdleTimeoutTest.java
2017-06-26 11:57:00 -07:00
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
9345bc3d5a
Issue #207 - more test fixes
2017-06-26 11:53:26 -07:00
9fd70d3d6f
Issue #207 - more test failure fixes
2017-06-26 11:53:25 -07:00
4cea9f307a
Issue #207 - Adding missing JSR356 Server @PathParam ArgIdentifier
2017-06-26 11:53:24 -07:00
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
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
b93925e03e
Issue #207 - more work on policy / buffer behaviors
2017-06-26 11:43:21 -07:00
fa10576bc6
Issue #207 - initial pass through for Stream backpressure
2017-06-26 11:43:18 -07:00
0672f621e5
Issue #207 - Cannot catch PING in JSR356
2017-06-26 11:33:33 -07:00
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
70d4850ed1
Issue #207 - working @PathParam support
2017-06-26 11:31:42 -07:00
3c790ab64e
Issue #207 - fixing EchoTest
2017-06-26 11:31:40 -07:00
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
52a8101cd2
Issue #207 - ensuring WebSocketServerFactory init occurs earlier
2017-06-26 11:31:35 -07:00
61dc476342
Removing eclipse detrius
2017-06-26 11:31:34 -07:00
d10de87e09
Issue #207 - javax.websocket.DeploymentException thrown at addEndpoint now
2017-06-26 11:31:32 -07:00
1a8e79c9bb
Issue #207 - Support javax.websocket version 1.1
...
+ More testcase improvements
2017-06-26 11:29:14 -07:00
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
c03037e757
Fixing up javadoc
2017-06-26 11:23:37 -07:00
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
c5954fc5d6
Trailing merge fixes
2017-06-26 11:18:57 -07:00
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
3906f9595f
467246 - Support javax.websocket version 1.1
...
+ WIP
2017-06-26 10:55:04 -07:00
67022482e5
Issue #1605 - common executor and bufferpool for jsr356 client
2017-06-12 09:23:23 -07:00
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
4d2c299fe8
Updating to version 9.2.23-SNAPSHOT
2017-06-06 08:55:12 -07:00
0af30bce5a
Updating to version 9.2.22.v20170606
2017-06-06 07:03:05 -07:00
5d7e97993c
Merge remote-tracking branch 'origin/master' into issue-207-master
2017-06-05 10:05:05 -07:00
3e83908c58
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-06-05 10:02:01 -07:00
b953f8d2d0
Merged branch 'jetty-9.4.x' into 'master'.
2017-06-05 18:07:51 +02:00
6a3c40e935
Updating to version 9.4.7-SNAPSHOT
2017-05-31 17:26:34 -07:00
8ba0f2d95d
Updating to version 9.4.6.v20170531
2017-05-31 16:22:52 -07:00
429380d36a
Updating to version 9.3.21-SNAPSHOT
2017-05-31 16:10:04 -07:00
0f3b1cbe36
Updating to version 9.3.20.v20170531
2017-05-31 15:24:57 -07:00
0f98e607e8
Issue #1514 - fixing bad websocket dump output
2017-05-31 13:36:27 -07:00
d3e50f8f80
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-22 23:37:51 +02:00
e3bab3df22
Issue #1528 - Use WebSocketContainer out of current context
...
+ Interrogate ServletContext, ContextHandler, and Context
for an active ServerContainer before returning a new ClientContainer
2017-05-19 13:50:40 -07:00
e001fe0355
Issue #1528 - pull preconfigured HttpClient from attributes
...
+ Search ServletContext attributes first
+ Search Server attributes next
2017-05-19 08:27:53 -07:00
7b2a0e380d
Using ThreadClassLoaderScope
2017-05-18 16:13:16 -07:00
9b4bfbc680
Issue #1544 - Identifying context that JSR-356 was disabled for in configuration
2017-05-18 14:03:16 -07:00
77252270ff
Post-merge cleanup
2017-05-15 10:06:47 -07:00
04b6afe879
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-05-15 09:48:41 -07:00
873c3554e7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-12 14:06:21 -07:00
c75e3c19d9
Issue #1516 - making WebSocket started thread pools have identifying names
2017-05-11 09:52:02 -07:00
cbe857de01
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-11 10:08:36 +02:00
2043a923cf
Issue #207 - All websocket tests moved to /websocket-tests/ module
2017-05-10 16:56:03 -07:00
2679715a30
Silencing bogus JSR356 IdleTimeoutTest warning
2017-05-10 12:13:24 -07:00
a7b164e6b9
Fixing JSR356 Client tests
2017-05-10 07:46:56 -07:00
753ed9e603
Issue #1516 - Delay starting of WebSocketClient
2017-05-09 12:58:22 -07:00
d1281565ff
Issue #207 - testing JsrEndpointFunctions need started ClientContainer
2017-05-08 07:15:03 -07:00
3b31ecc2b1
Issue #207 - more test induced fixes
2017-05-04 13:37:29 -07:00
c2626cf1f2
Issue #207 - More test fixes
2017-05-03 16:59:54 -07:00
cf56168f7d
Updating to version 9.3.20-SNAPSHOT
2017-05-02 15:26:56 -07:00
d36d57d5c7
Updating to version 9.3.19.v20170502
2017-05-02 14:31:51 -07:00
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
081663e522
Issue #207 - more test fixes
2017-04-28 09:41:58 -07:00
002ba9cf00
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
...
Conflicts:
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/AltFilterTest.java
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeAnnotatedTest.java
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeContainerTest.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/DecoratorsTest.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/TestABCase3.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/WebSocketCloseTest.java
2017-04-28 06:01:06 -07:00
56fac5fdb1
Issue #207 - more test failure fixes
2017-04-27 16:26:32 -07:00
d216206fcd
Issue #207 - Adding missing JSR356 Server @PathParam ArgIdentifier
2017-04-27 13:18:14 -07:00
641d051e97
Issue #207 - moved some JSR356 tests to websocket-tests
2017-04-26 18:13:56 -07:00
0195812f18
Disabling more flaky tests that are fixed in issue-207 branch
2017-04-26 11:34:57 -07:00
240b82be70
Disabling currently flaky tests that are fixed in issue-207 branch
2017-04-26 08:45:59 -07:00
4c5dd93b30
Issue #1502 - Changing WSUF target creation used by PathMappings match
2017-04-24 16:08:37 -07:00
849ad7c917
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-04-21 09:00:54 -07:00
92ea5bda21
Updating to version 9.4.5-SNAPSHOT
2017-04-14 14:43:36 -07:00
3dc8f557c6
Updating to version 9.4.4.v20170414
2017-04-14 13:20:17 -07:00
7e2e64e856
Issue #207 - testcase rework due to new async behaviors
2017-04-11 15:46:47 -07:00
9adbf2b361
Issue #207 - more work on policy / buffer behaviors
2017-04-07 12:03:05 -07:00
9e2aeda052
Updating to version 9.3.19-SNAPSHOT
2017-04-06 07:47:53 -07:00
63273aa40b
Updating to version 9.3.18.v20170406
2017-04-06 06:31:02 -07:00
893b153cb3
Issue #207 - initial pass through for Stream backpressure
2017-04-05 17:30:51 -07:00
dd084b4e74
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-30 17:20:22 +11:00
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
a6a0ab991f
Updating to version 9.3.18-SNAPSHOT
2017-03-17 09:48:19 -07:00
307d23975e
Updating to version 9.3.17.v20170317
2017-03-17 09:07:39 -07:00
9273d99a99
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-03-15 15:07:17 -07:00
ab5e94f86b
Fixing system locale dependent test
...
Signed-off-by: Stefan Schmidt <stefanschmidt@web.de>
2017-03-11 12:22:02 +01:00
d34f126ecb
Issue #207 - Cannot catch PING in JSR356
2017-02-28 15:44:08 -07:00
acf743fa6b
Issue #207 - Careful distinction between container policy, vs session policy
2017-02-28 13:05:29 -07:00
0316e18f91
Issue #207 - working @PathParam support
2017-02-23 15:38:57 -07:00
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
c5c7be2bc5
Merge branch 'jetty-9.4.x'
2017-02-02 16:23:13 -07:00
5e57b9562f
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:14:10 -07:00
9a8f22d5dd
Testing Updates
...
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
in jetty-test-helper and the test classes.
2017-02-02 15:51:38 -07:00
e695fc80d6
Updating to version 9.2.22-SNAPSHOT
2017-01-20 12:32:51 -06:00
Joakim Erdfelt
Simone Bordet
Greg Wilkins
Stefan Schmidt
Jesse McConnell