Joakim Erdfelt
a107ac3b8a
Ensure Client ContainerProvider behavior is reset properly.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-10 11:14:10 -05:00
Kazuhiro Sera
96218e8bc4
Fix typos detected by github.com/client9/misspell
...
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
2018-08-10 23:52:16 +09:00
Simone Bordet
ee68e7fdec
Merge pull request #2769 from eclipse/jetty-9.4.x-issue-2767-websocket-client-default-policy
...
Issue #2767 - WebSocket Policy on JSR356 ClientContainer not represented correctly
2018-08-08 13:02:09 +02:00
WalkerWatch
ab3f4832ad
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-08-07 21:47:02 -04:00
WalkerWatch
e485b8d78d
Fixing second typo for #2781
2018-08-07 21:45:38 -04:00
WalkerWatch
b249021b6d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-08-07 21:18:25 -04:00
WalkerWatch
997106b5d4
Resolves #2781 - Typo in javadoc
2018-08-07 21:17:29 -04:00
Joakim Erdfelt
9a4b780781
Issue #2767 - WebSocket Policy on JSR356 ClientContainer not represented correctly
...
+ Added Client unit tests for large messages
+ Re-enabled Server unit tests for large messages
+ Added more Server unit tests for large messages
+ In case of JSR356 Server with policy (and Behavior of SERVER)
is controlling javax.websocker.server.ServerContainer
and a user chooses to use that ServerContainer to
connect to a remote websocket endpoint (using ServerContainer
as a client), then the policy is delegated down to the
Client Container with a different behavior (only).
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-06 15:21:22 -05:00
Joakim Erdfelt
9390c2df3f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-06 09:04:58 -05:00
Joakim Erdfelt
586484850f
Issue #2768 - JSR356 Session.getUserProperties() is null during @OnOpen
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-02 09:16:34 -05:00
Simone Bordet
0892ed8983
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-07-18 16:25:39 +02:00
Clément Delgrange
51769fc645
Fixes #2694 - Dynamic imports of Websocket servlet
...
Fixes the dynamic imports of `org.eclipse.jetty.websocket.server` and `org.eclipse.jetty.websocket.server.pathmap` as explained in the issue #2694 proposition 2. (previously the content of `org.eclipse.jetty.websocket.server` was not imported)
Signed-off-by: Clément Delgrange <cl.delgrange@protonmail.com>
2018-07-12 11:55:59 +02:00
Joakim Erdfelt
0b69f00665
Updating to version 9.4.12-SNAPSHOT
2018-07-11 17:32:16 -05:00
Joakim Erdfelt
260596dd10
Updating to version 9.4.12.RC0
2018-07-11 16:30:55 -05:00
Joakim Erdfelt
4204187eae
Fixing compilation error
2018-07-03 12:31:12 -05:00
Joakim Erdfelt
30f6132117
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-07-03 10:55:22 -05:00
Joakim Erdfelt
33c497a883
Issue #2683 - FrameFlusher.toString() isn't thread safe
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-27 07:06:38 -05:00
Joakim Erdfelt
2e5f106285
Issue #2655 - Applying changes requested from review.
...
+ WebSocketClient all constructors now delegate down into one
implementation
+ NativeWebSocketServletConfiguration is now managed properly
+ WebSocketServletFactory can find Executor as bean too
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-20 12:59:23 -05:00
Joakim Erdfelt
870c87f2f7
Issue #2655 - Removing closed WebSocket Session's from WebSocketClient
...
+ Correcting Native WebSocketConfiguration impact.
+ CDI requires a customized DecoratedObjectFactory, which is bound
later in the lifecycle, which means we cannot rely on it being
provided directly in the constructors, but rather have to look
for it in the ServletContext.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-13 16:53:14 -05:00
Greg Wilkins
346879f2a5
Merge pull request #2664 from mperktold/jetty-9.4.x
...
Issue #2662 Unnecessary boxing conversions
2018-06-13 22:52:27 +02:00
Matthias Perktold
f901efc413
Issue #2662 - Unnecessary boxing conversions
...
Signed-off-by: Matthias Perktold <tias251@gmail.com>
2018-06-13 16:20:12 +02:00
Joakim Erdfelt
591b0a2e37
Post-Merge build fixes
2018-06-12 12:54:41 -05:00
Joakim Erdfelt
0cd4dacbac
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-2/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/pom.xml
# jetty-nosql/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-server/pom.xml
# jetty-server/src/main/config/etc/jetty-http.xml
# jetty-server/src/main/config/etc/jetty-ssl.xml
# jetty-servlet/pom.xml
# jetty-servlets/pom.xml
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/pom.xml
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java
# jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientCloseTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilterTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/FragmentExtensionTest.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/sockets/pong/PongContextListener.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/ConfiguratorTest.java
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-http2-webapp/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2018-06-12 11:11:38 -05:00
Joakim Erdfelt
e4bfe00dce
Updating to version 9.4.12-SNAPSHOT
2018-06-05 14:18:37 -05:00
Joakim Erdfelt
d5fc0523cf
Updating to version 9.4.11.v20180605
2018-06-05 13:23:02 -05:00
Simone Bordet
d846414c66
Issue #2625 - Test failure: websocket.client/ClientCloseTest.testStopLifecycle.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-05 20:09:31 +02:00
Joakim Erdfelt
1269419b32
Issue #2603 - Improving ByteAccumulator max size calc
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-31 07:21:03 -05:00
Joakim Erdfelt
277912864f
Issue #2604 - Improving ByteAccumulator testing and errors
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-31 07:20:16 -05:00
Simone Bordet
b75a2df679
Issue #2605 - Failing test: WebSocketUpgradeFilterTest.testStopStartOfHandler
...
Ignored for now.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-30 17:34:16 +02:00
Lachlan Roberts
903803c30e
Issue #2584 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-30 14:26:54 +10:00
Lachlan Roberts
69aaabac24
fixes to printed exception stack traces in tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-29 17:55:14 +10:00
Lachlan Roberts
52ffe24389
Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-stackTraceRemoval
2018-05-29 10:57:51 +10:00
Joakim Erdfelt
a6547eaf83
Issue #2559 - Use Configurator declared in ServerEndpointConfig over @ServerEndpoint annotation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-25 06:29:33 -05:00
Lachlan Roberts
0ebe50ae8b
Issue #2567 - Switched order of StacklessLogging and request sending to prevent logging the stack trace
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-24 16:16:08 +10:00
Lachlan Roberts
fe9bfda2c3
Issue #2567 - Unreachable Code in MisbehavingClassTest
...
Reworked MisbehavingClassTest to fix sections of unreachable code causing exception stack traces to be logged.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-24 10:15:47 +10:00
Joakim Erdfelt
bc16b6efae
Issue #2559 - Use Configurator declared in ServerEndpointConfig over @ServerEndpoint annotation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-22 09:44:20 -05:00
Simone Bordet
7a7aa0f1b1
Fixes #2536 - Broken ClientConnectTest.testConnectionTimeout_Concurrent.
...
Using try-with-resources to keep the Socket instance
from being GCd before the test finishes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-16 14:48:05 +02:00
Simone Bordet
804b770581
Issue #2536 - Broken ClientConnectTest.testConnectionTimeout_Concurrent.
...
Updated the code to show more information when it fails.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-16 14:25:14 +02:00
Joakim Erdfelt
1732ffca51
Updating to version 9.4.11-SNAPSHOT
2018-05-03 11:48:05 -05:00
Joakim Erdfelt
daa59876e6
Updating to version 9.4.10.v20180503
2018-05-03 10:55:19 -05:00
Joakim Erdfelt
d20e19af77
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2018-05-02 13:38:58 -05:00
Joakim Erdfelt
57b9f2ef22
Minor typo
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-27 08:27:31 -05:00
Joakim Erdfelt
76dec16fde
Issue #2491 - minor revert based on review
2018-04-26 16:12:29 -05:00
Joakim Erdfelt
c596fcaac1
Issue #2491 - FragmentExtension produces out of order frames
...
+ Adding testcase to ensure no regression
+ All data frames that arrive, are now sent through the
IteratingCallback to ensure that that input frame order
is preserved.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-26 12:54:15 -05:00
Joakim Erdfelt
440d89750a
Track frameCount for tests now
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-26 12:51:49 -05:00
Joakim Erdfelt
5d83d98e96
AbstractExtension properly handles Callback error now
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-26 12:51:18 -05:00
Joakim Erdfelt
9b8540aef4
OpCode.isDataFrame(byte) missing CONTINUATION
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-26 12:50:32 -05:00
Joakim Erdfelt
5add914942
Issue #2491 - Fragmented Messages arrive out of order.
...
+ Adding testcase for RemoteEndpoint
+ Adding testcase for FrameFlusher
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-26 11:19:19 -05:00
Joakim Erdfelt
0f238baaf7
Merge pull request #2470 from eclipse/jetty-9.4.x-issue-2376-ws-context-relaxation
...
Issue #2376 - relax ContextHandler requirements
2018-04-26 06:37:28 -05:00
Joakim Erdfelt
1c0bbae9cc
Issue #2376 - Applying recommended scope changes
2018-04-24 16:30:01 -05:00
Joakim Erdfelt
8763c6065d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-04-20 11:32:46 -05:00
Jan Bartel
0e88849a68
Issue #2164 Make osgi.serviceloader mostly optional ( #2408 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-04-18 14:48:53 +10:00
Olivier Lamy
f36eba4577
class.newInstance is deprecated #2435 ( #2437 )
...
* Class.newInstance() is deprecated in Java 9+ #2435
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-17 19:07:20 +10:00
Joakim Erdfelt
be3c5a08d0
Reducing noise on test output
2018-04-05 16:33:40 -05:00
Joakim Erdfelt
2b32f82aeb
Merge pull request #2393 from eclipse/jetty-9.4.x-issue-2337-ws-subprotocols
...
Issue #2337 - slightly more efficient getSubProtocols() behavior
2018-04-04 06:22:17 -05:00
Jan Bartel
16e625adde
Issue #2109 remove warnings for unused imports and exports ( #2390 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-04-04 12:06:43 +10:00
Joakim Erdfelt
cf5b473571
Issue #2376 - relax ContextHandler requirements
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-28 13:39:07 -05:00
Joakim Erdfelt
8bf695bf49
Issue #2337 - slightly more efficient getSubProtocols() behavior
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-28 11:16:10 -05:00
Joakim Erdfelt
1c04f9838d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-22 16:42:42 -05:00
Joakim Erdfelt
c3cc138a3b
Updating to version 9.4.10-SNAPSHOT
2018-03-20 08:25:59 -05:00
Joakim Erdfelt
1f8159b1e4
Updating to version 9.4.9.v20180320
2018-03-20 07:18:24 -05:00
WalkerWatch
534b8ea38b
Add edit warning for .mod files. Resolves #173
2018-03-15 13:23:42 -04:00
Joakim Erdfelt
93b6877d72
Issue #2210 - fixing flaw in safety checks with JSR356 ClientContainer
2018-03-14 16:18:19 -05:00
Joakim Erdfelt
9322956512
Issue #2210 - adding httpclient safety checks.
...
+ ISE on non started HttpClient
+ ISE on use of wss:// URI with HttpClient without an SSL config
2018-03-14 10:28:56 -05:00
Joakim Erdfelt
0361cf6cd3
Simplifying testcase, relying on flush not sleep.
2018-03-12 16:33:39 -05:00
Joakim Erdfelt
eaefc6a9c2
Merge branch 'jetty-9.4.x-2282-websocket-test-remove-eventqueue' into jetty-9.4.x
2018-03-12 12:12:02 -05:00
Joakim Erdfelt
5541fcbdba
Issue #2282 - final testing tweaks
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-07 18:34:03 -06:00
Joakim Erdfelt
e76f6d7baf
Issue #2282 - more websocket test stablization
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-07 17:42:02 -06:00
Joakim Erdfelt
abf1262848
Issue #2282 - More work on websocket server side tests
2018-03-07 14:29:22 -06:00
Joakim Erdfelt
bca53be4f4
Fixes #2282 - Fixing Fuzzer.
...
+ Client lifecycle now honored
+ Slow write now possible
2018-03-07 07:55:05 -06:00
Joakim Erdfelt
dd57cf0bf6
Issue #2282 - Simplifying BlockheadClient to drastically reduce CPU load during testing
2018-03-06 21:01:39 -06:00
Greg Wilkins
bcb9fa3b32
Merge pull request #2257 from lachlan-roberts/jetty-9.4.x-2206-ReferenceEquality
...
Resolved errorprone ReferenceEquality warnings #2206
2018-03-07 11:11:40 +11:00
Joakim Erdfelt
e3e3f9eb0b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-06 11:16:25 -06:00
Joakim Erdfelt
e4ad88aaf1
Issue #2282 - simplifying EventCapture
2018-03-06 09:18:18 -06:00
Greg Wilkins
a272fb6e39
Improve executorSizedThreadPool ( #2253 )
...
Improve executorSizedThreadPool (#2253 )
* Improve executorSizedThreadPool
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Improved implementation.
Implemented name, thread priorities, thread group and daemon properties.
Implemented toString(), dump() and using a thread factory.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
* added threadpool benchmark;
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Renamed ExecutorSizedThreadPool to ExecutorThreadPool
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-06 19:07:41 +11:00
Lachlan Roberts
31347db71b
changes after second review from gregw
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-06 17:21:15 +11:00
Lachlan Roberts
020ebde77c
found additional ReferenceEquality warnings which have been resolved
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-06 14:28:11 +11:00
Joakim Erdfelt
1373025dff
Issue #2282 - removing EventQueue from websocket tests
2018-03-05 17:52:23 -06:00
Joakim Erdfelt
076f3a8ab2
Issue #2269 - reworking SessionTest to be more resilient
2018-03-05 14:34:23 -06:00
Lachlan Roberts
a639ee9275
Resolved errorprone MissingOverride warnings #2206
...
`@Override` was added to methods which were missing the annotation #2206
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-01 13:59:25 +11:00
Joakim Erdfelt
dc87eec9bd
Fixes #2246 - Reworking await for messages to be more resilient
2018-02-26 13:33:30 -06:00
Joakim Erdfelt
6fa855e856
Fixes #2234 - Making assertion on reason phrase more resilient to race condition for Abnormal closure.
2018-02-26 13:26:03 -06:00
Jan Bartel
1e8422935c
Issue #2164 Add test for javax.websocket in osgi
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-20 16:28:39 +11:00
Jan Bartel
17f518ffb1
Issue #2164 Update websocket manifests for osgi and add test in osgi
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-20 16:28:39 +11:00
Greg Wilkins
b94d26a720
less fragile tests
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-02-20 10:19:32 +11:00
Joakim Erdfelt
650b804142
Issue #2108 - Updating license headers for year 2018
2018-01-09 10:14:52 -06:00
Joakim Erdfelt
d5a0878019
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 10:08:30 -06:00
Joakim Erdfelt
21365234f8
Issue #2108 - Updating license headers for year 2018
2018-01-09 09:44:41 -06:00
Joakim Erdfelt
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
Joakim Erdfelt
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
Joakim Erdfelt
067fc5d2d8
Issue #2108 - Upgrade licenses for 2018
2018-01-09 07:42:06 -06:00
Greg Wilkins
45e3abbdcf
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 13:17:32 +01:00
Joakim Erdfelt
34375a7e0e
Post-Merge Build/Test fixes
2018-01-08 15:38:23 -06:00
Greg Wilkins
88cf4603c5
Merge branch 'jetty-9.4.x' into bugfix/javadoc_fixes_2056
2018-01-08 21:31:48 +01:00
Greg Wilkins
b2ff7c5cb8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-08 21:30:12 +01:00
olivier lamy
083c8045e8
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 16:10:52 +11:00
olivier lamy
1a49a6fb7e
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 12:28:12 +11:00
Greg Wilkins
41050cd8a4
Issue #2081 No idle timeout exception when dispatch is delayed ( #2083 )
...
Issue #2081 No idle timeout exception when dispatch is delayed
* Delegate the readtimeout handling to HttpChannel so that a delayed dispatch can be ended.
* Added unit test for delayed dispatch idle
* Now using HttpInput.onIdleTimeout() to fail the HttpInput, and then dispatching the request in case it has not been dispatched yet. This ensure consistent behavior independently of the value of HttpConfiguration.delayDispatchUntilContent.
* Fixed for both HTTP/1.1 and HTTP/2.
* Added tests for non-blocking reads.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-01-04 13:26:31 +01:00
Joakim Erdfelt
2dd970b055
Updating to version 9.2.24-SNAPSHOT
2017-12-18 10:43:47 -06:00
Joakim Erdfelt
cdbe733684
Updating to version 9.2.23.v20171218
2017-12-18 09:06:48 -06:00
Joakim Erdfelt
ff53002fac
Updating to version 9.4.9-SNAPSHOT
2017-11-21 13:11:31 -07:00
Joakim Erdfelt
82b8fb23f7
Updating to version 9.4.8.v20171121
2017-11-21 12:33:52 -07:00
Jesse McConnell
a72eb0001d
Updating to version 9.3.23-SNAPSHOT
2017-10-30 15:39:57 -05:00
Jesse McConnell
705048cc49
Updating to version 9.3.22.v20171030
2017-10-30 15:16:29 -05:00
Joakim Erdfelt
7a3f9bfeb7
Fixing compilation issue surrounding deprecated Utf8PartialBuilder
2017-10-19 12:35:34 -07:00
Greg Wilkins
dde65f2633
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-19 20:45:40 +11:00
Greg Wilkins
729dd41493
Added partial string support to Utf8Appendable
2017-10-19 20:43:46 +11:00
Joakim Erdfelt
c3c3881c9f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-10 13:44:22 -07:00
Joakim Erdfelt
d34f04c559
Issue #1881 - eliminate NPE in id generation against UnixSocketChannel
2017-10-10 12:09:52 -07:00
Joakim Erdfelt
ce039eb4cb
Merge branch 'issue-272-ws-blockingwrite' into jetty-9.4.x
2017-10-10 11:23:03 -07:00
Simone Bordet
63beada72e
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-06 16:46:00 +02:00
Simone Bordet
c93360ad9c
Issue #1851 - Improve insufficient thread warnings/errors.
...
Added ExecutorSizedThreadPool, a wrapper around JDK's ThreadPoolExecutor
that implements SizedThreadPool (and therefore returns a ThreadPoolBudget).
Deprecated ExecutorThreadPool, an older version of ExecutorSizedThreadPool.
2017-10-06 16:36:46 +02:00
Simone Bordet
4389da9196
Issue #272 - WebSocket hangs in blockingWrite.
...
Rewritten FrameFlusher.
2017-10-05 22:20:22 +02:00
Joakim Erdfelt
6faaf3346c
Issue #272 - Read/Parse exceptions should flow out, so Session can handle it via new Session.close()
2017-10-03 15:30:32 -07:00
Joakim Erdfelt
c0dfa1dd50
Issue #272 - Attempting to centralize close logic in Session.close()
2017-10-03 15:29:27 -07:00
Joakim Erdfelt
bb5195192a
Issue #272 - Addressing some concerns with multithreading in FrameFlusher
2017-10-03 15:20:16 -07:00
Joakim Erdfelt
a46e8bb2e5
Removing junit Rule based LeakTrackingBufferPool implementation
2017-09-27 15:05:34 -07:00
Greg Wilkins
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10:00
Joakim Erdfelt
d9865a02ba
Updating to version 9.4.8-SNAPSHOT
2017-09-14 08:44:27 -07:00
Joakim Erdfelt
80fb788d0c
Updating to version 9.4.7.v20170914
2017-09-14 07:35:18 -07:00
Simone Bordet
ac2776259c
Issue #1815 - WebSocket test failures.
...
Ignored unstable tests.
2017-09-13 10:46:22 +02:00
Joakim Erdfelt
45a4b87a33
Fixes #1662 - Removing harmless NPE on websocket compress with null frame payload
2017-09-06 10:57:28 -07:00
Joakim Erdfelt
28d2f30769
Fixing compilation error
2017-09-06 10:24:47 -07:00
Joakim Erdfelt
db77305550
Fixes #1756 - improving javadoc for WebSocketPolicy max text/binary message size
2017-09-06 10:22:12 -07:00
Joakim Erdfelt
acc7c97969
Removing @Rule LeakTrackingBufferPoolRule - bad threading behavior / false positives
2017-09-06 10:16:32 -07:00
Joakim Erdfelt
752fda19b9
Fixes #1767 - removing debug output from testing
2017-09-06 10:14:49 -07:00
Simone Bordet
bce20d1b2e
Merged branch 'jetty-9.4.x' into 'master'.
2017-09-04 15:57:01 +02:00
Joakim Erdfelt
02f0649840
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-28 11:33:12 -07:00
Lucas Fairchild-Madar
b24c4e1a8a
further match coding style
2017-08-25 12:36:48 -07:00
Lucas Fairchild-Madar
84ff1e3a66
Matching coding style; block potential race condition
...
Signed-off-by: Lucas Fairchild-Madar <lfairchildmadar@flightstats.com>
2017-08-25 12:35:45 -07:00
Lucas Fairchild-Madar
7d1d7a9724
Preserve delayed initialization semantics
...
Signed-off-by: Lucas Fairchild-Madar <lfairchildmadar@flightstats.com>
2017-08-25 12:33:41 -07:00
Lucas Fairchild-Madar
b680d1deea
Allow for configuring WebSocketClient JVM lifecycle
...
Signed-off-by: Lucas Fairchild-Madar <lfairchildmadar@flightstats.com>
2017-08-25 11:23:08 -07:00
Joakim Erdfelt
9f28d26cff
Fixed #1766 - Fixing test case results
2017-08-23 15:58:22 -07:00
Joakim Erdfelt
f8d29c5f28
Fixed #1766 - client container is managed now
2017-08-23 15:20:47 -07:00
Joakim Erdfelt
2ed620b1f4
Fixed #1766 - removing common executor/bufferpool in JettyClientContainerProvider
2017-08-23 14:46:41 -07:00
Joakim Erdfelt
3ec5f8fa3d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-09 16:21:08 -07:00
WalkerWatch
d5a9f0e0e5
EOL Fix
2017-08-09 17:42:15 -04:00
Joakim Erdfelt
b0fd444a1b
File EOL issue, post-hard reset
2017-08-09 14:31:06 -07:00
Joakim Erdfelt
71d5fcf246
Fixing javadoc errors
2017-08-08 11:09:25 -07:00
Joakim Erdfelt
952bb8dfdd
Fixing compilation
2017-08-08 10:40:58 -07:00
Joakim Erdfelt
54367621e4
Fixing cdi/websocket pom versions
2017-08-08 09:54:09 -07:00
Joakim Erdfelt
3fdbcffbbd
Updating to version 9.2.23-SNAPSHOT
2017-08-08 09:12:55 -07:00
Joakim Erdfelt
a7bcac6d75
Updating to version 9.3.20.v20170531
2017-08-08 09:07:35 -07:00
Joakim Erdfelt
796da084b4
Issue #1625 - Support new IANA declared websocket close status codes
2017-08-08 08:49:58 -07:00
Joakim Erdfelt
af4962f842
Issue #1605 - common executor and bufferpool for jsr356 client
2017-08-08 08:49:57 -07:00
Joakim Erdfelt
0de3673132
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-08-08 08:49:57 -07:00
Joakim Erdfelt
5b72d8a733
Issue #1604 - WebSocketContainer stop is now smarter
2017-08-08 08:49:56 -07:00
Joakim Erdfelt
ab98caafbb
Issue #1603 - fixing NPE in WebSocketServerFactory init
2017-08-08 08:49:55 -07:00
Joakim Erdfelt
11a544d6ac
Updating to version 9.3.22-SNAPSHOT
2017-08-01 11:26:37 -07:00
Joakim Erdfelt
bb1d69ca52
Updating to version 9.3.21.M0
2017-08-01 10:47:04 -07:00
Greg Wilkins
b358c06974
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-18 12:46:44 +02:00
Joakim Erdfelt
273dcc4131
Improving output seen during websocket-tests to squelch known stacktraces produced by testcase
2017-07-17 14:18:17 -07:00
Joakim Erdfelt
f4d019def4
Fixing websocket tests to use new Jetty 10.x webapp configuration style
2017-07-13 09:38:10 -07:00
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
9e9a8b66cb
Issue #1650 - correcting testcase relying on odd LocalEndPoint behavior
2017-07-07 16:02:15 -07:00
Joakim Erdfelt
22f815ddfd
Issue #1650 - testing improvements
2017-07-07 13:16:31 -07:00
Joakim Erdfelt
90d9823307
Issue #1650 - restoring 2 more testcases
2017-07-07 08:41:31 -07:00
Joakim Erdfelt
ee8d4c1587
gitattributes followup
2017-07-06 16:24:31 -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
a037d8bbcb
More websocket test fixes
2017-06-26 11:59:55 -07:00
Joakim Erdfelt
f5e273b4a3
Enabling more websocket tests
2017-06-26 11:59:54 -07:00
Joakim Erdfelt
0d43636658
Turning down logging level
2017-06-26 11:59:53 -07:00
Joakim Erdfelt
e9ab0b3994
Correcting dumps to only occur during DEBUG
2017-06-26 11:59:52 -07:00
Joakim Erdfelt
db9997a792
Fixing WebSocket MessageReceivingTest
2017-06-26 11:59:52 -07:00
Joakim Erdfelt
52ded32ea0
Restoring JSR356 Session.setMax*MessageBufferSize() spec behavior
2017-06-26 11:59:51 -07:00
Joakim Erdfelt
9e2b25bae2
Removing bad log silencing technique
2017-06-26 11:59:50 -07:00
Joakim Erdfelt
6f762f645f
Hightlighting double-close issue better in logs
2017-06-26 11:59:50 -07:00
Joakim Erdfelt
03dc425fe1
Reader-Self not relevant, removing
2017-06-26 11:59:49 -07:00
Joakim Erdfelt
871e404623
Issue #1616 - Making test more reliable
2017-06-26 11:59:48 -07:00
Joakim Erdfelt
93b565acec
Testing / UntrustedWSServer improvements
2017-06-26 11:59:48 -07:00
Joakim Erdfelt
877fdaba8b
Correcting error message
2017-06-26 11:59:47 -07:00
Joakim Erdfelt
b333fad9c2
Issue #1616 enabling debug output for CI testing
2017-06-26 11:59:46 -07:00
Joakim Erdfelt
4ee342c55e
Disabling test in master
2017-06-26 11:59:46 -07:00
Joakim Erdfelt
310bbda38a
WebSocket SuspendResume updated tests and notes from review
2017-06-26 11:59:45 -07:00
Joakim Erdfelt
0c8d264ae6
WebSocket Client sending Close/ProtocolError should also see onError
2017-06-26 11:59:44 -07:00
Joakim Erdfelt
f36f8fa0b8
Squelching Stacktraces
2017-06-26 11:59:44 -07:00
Joakim Erdfelt
091a79a850
Reviewing more @Ignore'd WebSocket tests
2017-06-26 11:59:43 -07:00
Joakim Erdfelt
61fc95aa36
Issue #1599 - WebSocketClient early close scenarios
...
+ Connection timeout results in:
endpoint.onError(WebSocketTimeoutException)
localSession.close(SHUTDOWN)
2017-06-26 11:59:42 -07:00
Joakim Erdfelt
1ac16dd19b
Reduce testing noise
2017-06-26 11:59:42 -07:00
Joakim Erdfelt
f3fa1f8d4a
Disabling problematic test temporarily
2017-06-26 11:59:41 -07:00
Greg Wilkins
17f6c28c7d
Issue #1503 Optionally strip IPv6. Default true
2017-06-26 11:59:40 -07:00
Joakim Erdfelt
ccf35e62f4
Adding more leniency on connection fault tests
2017-06-26 11:59:39 -07:00
Joakim Erdfelt
8dbe1798bd
WebSocket test fix
2017-06-26 11:59:38 -07:00
Joakim Erdfelt
a1d65325fc
No more websocket test errors (need to work on issues)
2017-06-26 11:59:38 -07:00
Joakim Erdfelt
e3f1fb4bde
Fixing javadoc error
2017-06-26 11:59:37 -07:00
Joakim Erdfelt
8f57fe9da9
Fixing merge problems with issue-207 -> master
2017-06-26 11:59:36 -07:00
Joakim Erdfelt
b8e10ce9ef
Issue #207 - Close Handshake Test refactor
2017-06-26 11:59:35 -07:00
Joakim Erdfelt
a8503a2932
Issue #207 - removing scheduler
2017-06-26 11:59:34 -07:00
Joakim Erdfelt
32f478c1cd
Issue #207 - stabilizing testcase
2017-06-26 11:59:33 -07:00
Joakim Erdfelt
ae2bda4dc8
Post-merge cleanup
2017-06-26 11:59:33 -07:00
Joakim Erdfelt
51363668ed
Issue #207 - UntrustedWSServlet should have a slightly higher then default max message size
2017-06-26 11:59:32 -07:00
Joakim Erdfelt
38e8202b9e
Issue #207 - Improved testing reliability
2017-06-26 11:59:31 -07:00
Joakim Erdfelt
0e2656b938
Issue #207 - Improved Close notification and testing
2017-06-26 11:59:30 -07:00
Joakim Erdfelt
30595ccdaa
Issue #207 - Adding toString()
2017-06-26 11:59:29 -07:00
Joakim Erdfelt
c0727348d6
Issue #207 - Identify non-echo client endpoint options for testing
2017-06-26 11:59:29 -07:00
Joakim Erdfelt
135e452509
Issue #207 - Change in test expectation
2017-06-26 11:59:28 -07:00
Joakim Erdfelt
644c14253d
Issue #207 - better client connect/upgrade error handling
2017-06-26 11:59:27 -07:00
Joakim Erdfelt
04afed1338
Issue #207 - stabilizing testing of Dispatched MessageSinks
2017-06-26 11:59:26 -07:00
Joakim Erdfelt
8c1d7ed8d5
Issue #207 - test compilation fix
2017-06-26 11:59:25 -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
d43c8e7776
Issue #207 - MessageOutputStream fix
2017-06-26 11:57:26 -07:00
Joakim Erdfelt
239f88c158
Issue #207 - javadoc fix
2017-06-26 11:57:25 -07:00
Joakim Erdfelt
0c8d4dec9f
Issue #207 - cleaning up dispatched MessageSink threading
2017-06-26 11:57:24 -07:00
Joakim Erdfelt
8c0d9179cd
Issue #207 - CommonEndpointFunctionsTest needs started WebSocketContainerScope
2017-06-26 11:57:23 -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
3931336633
Issue #207 - Restoring fillAndParse callback
2017-06-26 11:57:21 -07:00
Joakim Erdfelt
6b203f5187
Issue #207 - more test fixes
2017-06-26 11:57:20 -07:00
Joakim Erdfelt
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
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
4a4069d0c2
Issue #207 - more testing updates and mainline code fixes
2017-06-26 11:53:30 -07:00
Joakim Erdfelt
c065f7d125
Issue #207 - simplifying OnUpgradeTo prefill + parse, with test
2017-06-26 11:53:29 -07:00
Joakim Erdfelt
92f8f594d1
Issue #207 - removing ignoreBrokenPipe
2017-06-26 11:53:28 -07:00
Joakim Erdfelt
5ab7bf37b2
Issue #207 - websocket-client test cleanup
2017-06-26 11:53:27 -07:00
Joakim Erdfelt
2bab817c6b
Issue #207 - common test cleanup
2017-06-26 11:53:26 -07:00
Joakim Erdfelt
9345bc3d5a
Issue #207 - more test fixes
2017-06-26 11:53:26 -07:00
Joakim Erdfelt
9fd70d3d6f
Issue #207 - more test failure fixes
2017-06-26 11:53:25 -07:00
Joakim Erdfelt
4cea9f307a
Issue #207 - Adding missing JSR356 Server @PathParam ArgIdentifier
2017-06-26 11:53:24 -07:00
Joakim Erdfelt
8e889287fa
Issue #207 - Final removal of BlockheadClient
...
# Conflicts:
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/XBlockheadClient.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/RequestHeadersTest.java
2017-06-26 11:52:46 -07:00
Joakim Erdfelt
e4790fea72
Issue #207 - Removing BlockheadServer
2017-06-26 11:51:51 -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
06f204f794
Issue #207 - moved client tests to websocket-tests
...
# Conflicts:
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowServerTest.java
2017-06-26 11:50:54 -07:00
Joakim Erdfelt
590aa59c37
Issue #207 - fixing javadoc
2017-06-26 11:50:13 -07:00
Joakim Erdfelt
1d18522a99
Issue #207 - allowing untrusted sessions to have non-validating generators
2017-06-26 11:50:13 -07:00
Joakim Erdfelt
36f40689cc
Issue #207 - websocket-common test fixes
2017-06-26 11:50:12 -07:00
Joakim Erdfelt
3d6263aafb
Issue #207 - more review rework
2017-06-26 11:50:11 -07:00
Joakim Erdfelt
5e8a7078eb
Issue #207 - more testing updates
2017-06-26 11:50:10 -07:00
Greg Wilkins
7148db67dc
tidy up close
2017-06-26 11:50:09 -07:00
Joakim Erdfelt
dddf066e90
Issue #207 - Simplifying Connection and Close states
...
+ Removing IOState
+ Adding AtomicConnectionState
+ Adding AtomicClose
+ Reworking AbstractWebSocketConnection to be focused solely on
low level Connection handling, with little to none websocket
specifics.
+ WebSocketSession simplified
2017-06-26 11:50:08 -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
3888cd5347
Issue #207 - improve port handling in URI conversions
2017-06-26 11:43:27 -07:00
Joakim Erdfelt
affda23876
Issue #207 - ongoing testing improvements
2017-06-26 11:43:26 -07:00
Joakim Erdfelt
b2fa9cd23a
Issue #207 - fixing compilation error
2017-06-26 11:43:25 -07:00
Joakim Erdfelt
38fefa6471
Issue #207 - Improved Error Handling
2017-06-26 11:43:24 -07:00
Joakim Erdfelt
d5151ddc90
Issue #207 - remove IncomingFrames#incomingError(throwable)
2017-06-26 11:43:22 -07:00
Joakim Erdfelt
b93925e03e
Issue #207 - more work on policy / buffer behaviors
2017-06-26 11:43:21 -07:00
Joakim Erdfelt
aae4a24726
Issue #207 - reworking I/O to allow streaming backpressure
2017-06-26 11:43:20 -07:00
Joakim Erdfelt
be747c44e1
Issue #207 - removing unused section
2017-06-26 11:43:19 -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
0672f621e5
Issue #207 - Cannot catch PING in JSR356
2017-06-26 11:33:33 -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
d8f06df8b2
Fixing master tests (no longer need to specify Configuration)
2017-06-26 11:31:41 -07:00
Joakim Erdfelt
3c790ab64e
Issue #207 - fixing EchoTest
2017-06-26 11:31:40 -07:00
Christoph Dreis
41d4b59c19
Precompile pattern for checking of classes in javax package in ReflectUtils
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-06-26 11:31:39 -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
52a8101cd2
Issue #207 - ensuring WebSocketServerFactory init occurs earlier
2017-06-26 11:31:35 -07:00
Joakim Erdfelt
61dc476342
Removing eclipse detrius
2017-06-26 11:31:34 -07:00
Joakim Erdfelt
527e5f8e4c
Issue #207 - improving errors for Encoders/Decoders
2017-06-26 11:31:33 -07:00
Joakim Erdfelt
d10de87e09
Issue #207 - javax.websocket.DeploymentException thrown at addEndpoint now
2017-06-26 11:31:32 -07:00
Joakim Erdfelt
3a37386ae9
Issue #207 - Using connection idle-timeout declared in annotation
2017-06-26 11:31:31 -07:00
Joakim Erdfelt
fa635f5ecd
Issue #207 - correcting lifecycle of WebSocketSession and EndpointFunctions
...
# Conflicts:
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectPromise.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
2017-06-26 11:30:35 -07:00
Joakim Erdfelt
1d3c1cefbe
Fixing up testcase reporting
2017-06-26 11:29:15 -07:00
Joakim Erdfelt
1a8e79c9bb
Issue #207 - Support javax.websocket version 1.1
...
+ More testcase improvements
2017-06-26 11:29:14 -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
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
Joakim Erdfelt
005ecbd704
More websocket test fixes
2017-06-21 14:10:08 -07:00
Joakim Erdfelt
31705767f0
Enabling more websocket tests
2017-06-21 07:56:48 -07:00
Joakim Erdfelt
4f2c31867e
Turning down logging level
2017-06-20 13:43:21 -07:00
Joakim Erdfelt
d7483934a0
Correcting dumps to only occur during DEBUG
2017-06-20 13:42:53 -07:00
Joakim Erdfelt
157fc4140b
Fixing WebSocket MessageReceivingTest
2017-06-20 13:40:30 -07:00
Joakim Erdfelt
d0513ecbe6
Restoring JSR356 Session.setMax*MessageBufferSize() spec behavior
2017-06-20 13:40:05 -07:00
Joakim Erdfelt
b7959456fb
Removing bad log silencing technique
2017-06-20 13:39:27 -07:00
Joakim Erdfelt
03afcc8487
Hightlighting double-close issue better in logs
2017-06-20 09:55:48 -07:00
Joakim Erdfelt
8d18118688
Reader-Self not relevant, removing
2017-06-20 09:55:21 -07:00
Joakim Erdfelt
5638f7b25b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-16 14:33:01 -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
d8775c77d9
Issue #1616 - Making test more reliable
2017-06-15 13:36:03 -07:00
Joakim Erdfelt
c496dd7961
Testing / UntrustedWSServer improvements
2017-06-15 13:35:40 -07:00
Joakim Erdfelt
e1ebcdaf18
Correcting error message
2017-06-15 13:34:17 -07:00
Joakim Erdfelt
fc15da79d4
Issue #1616 enabling debug output for CI testing
2017-06-14 16:19:44 -07:00
Joakim Erdfelt
08962366ee
Disabling test in master
2017-06-14 16:18:18 -07:00
Joakim Erdfelt
d02a14eeed
WebSocket SuspendResume updated tests and notes from review
2017-06-14 11:14:59 -07:00
Joakim Erdfelt
7786d0fc2b
WebSocket Client sending Close/ProtocolError should also see onError
2017-06-14 10:01:01 -07:00
Joakim Erdfelt
b31de636b4
Squelching Stacktraces
2017-06-14 08:43:10 -07:00
Joakim Erdfelt
272679b39c
Reviewing more @Ignore'd WebSocket tests
2017-06-13 14:23:09 -07:00
Joakim Erdfelt
00beb607fc
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-13 10:40:02 -07:00
Joakim Erdfelt
bd751b6ce2
Issue #1599 - WebSocketClient early close scenarios
...
+ Connection timeout results in:
endpoint.onError(WebSocketTimeoutException)
localSession.close(SHUTDOWN)
2017-06-13 09:47:44 -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
Joakim Erdfelt
064c1bc39a
Issue #1604 - WebSocketContainer stop is now smarter
2017-06-07 11:48:36 -07:00
Joakim Erdfelt
c1143fcc90
Issue #1603 - fixing NPE in WebSocketServerFactory init
2017-06-07 09:56:58 -07:00
Joakim Erdfelt
0e5af3cc28
Reduce testing noise
2017-06-06 14:48:38 -07:00
Joakim Erdfelt
4d2c299fe8
Updating to version 9.2.23-SNAPSHOT
2017-06-06 08:55:12 -07:00
Joakim Erdfelt
ccea772fc3
Disabling problematic test temporarily
2017-06-06 08:42:44 -07:00
Greg Wilkins
ad76aa6c65
Issue #1503 Optionally strip IPv6. Default true
2017-06-06 17:07:14 +02:00
Joakim Erdfelt
0af30bce5a
Updating to version 9.2.22.v20170606
2017-06-06 07:03:05 -07:00
Joakim Erdfelt
059aa3cbe0
Adding more leniency on connection fault tests
2017-06-05 16:24:53 -07:00
Joakim Erdfelt
88106fd355
WebSocket test fix
2017-06-05 14:26:53 -07:00
Joakim Erdfelt
bc0fd4e1ef
No more websocket test errors (need to work on issues)
2017-06-05 14:16:48 -07:00
Joakim Erdfelt
f98b4bd087
Fixing javadoc error
2017-06-05 11:16:45 -07:00
Joakim Erdfelt
0ac5e569d4
Fixing merge problems with issue-207 -> master
2017-06-05 10:37:41 -07:00
Joakim Erdfelt
5d7e97993c
Merge remote-tracking branch 'origin/master' into issue-207-master
2017-06-05 10:05:05 -07:00
Joakim Erdfelt
3e83908c58
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-06-05 10:02:01 -07:00
Joakim Erdfelt
99fbc30f92
Issue #207 - Close Handshake Test refactor
2017-06-05 09:48:07 -07:00
Simone Bordet
b953f8d2d0
Merged branch 'jetty-9.4.x' into 'master'.
2017-06-05 18:07:51 +02:00
Joakim Erdfelt
6a3c40e935
Updating to version 9.4.7-SNAPSHOT
2017-05-31 17:26:34 -07:00
Joakim Erdfelt
8ba0f2d95d
Updating to version 9.4.6.v20170531
2017-05-31 16:22:52 -07:00
Joakim Erdfelt
429380d36a
Updating to version 9.3.21-SNAPSHOT
2017-05-31 16:10:04 -07:00
Joakim Erdfelt
0f3b1cbe36
Updating to version 9.3.20.v20170531
2017-05-31 15:24:57 -07:00
Joakim Erdfelt
0f98e607e8
Issue #1514 - fixing bad websocket dump output
2017-05-31 13:36:27 -07:00
Joakim Erdfelt
8ca70c691c
Issue #1569 - relaxing WebSocketPolicy.setMax*MessageSize checks
...
+ Allow setting of the max (binary|text) message size to -1 to
have unconstrained message sizes.
+ Disconnect message size from buffer size in JSR356 Session calls
2017-05-31 13:06:36 -07:00
Joakim Erdfelt
79b822339c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-31 06:18:40 -07:00
Greg Wilkins
32bc9292a2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-31 11:56:47 +02:00
Joakim Erdfelt
355f4ed7f3
Removing redundant new URI
2017-05-30 12:16:10 -07:00
Joakim Erdfelt
ae496051de
Fixing confusing wss -> https case
2017-05-30 12:15:01 -07:00
Greg Wilkins
ab4d300ae7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-30 17:43:19 +02:00
Greg Wilkins
50500ac99d
Issue #1568 handle query strings with encoded characters
2017-05-24 23:03:22 +02:00
Greg Wilkins
78280d0595
Issue #1568 handle query strings with encoded characters
2017-05-24 09:22:16 +02:00
Joakim Erdfelt
4731470188
Issue #1568 - fixing accidental NPE with no query
2017-05-23 11:59:39 -07:00
Joakim Erdfelt
296050dfc4
Issue #1568 - Fixing improper query encoding in WebSocket ServletUpgradeRequest
2017-05-23 10:32:22 -07:00
Greg Wilkins
d3e50f8f80
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-22 23:37:51 +02:00
Joakim Erdfelt
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
Joakim Erdfelt
e001fe0355
Issue #1528 - pull preconfigured HttpClient from attributes
...
+ Search ServletContext attributes first
+ Search Server attributes next
2017-05-19 08:27:53 -07:00
Joakim Erdfelt
7b2a0e380d
Using ThreadClassLoaderScope
2017-05-18 16:13:16 -07:00
Joakim Erdfelt
75101dfa0c
Issue #1528 - WebSocketClient can use jetty-websocket-httpclient.xml
...
+ Will use XML resource (if jetty-xml is present, and resource found)
to load the HttpClient configuration that should be used by the
new WebSocketClient() instance.
2017-05-18 15:06:22 -07:00
Joakim Erdfelt
9b4bfbc680
Issue #1544 - Identifying context that JSR-356 was disabled for in configuration
2017-05-18 14:03:16 -07:00
Joakim Erdfelt
1ba61e8e0c
Issue #207 - removing scheduler
2017-05-15 13:38:45 -07:00
Joakim Erdfelt
4e2f6265eb
Issue #207 - stabilizing testcase
2017-05-15 13:16:54 -07:00
Joakim Erdfelt
77252270ff
Post-merge cleanup
2017-05-15 10:06:47 -07:00
Joakim Erdfelt
04b6afe879
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-05-15 09:48:41 -07:00
Joakim Erdfelt
873c3554e7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-12 14:06:21 -07:00
Joakim Erdfelt
016cbfa5f4
Issue #207 - UntrustedWSServlet should have a slightly higher then default max message size
2017-05-11 13:26:03 -07:00
Joakim Erdfelt
2ed56d4142
Issue #207 - Improved testing reliability
2017-05-11 13:20:31 -07:00
Joakim Erdfelt
5701de4fd8
Issue #207 - Improved Close notification and testing
2017-05-11 11:07:41 -07:00
Joakim Erdfelt
92741b2116
Issue #207 - Adding toString()
2017-05-11 10:59:32 -07:00
Joakim Erdfelt
6cfcbeffad
Issue #207 - Identify non-echo client endpoint options for testing
2017-05-11 10:59:16 -07:00
Joakim Erdfelt
e84e875e14
Issue #207 - Change in test expectation
2017-05-11 10:57:31 -07:00
Joakim Erdfelt
c75e3c19d9
Issue #1516 - making WebSocket started thread pools have identifying names
2017-05-11 09:52:02 -07:00
Joakim Erdfelt
b1f8f492b9
Issue #207 - better client connect/upgrade error handling
2017-05-11 07:06:18 -07:00
Joakim Erdfelt
500ae69409
Issue #207 - stabilizing testing of Dispatched MessageSinks
2017-05-11 06:05:37 -07:00
Greg Wilkins
cbe857de01
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-11 10:08:36 +02:00
Joakim Erdfelt
27f03dbc25
Issue #207 - test compilation fix
2017-05-10 18:12:31 -07:00
Joakim Erdfelt
2043a923cf
Issue #207 - All websocket tests moved to /websocket-tests/ module
2017-05-10 16:56:03 -07:00
Joakim Erdfelt
2679715a30
Silencing bogus JSR356 IdleTimeoutTest warning
2017-05-10 12:13:24 -07:00
Joakim Erdfelt
427408c251
JSR356 ClientContainer testing fix
2017-05-10 09:48:51 -07:00
Joakim Erdfelt
a7b164e6b9
Fixing JSR356 Client tests
2017-05-10 07:46:56 -07:00
Joakim Erdfelt
f1a89ce3b2
Issue #207 - MessageOutputStream fix
2017-05-09 17:17:07 -07:00
Joakim Erdfelt
869ccf4421
Issue #207 - javadoc fix
2017-05-09 15:27:15 -07:00
Joakim Erdfelt
753ed9e603
Issue #1516 - Delay starting of WebSocketClient
2017-05-09 12:58:22 -07:00
Joakim Erdfelt
4bae04b623
Issue #207 - cleaning up dispatched MessageSink threading
2017-05-09 12:20:46 -07:00
Joakim Erdfelt
d0c7f822f7
Issue #207 - CommonEndpointFunctionsTest needs started WebSocketContainerScope
2017-05-08 07:18:58 -07:00
Joakim Erdfelt
546ccf5814
Issue #207 - testing JsrSessionTest needs started ClientContainer
2017-05-08 07:16:36 -07:00
Joakim Erdfelt
d1281565ff
Issue #207 - testing JsrEndpointFunctions need started ClientContainer
2017-05-08 07:15:03 -07:00
Joakim Erdfelt
b73b531d62
Issue #207 - Restoring fillAndParse callback
2017-05-08 05:19:11 -07:00
Joakim Erdfelt
55e435c741
Issue #207 - more test fixes
2017-05-05 12:37:44 -07:00
Joakim Erdfelt
3b31ecc2b1
Issue #207 - more test induced fixes
2017-05-04 13:37:29 -07:00
Joakim Erdfelt
c2626cf1f2
Issue #207 - More test fixes
2017-05-03 16:59:54 -07:00
Joakim Erdfelt
e36ffe1f86
Issue #207 - more testing updates and mainline code fixes
2017-05-02 17:06:53 -07:00
Joakim Erdfelt
cf56168f7d
Updating to version 9.3.20-SNAPSHOT
2017-05-02 15:26:56 -07:00
Joakim Erdfelt
d36d57d5c7
Updating to version 9.3.19.v20170502
2017-05-02 14:31:51 -07:00
Joakim Erdfelt
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
Joakim Erdfelt
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
Greg Wilkins
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
Joakim Erdfelt
89f76e0037
Issue #207 - simplifying OnUpgradeTo prefill + parse, with test
2017-04-28 17:11:56 -07:00
Joakim Erdfelt
e200f66ded
Issue #207 - removing ignoreBrokenPipe
2017-04-28 13:18:13 -07:00
Joakim Erdfelt
a2a2aac6ad
Issue #207 - websocket-client test cleanup
2017-04-28 13:17:04 -07:00
Joakim Erdfelt
94182b7134
Issue #207 - common test cleanup
2017-04-28 13:16:43 -07:00
Joakim Erdfelt
081663e522
Issue #207 - more test fixes
2017-04-28 09:41:58 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
56fac5fdb1
Issue #207 - more test failure fixes
2017-04-27 16:26:32 -07:00
Joakim Erdfelt
d216206fcd
Issue #207 - Adding missing JSR356 Server @PathParam ArgIdentifier
2017-04-27 13:18:14 -07:00
Joakim Erdfelt
ae51344582
Issue #207 - Final removal of BlockheadClient
2017-04-27 11:21:04 -07:00
Joakim Erdfelt
7f345fc2d4
Issue #207 - Removing BlockheadServer
2017-04-26 18:25:06 -07:00
Joakim Erdfelt
641d051e97
Issue #207 - moved some JSR356 tests to websocket-tests
2017-04-26 18:13:56 -07:00
Joakim Erdfelt
e276705948
Issue #207 - moved client tests to websocket-tests
2017-04-26 16:01:07 -07:00
Joakim Erdfelt
0195812f18
Disabling more flaky tests that are fixed in issue-207 branch
2017-04-26 11:34:57 -07:00
Joakim Erdfelt
240b82be70
Disabling currently flaky tests that are fixed in issue-207 branch
2017-04-26 08:45:59 -07:00