Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,940 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

16940 Commits

Author SHA1 Message Date
Joakim Erdfelt 3030ccb2df Merge branch 'jetty-9.4.x-checkstyle' into jetty-9.4.x 2019-06-22 09:00:15 -05:00
Joakim Erdfelt 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
Joakim Erdfelt 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
Joakim Erdfelt 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
Joakim Erdfelt 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
Greg Wilkins 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
Joakim Erdfelt 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
Joakim Erdfelt 1118750139 Issue #3700 - Fixing bad ClasspathPatternTest assumptions 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-21 06:55:59 -05:00
Joakim Erdfelt 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
Joakim Erdfelt 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
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
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 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
Joakim Erdfelt cc966dd1f2 Issue #3700 - Using newer felix version 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-18 10:13:56 -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 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
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
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 db30cbd184 Issue #3700 - Adding felix webapp tests to discover OSGi issues earlier 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-12 14:37:13 -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