Commit Graph

1587 Commits

Author SHA1 Message Date
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 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 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 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 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 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
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 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 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 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
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
Joakim Erdfelt 450d7f42b2 Issue #3748 - Adding distribution tests for AsyncListenerServlet
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-07 12:15:29 -05:00
Joakim Erdfelt 246e36289d Issue #3748 - Adding testcase for AsyncListener with @Resource
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-07 12:14:13 -05:00
Joakim Erdfelt 63109108a8 Issue #3751 - Use Modern DTD/FPI consistently
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-07 07:21:59 -05:00
Simone Bordet a510ed31cb Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Fixed references to deprecated methods WebAppContext.prependServerClass(),
WebAppContext.addServerClass() and WebAppContext.addSystemClass().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-07 09:22:31 +02:00
Olivier Lamy 8f4cdf1c83
upgrade log4j2 version and fix log4j2.xml provided sample (#3721)
* upgrade log4j2 version and fix log4j2.xml provided sample, add disruptor if users wants to use async logging

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-06 20:44:41 +10:00
Olivier Lamy 03baa6bc9b
Issue #3733 do not destroyForcibly on close otherwise child processes are not killed via shutdownHook (#3742)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-06 20:43:41 +10:00
Jan Bartel dec10044e0
Jetty 9.4.x 3722 session destroy listeners (#3723)
* Issue #3722 Use webapp classloader for HttpSessionListener.sessionDestroyed calls
2019-06-03 10:27:38 +02:00
Simone Bordet eb837293ad Replaced usage of deprecated "replacement" with "location".
Code cleanup & formatting.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-30 14:39:28 +02:00
Michael Hausegger e8f11d3c7e Added small performance improvements
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-22 08:27:53 +02:00
Michael Hausegger 665b1929e0 Small minor performance improvements
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-15 20:17:33 +02:00
Joakim Erdfelt 7e7920a969
Merge pull request #3622 from eclipse/jetty-9.4.x_use_local_repo_dist_test
force using local repo to download module dependencies
2019-05-07 11:46:43 -07:00
Joakim Erdfelt 8a4f4d390c Issue #3620 - Applying changes from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-03 10:13:25 -05:00
olivier lamy 13c9d24f08 force using local repo to download module dependencies
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-03 19:03:20 +10:00
Joakim Erdfelt 2fa8a0a943 Issue #3620 - Fixing unixsocket distribution test
+ Giving download more time to complete

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-02 19:30:19 -05:00
Joakim Erdfelt 78a71b71cc Issue #3620 - Exit Server.start() if LifeCycle.start() fails
+ DeploymentManager will hang onto errors encountered and report them
  en-masse if on it's own doStart().
+ Added jetty-deploy test cases.
+ Added test-distribution test case.
+ Updated test-distribution to allow this kind of test case.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-02 18:51:06 -05:00
Joakim Erdfelt 41ab9baf8c Standardizing on hamcrest Matchers (not CoreMatchers from junit4)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 14:39:57 -05:00
Joakim Erdfelt df716e1b23 Migrating away from junit5 deprecated isIn() to is(in())
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:33:28 -05:00
Joakim Erdfelt 2b93a4e7ea Updating jetty-test-helper + junit5 + hamcrest
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:23:55 -05:00
Joakim Erdfelt 734be56938 Updating to version 9.4.19-SNAPSHOT 2019-04-29 16:27:23 -05:00
Joakim Erdfelt e1bc35120a Updating to version 9.4.18.v20190429 2019-04-29 15:40:33 -05:00
Jan Bartel ab174d1015
Issue #3597 Fix session persistence classloading for deep structures (#3602)
* Issue #3597 Fix session persistence classloading for deep structures with system classes.
2019-04-29 12:05:34 +02:00
Joakim Erdfelt 29b960551f Merge branch `release-9.4.17` into `jetty-9.4.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-bom/pom.xml
2019-04-25 09:15:42 -05:00
olivier lamy 2d23cb0ecf ignore the correct one
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 19:31:13 +10:00
olivier lamy c428fc1b62 weird only this annotations
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 15:48:52 +10:00
olivier lamy 4f38e9f488 oops missed annotations
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 14:12:21 +10:00
olivier lamy 6395e7f25a ignore test which cannot work with hazelcast tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 12:40:45 +10:00
Joakim Erdfelt 05bb111580 Updating to version 9.4.18-SNAPSHOT 2019-04-18 15:59:49 -05:00
Joakim Erdfelt aa1c656c31 Updating to version 9.4.17.v20190418 2019-04-18 14:44:28 -05:00
Joakim Erdfelt c75136fe63 Merge branch 'release-9.4.16' into jetty-9.4.x 2019-04-18 10:13:20 -05:00
Jan Bartel b6809f5555
Jetty 9.4.x 2140 infinispan expired sessions (#3457)
Infinispan and hazelcast changes to scavenge zombie expired sessions.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Jan Bartel <janb@webtide.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-18 17:24:25 +10:00
Jan Bartel 3dd0172abd
Issue #3395 Add tests for serializing dynamic proxies in sessions. (#3499)
* Issue #3395 Add tests for serializing dynamic proxies in sessions.
2019-04-17 15:04:28 +10:00
Joakim Erdfelt 79537a5f51 Updating to version 9.4.17-SNAPSHOT 2019-04-11 11:00:24 -05:00