Joakim Erdfelt
2f4f42a7df
Merge branch `jetty-9.4.x` into `jetty-9.4.x-3731-cdi-testing`
2019-06-18 11:30:47 -05:00
Joakim Erdfelt
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
Greg Wilkins
cd38756ef5
fixed formatting from merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-18 09:51:54 +02:00
Greg Wilkins
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
Lachlan
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
Greg Wilkins
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
Greg Wilkins
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
Joakim Erdfelt
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
Joakim Erdfelt
a1fe57a654
Issue #3782 - updating existing testcases
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-17 16:58:20 +02:00
Joakim Erdfelt
2f3eed8604
Issue #3782 - reducing noise during testing
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-17 16:58:20 +02: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
olivier lamy
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
Simone Bordet
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
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
Simone Bordet
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
Lachlan
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
Olivier Lamy
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
Joakim Erdfelt
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
Joakim Erdfelt
9e368726d7
Attempting to address stats difference
2019-06-12 15:10:22 -05:00
Joakim Erdfelt
dc23b8da6a
Issue #3731 - Bumping up version now that 9.4.19 is released
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:58:36 -05:00
Joakim Erdfelt
ee4726985e
Issue #3731 - removing remaining references to experimental CDI 1 libs
2019-06-12 13:49:57 -05:00
Joakim Erdfelt
5c74de8ab4
Issue #3731 - Removing old CDI1 libs/modules
...
+ Moved remaining CDI2 module to top level /jetty-cdi/ (no need for
sub-modules anymore)
2019-06-12 13:49:39 -05:00
Joakim Erdfelt
0d4aa4ea49
Issue #3731 - updating `cdi2` module expectations
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:49:14 -05:00
Joakim Erdfelt
4f82a23a7a
Issue #3731 - fixing license headers
2019-06-12 13:49:14 -05:00
Joakim Erdfelt
c6e5371ea2
Issue #3731 - Cleaning up test-cdi2-webapp to be the minimal needed
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:49:14 -05:00
Joakim Erdfelt
715bbbb6a2
Issue #3731 - Adding CDI2 tests to test-distribution
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:49:14 -05:00
Joakim Erdfelt
85566d0377
Issue #3731 - adding cdi2 test webapp
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:49:14 -05:00
Joakim Erdfelt
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
Joakim Erdfelt
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
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
Simone Bordet
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
Joakim Erdfelt
adb6e7c8d2
Issue #3708 - Correcting for testcases
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 10:39:05 -05:00
Joakim Erdfelt
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
Joakim Erdfelt
776c093b70
Merge branch 'release-9.4.19' into jetty-9.4.x
2019-06-12 06:44:27 -05:00
Simone Bordet
8f53d14e15
Issue #3758 - Avoid sending empty trailer frames for http/2 requests.
...
Modified the sender logic to allow specific subclasses to decide
when to send the trailers, if any.
This allows HTTP/2 to correctly compute the end_stream flag and avoid
sending empty trailers frames with end_stream=true.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-12 10:51:15 +02:00
Greg Wilkins
819c379975
Servlet Context/Handler/Holder cleanups ( #3767 )
...
Issue #3749 #3755 Servlet annotation cleanups
Cleanups when checking thread safety of lazy servlet/filter introspection.
+ Handle multiple holders for annotated servlets
+ Replaced duplicate code with common methods
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-12 08:00:01 +02: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
Joakim Erdfelt
2453882103
Issue #3708 - Reverting change to RewriteRegexRule
...
+ Moving away from Regex / Pattern isn't appropriate here,
as the entire class is dedicated to Regex behaviors.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-11 13:02:40 -05:00
Joakim Erdfelt
33fe55c339
Issue #3708 - use StringUtil alternatives for known slow JVM impls.
...
+ StringUtil.replace()
+ StringUtil.replaceFirst()
+ StringUtil.sanitizeFileSystemPath()
Change existing usages of String.replace() to either
use new StringUtil.replace() or other methods elsewhere
that better suit that specific need.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-11 11:25:50 -05:00
Joakim Erdfelt
ae21126cad
Updating to version 9.4.20-SNAPSHOT
2019-06-10 13:40:17 -05:00
Joakim Erdfelt
afcf563148
Updating to version 9.4.19.v20190610
2019-06-10 11:17:56 -05:00
Joakim Erdfelt
da4f116c63
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2019-06-10 11:10:08 -05:00
Joakim Erdfelt
8b2728e4d5
Fixing release-jetty.sh
2019-06-10 11:09:57 -05:00
Joakim Erdfelt
5dbc0bdaa5
Merge pull request #3745 from eclipse/jetty-9.4.x-3743-xmlconfig-locations
...
Issue #3743 - Using Location based XmlConfiguration where possible
2019-06-10 11:08:51 -05:00
Joakim Erdfelt
59ce0ea0e3
Issue #3743 - Cleanup requested from PR
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 10:12:39 -05:00
Joakim Erdfelt
ff43fd3de4
Issue #3743 - More changes from review of PR
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 09:58:53 -05:00
Joakim Erdfelt
a8d008b851
Issue #3743 - Making new ConfigurationProcessor interface default
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 08:19:59 -05:00
Joakim Erdfelt
bb0c87a42a
Issue #3743 - Addressing PR review items
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 07:56:46 -05:00
Simone Bordet
e179851ccf
Merge pull request #3752 from eclipse/jetty-9.4.x-3751-dtd-consistent-use
...
Issue #3751 - Use Modern DTD/FPI consistently
2019-06-10 11:30:02 +02:00
Simone Bordet
978656ebcd
Merge pull request #3754 from eclipse/jetty-9.4.x-3748-inject-asynclistener
...
Issue #3748 Fix regression for injecting Resource on AsyncListeners
2019-06-10 10:44:08 +02:00