b9fc1f7362
Merge pull request #3777 from eclipse/jetty-9.4.x-3700-felix-webapp-testing
...
Issue #3700 - Adding felix webapp to test-distribution to help catch URLStreamHandler classloader issues earlier
2019-06-21 14:45:21 -05:00
6ca87a0de1
Merge branch `jetty-9.4.x` into `jetty-9.4.x-3700-felix-webapp-testing`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# tests/test-webapps/pom.xml
2019-06-21 14:44:56 -05:00
bb486c55cc
Merge pull request #3737 from eclipse/jetty-9.4.x-3731-cdi-testing
...
Issue #3731 - Testing various ways to use CDI
2019-06-21 14:37:30 -05:00
77526a1518
Issue #3731 - Adding back cdi.mod pointing to cdi2.mod
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-21 14:35:46 -05:00
479eb77f6a
Merge pull request #3797 from eclipse/jetty-10.0.x-remove-deprecated
...
Remove deprecated in Jetty 10.0.x
2019-06-21 14:27:34 -05:00
87e6c434fc
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-21 21:06:08 +02:00
343cf732b9
Issue #3789 XmlConfiguration Set Property ( #3790 )
...
Issue #3789 XmlConfiguration Set Property
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-21 21:04:53 +02:00
d2e4830d5c
Dumpable RewriteHandler ( #3800 )
...
RewriteHandler dumps it's rules
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-21 21:03:38 +02:00
af4dd0285f
Issue #3798 - Prevent NPE on null or partial URI in ClasspathPattern
...
+ Not allowing URI to be null or non-absolute for location or
module tests.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-21 07:05:55 -05:00
1118750139
Issue #3700 - Fixing bad ClasspathPatternTest assumptions
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-21 06:55:59 -05:00
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
075333a627
Merge `jetty-9.4.x` into `jetty-9.4.x-3700-felix-webapp-testing`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java
2019-06-20 15:37:48 -05:00
8d59302978
Issue #3700 - Reworking getLocationOfClass()
...
+ Reverting commit against IncludeExcludeSet
+ TypeUtil.getLocationOfClass is now MethodHandle based
+ new ModuleLocation class provides Module behaviors for Java 9+
Runtimes, and is used by new MethodHandle based getLocationOfClass
+ Jetty 10 doesn't need reflect complexity of ModuleLocation class
and can be inlined as real code in TypeUtil
+ TypeUtil.getLocationOfClass is only guaranteed to return the
URI to the container holding the location of the class, or null.
- The JAR file - most common
- The Directory - 2nd most common - a classpath dir entry
- The jrt:// module reference - if a module reference
+ URLResource support for results of getLocationOfClass is deprecated
(nothing was using it anyway)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-20 15:35:10 -05:00
fe051bf392
Removing deprecated methods in Jetty 10
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-20 11:41:42 -05:00
0b972efc3f
Removing deprecated methods in Jetty 10
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-20 11:25:32 -05:00
ef36cde4ed
Issue #2909 - Remove B64Code
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-20 11:15:04 -05: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
e67532372c
Issue #300 - ensure Sessions are stopped before CompressionPools
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-20 09:09:20 +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
2f4f42a7df
Merge branch `jetty-9.4.x` into `jetty-9.4.x-3731-cdi-testing`
2019-06-18 11:30:47 -05:00
5eb3e73400
Issue #3700 - Fixing TypeUtil and IncludeExcludeSet to work with null location
...
+ TypeUtil.getLocationOfClass() respects Class.getClassLoader() of null
which means a class belonging to Boot ClassLoader, a Primitive, Void,
or a dynamic in-memory class. Using system classloader is incorrect
and invalid in Java 9+
+ Fixing IncludeExcludeSet.test() to always return TRUE or FALSE
never null.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-18 11:03:06 -05:00
34b7cc512a
fix bad merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-18 17:59:08 +02:00
cc966dd1f2
Issue #3700 - Using newer felix version
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-18 10:13:56 -05: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
30dc103a12
Issue #300 - manage deflater/inflater pools with ContainerLifeCycle
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-18 12:31:25 +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
Joakim Erdfelt
Greg Wilkins
Lachlan
Olivier Lamy
Simone Bordet