7e5a87b923
Fixed test verbosity
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-21 09:19:06 +02:00
3ae6d41a18
WebSocket core cleanup ( #3783 )
...
* cleanups of WebSocket core
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* WebSocket ConfigurationCustomizer now extends ConfigurationHolder
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* adding isDebugEnabled checks
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-21 10:14:27 +10:00
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
e305736b02
add request and response to JettyWSFrameHandler on server side
...
wrap exceptions delivered to jetty connect CompletableFuture
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-20 16:47:11 +10:00
ec4179cf42
fix NPEs in tests from merge
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-20 11:16:45 +10:00
6f94b72667
fix build problems from bad merge
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-20 09:40:11 +10:00
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
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
666d1cfd0b
fixed https fragility
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-19 12:32:14 +02:00
a7b5430f96
fixed test to avoid local network fragility
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-19 12:24:03 +02:00
b7bd4aa850
removed debug dump
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-19 10:41:04 +02:00
f28a1792d7
fixed websocket test of jetty-test-webapp which cannot be accessed remotely
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-19 10:38:28 +02:00
34b7cc512a
fix bad merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-18 17:59:08 +02:00
157ce0ee23
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-06-18 08:08:28 -05:00
a847f54cd2
Merge pull request #3744 from eclipse/jetty-9.4.x-3648-websocket-client-ssl
...
Issue #3648 - SSL based on WebSocket behavior (CLIENT vs SERVER)
2019-06-18 08:05:33 -05:00
d109242bc0
store autobahn results as they are not stored automatically by junitPublisher ( #3792 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-18 20:41:10 +10:00
90ea6f94e5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-18 11:44:38 +02:00
cd38756ef5
fixed formatting from merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-18 09:51:54 +02:00
862e6d008e
Jetty 9.4.x 3755 annotation/jndi example cleanup ( #3763 )
...
* Issue #3755 Annotation example cleanup
+ Created JettyDistribution class as common utility to locate a jetty distribution for examples.
+ Fixed ServerWithAnnotations to correctly use the test-spec-webapp
+ Added AttributeContainerMap as a better way to treat attribute values as beans. This avoids them appearing twice in a dump and always associates them with their key.
+ Added NamingDump and use it in EnvConfiguration and jetty-plus.xml so that a server dump will contain dumps of the server local tree and each contexts java:comp/env tree
+ Improved the dump format of NamingContext and WebAppContext
+ Improved the toString format of several associated classes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-18 09:50:18 +02:00
275f83c1d0
Issue #3785 - fix failures in QTP testLifeCycleStop ( #3788 )
...
make sure the jobs are actually run before calling QTP.stop()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-18 16:01:09 +10:00
965be32bda
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-17 17:51:39 +02:00
e7e63a5617
Issue #3782 X-Forwarded-Port can be remote or local
...
Improved names and javadoc after review.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-17 16:58:20 +02:00
9cf8cf3c0d
Issue #3782 X-Forwarded-Port can be remote or local
...
Added option for X-Forwarded-Port to be remote or local with default
being local.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-17 16:58:20 +02:00
345750f9fd
Issue #3782 - X-Forwarded-Port refers to node listening port
...
+ Updating testcases to test requestURL as well.
+ Adding new testcases for X-Forwarded-Port modifying only
the port of an existing `Host:` header.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-17 16:58:20 +02:00
a1fe57a654
Issue #3782 - updating existing testcases
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-17 16:58:20 +02:00
2f3eed8604
Issue #3782 - reducing noise during testing
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-17 16:58:20 +02:00
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
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
1550d4f59a
avoid depending on a range dependency from a transitive dependency
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-16 10:45:16 -05:00
f54b682528
Fixes #3786 - ALPN support for Java 14.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-16 11:12:40 +02:00
8c0f889abd
Issue #3698 - Updating javadoc on .initialize() method purpose/meaning
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-14 08:37:01 -05:00
49ee5ac3c0
Merge branch 'jetty-9.4.x' into 'jetty-9.4.x-websocket-sci-from-embedded'
2019-06-14 08:23:42 -05:00
60d8661890
Merge `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java
# jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebInfConfiguration.java
# jetty-http/src/test/java/org/eclipse/jetty/http/QuotedCSVTest.java
# jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
# jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java
# jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java
# jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
# jetty-util/src/test/java/org/eclipse/jetty/util/StringUtilTest.java
# jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
# jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
# tests/test-integration/src/test/java/org/eclipse/jetty/test/support/XmlBasedJettyServer.java
2019-06-13 14:14:42 -05:00
40e9e053b9
Merge pull request #3768 from eclipse/jetty-9.4.x-3708-stringutil-replace
...
Issue #3708 - use StringUtil alternatives for known slow JVM impls.
2019-06-13 14:01:35 -05:00
2a2a11cd2e
Improvements after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-13 10:23:55 +02:00
790051556f
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-13 10:03:54 +02:00
0b56089327
Merge pull request #3772 from eclipse/jetty-9.4.x-3758-http2_dont_send_empty_trailers
...
Issue #3758 - Avoid sending empty trailer frames for http/2 requests.
2019-06-13 09:35:22 +02:00
c94753ece3
Issue #3746 - fix WriteFlusher ClassCastException if Callback throws ( #3778 )
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-13 15:51:22 +10:00
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
370a85b921
Jetty 9.4.x aggregate javadoc fix ( #3780 )
...
* fix javadoc plugin configuration fixing searchbox when navigating to class found, as jetty 10 has module defined we probably do not need to merge this to 10 except other parameters
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-13 11:28:22 +10:00
070b8f9de1
Merge pull request #3775 from eclipse/jetty-9.4.x-3736-protect-from-bad-classloader
...
Issue #3736 - Give better exception when using bad classloader impl
2019-06-12 16:18:01 -05:00
9e368726d7
Attempting to address stats difference
2019-06-12 15:10:22 -05:00
e81fdbd7c7
Issue #3736 - Give better exception when using bad classloader impl
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:38:45 -05:00
ab89d2dd9b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-06-12 12:44:37 -05:00
fab70bd13c
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2019-06-12 12:42:42 -05:00
aa8c0bb879
Reworking testcase to be more resilient
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 12:42:28 -05:00
82f7647629
Issue #3758 - Avoid sending empty trailer frames for http/2 requests.
...
Added one more test case and comments about handling of
`content.isConsumed()` in HTTP/2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-12 19:15:15 +02:00
8a9314234a
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-12 17:44:56 +02:00
adb6e7c8d2
Issue #3708 - Correcting for testcases
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 10:39:05 -05:00
877815e195
Issue #3708 - Adding new methods and converting codebase to use them
...
+ StringUtil.replace(String, char, char)
+ StringUtil.strip(String, String)
+ URIUtil.encodeSpecific(String, String)
+ URIUtil.decodeSpecific(String, String)
+ TypeUtil.toClassReference(Class)
+ TypeUtil.toClassReference(String)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 09:56:41 -05:00
Greg Wilkins
Lachlan
Joakim Erdfelt
Olivier Lamy
Simone Bordet