Commit Graph

17125 Commits

Author SHA1 Message Date
Jan Bartel 4f74e19463
Issue #3749 Fix memory leak for AsyncContextListeners with annotations (#3769)
* Issue #3749 Fix memory leak for AsyncContextListeners with annotations

Also make InjectionCollection and LifeCycleCollection threadsafe for
readers with concurrent modifications.

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-01 14:46:40 +02:00
Greg Wilkins 1a6ceb2fa8
Issue #3805 Trim space on around XmlConfiguration fields (#3820)
Issue #3805 Trim space on around XmlConfiguration fields (#3820)
2019-07-01 09:32:00 +02:00
Lachlan Roberts 2383bf4974 Issue #3835 - ensure WebSocketSessions are always stopped
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-01 16:40:45 +10:00
Greg Wilkins c94230da40 Issue #3832 Test for proxy protocol v2
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-29 10:04:01 +02:00
Olivier Lamy 01a02cc15b
catch exception in slack notification to avoid any build failure due to this (#3794)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 18:04:43 +10:00
olivier lamy e19cc68a38 test no issue building the aggregated javadoc jar
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 17:18:52 +10:00
olivier lamy d545fca96e test with last javadoc plugin snapshot
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 10:03:33 +10:00
olivier lamy 8a6d25fe25 suppression of generated files must work for ide as well
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
olivier lamy 943d123798 checkstyle will only check our source files and not generated jmh etc..
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
olivier lamy a1d292da58 only checkstyle:check no need of building site
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
olivier lamy b54dbcff63 fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
olivier lamy 2443423eff simplify checkstyle check with not using site generation but only check as jenkins only need checkstyle result
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
olivier lamy 484c7538d6 fix version of build-resources module
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
Joakim Erdfelt 0047740af6 Limiting target suppressions 2019-06-26 09:13:34 -05:00
olivier lamy eb64d2e9fd add missing checks attribute
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-26 11:03:19 +10:00
Joakim Erdfelt 94a0154be7 Adding supression on /target/ files 2019-06-25 19:07:26 -05:00
Joakim Erdfelt 9f49fa5da7 Adding supression on /target/ files 2019-06-25 19:02:44 -05:00
Joakim Erdfelt 7071c53bdd
Merge pull request #3814 from eclipse/jetty-9.4.x-checkstyle-suppress-tests
Adding CheckStyle suppression's for src/test/java
2019-06-25 16:00:36 -05:00
Joakim Erdfelt 8121f9773c Adding jetty-jmh to suppressions 2019-06-25 13:32:26 -05:00
Greg Wilkins a42ad99871 Misc minor checkstyle fixes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-25 11:13:34 +02:00
Jan Bartel 0781e0af3d
Fix Eclipse java style for jetty (#3813)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-06-25 11:06:52 +02:00
Lachlan Roberts 2cf0c8aeb8 Merge remote-tracking branch 'jetty-9.4.x' into jetty-9.4.x-300-CompressionPool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-25 10:21:43 +10:00
Joakim Erdfelt fd952d42ff Removing redundant check
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 14:30:33 -05:00
Joakim Erdfelt 81894fb4ed Using property based lookup for Checkstyle suppressions filter.
+ This is to be maximally compatible across all plugins and scenarios
  where the Checkstyle suppressions filter can be used.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 13:58:23 -05:00
Joakim Erdfelt 16cf6a34e1 Adapting suppressions filter for various plugin's expectations.
Each plugin finds the suppressions in different ways.

+ Eclipse CS finds it via property ${config_loc}
+ Newest IntelliJ CS finds it via same property
+ Maven plugin finds it via classloader.getResource()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 13:27:14 -05:00
Joakim Erdfelt 0cb56a8e21 Adding CheckStyle suppression's for src/test/java
+ No MethodNameCheck
+ No TypeNameCheck
+ No LocalVariableNameCheck

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 13:04:30 -05:00
Joakim Erdfelt 7b941098d0 Fixing version of build-resources 2019-06-24 11:12:47 -05:00
Greg Wilkins 9706d70484
Jetty 9.4.x reformat (#3811)
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
  internal default values.
  We want to keep those values as a hedge against future default
  value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:40:30 +02:00
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
Lachlan Roberts 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
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
Lachlan Roberts 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
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