591b0a2e37
Post-Merge build fixes
2018-06-12 12:54:41 -05:00
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
e4bfe00dce
Updating to version 9.4.12-SNAPSHOT
2018-06-05 14:18:37 -05:00
d5fc0523cf
Updating to version 9.4.11.v20180605
2018-06-05 13:23:02 -05:00
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
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
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
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
903803c30e
Issue #2584 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-30 14:26:54 +10:00
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
52ffe24389
Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-stackTraceRemoval
2018-05-29 10:57:51 +10:00
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
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
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
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
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
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
1732ffca51
Updating to version 9.4.11-SNAPSHOT
2018-05-03 11:48:05 -05:00
daa59876e6
Updating to version 9.4.10.v20180503
2018-05-03 10:55:19 -05:00
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
57b9f2ef22
Minor typo
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-27 08:27:31 -05:00
76dec16fde
Issue #2491 - minor revert based on review
2018-04-26 16:12:29 -05:00
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
440d89750a
Track frameCount for tests now
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-26 12:51:49 -05:00
5d83d98e96
AbstractExtension properly handles Callback error now
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-26 12:51:18 -05:00
9b8540aef4
OpCode.isDataFrame(byte) missing CONTINUATION
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-26 12:50:32 -05:00
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
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
1c0bbae9cc
Issue #2376 - Applying recommended scope changes
2018-04-24 16:30:01 -05:00
8763c6065d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-04-20 11:32:46 -05:00
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
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
be3c5a08d0
Reducing noise on test output
2018-04-05 16:33:40 -05:00
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
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
cf5b473571
Issue #2376 - relax ContextHandler requirements
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-28 13:39:07 -05:00
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
1c04f9838d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-22 16:42:42 -05:00
c3cc138a3b
Updating to version 9.4.10-SNAPSHOT
2018-03-20 08:25:59 -05:00
1f8159b1e4
Updating to version 9.4.9.v20180320
2018-03-20 07:18:24 -05:00
534b8ea38b
Add edit warning for .mod files. Resolves #173
2018-03-15 13:23:42 -04:00
93b6877d72
Issue #2210 - fixing flaw in safety checks with JSR356 ClientContainer
2018-03-14 16:18:19 -05:00
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
0361cf6cd3
Simplifying testcase, relying on flush not sleep.
2018-03-12 16:33:39 -05:00
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
5541fcbdba
Issue #2282 - final testing tweaks
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-07 18:34:03 -06:00
e76f6d7baf
Issue #2282 - more websocket test stablization
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-07 17:42:02 -06:00
abf1262848
Issue #2282 - More work on websocket server side tests
2018-03-07 14:29:22 -06:00
bca53be4f4
Fixes #2282 - Fixing Fuzzer.
...
+ Client lifecycle now honored
+ Slow write now possible
2018-03-07 07:55:05 -06:00
dd57cf0bf6
Issue #2282 - Simplifying BlockheadClient to drastically reduce CPU load during testing
2018-03-06 21:01:39 -06:00
Joakim Erdfelt
Simone Bordet
Lachlan Roberts
Jan Bartel
Olivier Lamy
WalkerWatch