Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,929 Commits 73 Branches 465 Tags 359 MiB
Commit Graph

76 Commits

Author SHA1 Message Date
Greg Wilkins b7a7a53a18
Jetty 10.0.x reformat (#3812) 
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"

# Conflicts:
#	jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
#	jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml

* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-24 17:42:39 +02:00
Joakim Erdfelt fe051bf392 Removing deprecated methods in Jetty 10 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-20 11:41:42 -05:00
Lachlan Roberts 93b6619f8f fix flaky tests in ClientConnectTest 
race of Exception notifications between the CompletableFuture and
the FrameHandler

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-20 18:23:32 +10:00
Lachlan Roberts ec4179cf42 fix NPEs in tests from merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-20 11:16:45 +10:00
Lachlan Roberts 6f94b72667 fix build problems from bad merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-20 09:40:11 +10:00
Joakim Erdfelt 22b054e0ef Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/BinaryStreamTest.java
#	jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java
#	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/NativeWebSocketServletContainerInitializer.java
#	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilter.java
 2019-06-19 16:54:19 -05:00
Joakim Erdfelt 5e3cecee6f
Merge pull request #3706 from eclipse/jetty-9.4.x-websocket-sci-from-embedded 
Issue #3698 - Reworking WebSocket SCI's to be more flexible in embedded
 2019-06-19 15:31:59 -05:00
Lachlan 372ed1455f
Issue #3661 - review of exposed classes in jetty-websocket-server (#3779) 
* Issue #3661 - review of exposed classes in jetty-websocket-server

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3762 - cleanups of jetty-websocket-server

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-17 17:12:46 +10:00
Lachlan a18bd12ada Issue #3762 - use the default port of 0 for WebSocket tests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-17 13:28:38 +10:00
Joakim Erdfelt 49ee5ac3c0 Merge branch 'jetty-9.4.x' into 'jetty-9.4.x-websocket-sci-from-embedded' 2019-06-14 08:23:42 -05:00
Simone Bordet 2a2a11cd2e Improvements after merge. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-13 10:23:55 +02:00
Simone Bordet 790051556f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-13 10:03:54 +02:00
Lachlan 6fcc3d1a77
Issue #3762 - use the default port of 0 for WebSocket tests (#3770) 
* Issue #3762 - use the default port of 0 for WebSocket tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3762 - use system property to set custom port in xml

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-13 15:43:19 +10:00
Joakim Erdfelt 9e368726d7 Attempting to address stats difference 2019-06-12 15:10:22 -05:00
Joakim Erdfelt aa8c0bb879 Reworking testcase to be more resilient 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-12 12:42:28 -05:00
Joakim Erdfelt 2ea0bca333 Cleanup of testcase, unable to replicate failure. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-11 13:10:55 -05:00
Lachlan 0d9de28226
Issue #3661 - move WebSocketSessionListener to WebSocket-API 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-11 21:08:52 +10:00
Lachlan Roberts 85aa3424b6 Issue #3712 - rename maxIdleTime usage to idleTimeout for WebSockets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-05 14:18:47 +10:00
Lachlan Roberts 90e849af76 disable failing testSuspendAfterClose for further review 
the WebSocket suspend after close different behaviour from 9 to 10
in jetty-10 an ISE is thrown
in jetty-9 it is a no-op

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-05 13:30:21 +10:00
Lachlan Roberts bb65167549 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-05 01:34:53 +10:00
Lachlan ac8303c45e
Merge pull request #3637 from lachlan-roberts/jetty-9.4.x-3498-websocket-suspend 
Issue #3498 - jetty 9.4 websocket suspend for incoming frames
 2019-06-04 13:42:24 +10:00
Joakim Erdfelt 54888d2541 Issue #3698 - Reworking WebSocket SCI's to be more flexible in embedded 
+ Added new SCIOnStartupListener that allows for manual wiring up
  of ServletContainerInitializers (with no bytecode scanning)
  in embedded jetty usages
+ Introduced .initialized(context) and .configure(context) to both of
  the websocket SCIs
+ Moved ClientConnectTest to jetty-websocket-tests
+ Moved WebSocketClientTest to jetty-websocket-tests
+ Made moved tests not use BlockheadServer
+ Made moved tests use new .configure(context, lambda) methods
+ Also allowing javax.websocket.server SCI implementation to
  add ContextDestroyListener during the execution of another
  ServletContextListener.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-03 13:31:06 -05:00
Lachlan Roberts d6c68c4911 Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-configuration-refactor 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-23 09:03:27 +10:00
Lachlan Roberts 491ff5eb93 rename WebSocketChannel to WebSocketCoreSession 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-22 08:29:05 +02:00
Lachlan Roberts e31009cb06 WebSocketCoreClient no longer stores configuration and can be shared 
configuration moved to ClientUpgradeRequest

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-21 11:33:06 +10:00
Lachlan Roberts 455cc3d2e2 improvements to the jetty-websocket configuration testing 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-16 15:43:22 +10:00
Lachlan Roberts c68a1b6066 fix the websocket configuration problems shown by ClientConfigTest 
correctly detect when a message has exceeded the max size in the sink

forward changes to the input buffer size to the connection in WSChannel

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-16 15:38:33 +10:00
Lachlan Roberts 7ba77c0be4 add tests for jetty-websocket client configuration 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-16 15:37:46 +10:00
Joakim Erdfelt b44ecc932a Issue #2909 - Replace B64Code with java.util.Base64 
+ Deprecated B64Code
+ All code that isn't B64CodeTest is now using java.util.Base64
+ B64CodeTest is updated to confirm change to java.util.Base64
  is possible without change in behavior. Just have to make
  sure you use the appropriate Encoder / Decoder for the task
  at hand (default vs mime vs url)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-05-15 10:08:11 +02:00
lachan-roberts cb50d6f9aa Issue #3498 - fix suspend implementation to suspend WebSocket frames 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-05-08 12:28:29 +10:00
lachan-roberts ec88316116 Issue #3382 - improve testing for WS suspend and fix demand on resume 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-05-07 09:26:36 +02:00
lachan-roberts 7c7932a475 Issue #3498 - improve testing for websocket suspend 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-05-07 11:00:32 +10:00
Lachlan Roberts 6887f9d6dd Issue #3608 - fix merge of tests jetty-10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-04 14:50:20 +02:00
Joakim Erdfelt 52bb963186 Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	aggregates/jetty-all-compact3/pom.xml
#	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
#	jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java
#	jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
#	jetty-http2/http2-alpn-tests/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-infinispan/infinispan-remote-query/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
#	jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CrossOriginFilterTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/HeaderFilterTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/PutFilterTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
#	jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java
#	jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
#	jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServerFactoryTest.java
#	jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
#	pom.xml
#	tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsMatchers.java
#	tests/test-http-client-transport/pom.xml
#	tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
#	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTesterTest.java
 2019-05-01 15:02:31 -05:00
Lachlan Roberts bb8e5557d2 fix flaky test ClientCloseTest.testWriteException 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-01 07:58:24 +02:00
Greg Wilkins d84a4efde5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-04-30 13:46:59 +02:00
Lachlan Roberts 8ddcf3685b Issue #3608 - give 400 error response for missing Sec-WebSocket-Key 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-30 15:11:51 +04:00
lachan-roberts 8360aad619 remove exception stack traces and prints from websocket tests 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-29 13:51:18 +04:00
Lachlan Roberts 15d4659cc0 demand before succeeding callback in JettyWebSocketFrameHandler 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-25 17:03:23 +04:00
Lachlan Roberts f42ef1356e Issue #3479 - removing unused classes in jetty-websocket-api 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-18 07:02:01 +10:00
Lachlan Roberts aeb9d2c5dc Issue #3476 - previous WebSocketSessions being added to new connections 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-16 13:41:38 +10:00
lachan-roberts 002ecf526d Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-3494-clientclosetest 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-09 18:21:40 +10:00
Lachlan Roberts 6cd5fb42e9 Issue #3494 - adjustments to WebSocketChannel processConnectionError 
WebSocketChannel.processConnectionError now defaults to NO_CLOSE
status if no protocol reasons can be found

added some debug logging

improvements to tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-05 12:18:09 +11:00
Lachlan Roberts 5eed464730 Issue #3382 - delay any frames received while suspended until resumed 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-03 17:24:40 +11:00
Lachlan Roberts 7df8140137 Issue #3494 - failures in testRemoteDisconnect because of timeout 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-03 14:50:37 +11:00
Lachlan Roberts 607a870d8e Issue #3494 - fixes to testStopLifecycle 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-03 10:34:53 +11:00
lachan-roberts 50c193c23b Issue #3494 - fix ClientCloseTest.testWriteException() 
Nulling out values in WebSocketAdapter causes race conditions when
trying to access session and endpoint externally

Race condition in WebSocketChannel.Flusher.onCompleteFailure(),
processConnectionError should be called first to ensure that the
correct close reason is processed, super.onCompleteFailure() was closing
the connection causing a read failure.

race condition between the server detecting a read failure and sending
a response and the client detecting the write failure, now blocking
on the server so it is not reading and will not detect the failure

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-01 11:19:23 +11:00
lachan-roberts 8f29ea04cd Issue #3382 - implement Session.suspend() for jetty 10 websocket-api 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-29 20:16:20 +11:00
Lachlan Roberts 81960e3da8 Issue #3484 - make WebSocketServlet generic 
WebSocketServlet could only be used with the jetty-websocket-api
make this generic and add implementation in websocket-server

this prevents jetty-websocket-server from needing to use core classes
can cause class cast exceptions from a webapp due conflicts between the
clients version of core classes and those provided by the container

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-28 16:22:10 +11:00
Lachlan Roberts 45b2c548b0 Issue #3106 - backport WebSocket connection stats from jetty-10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-28 14:30:11 +11:00