16871 Commits

Author SHA1 Message Date
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
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
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
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
Jan Bartel
41b2d64815 Issue #3748 Fix regression for injecting Resource on AsyncListeners
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-06-07 17:50:06 +02: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
Joakim Erdfelt
66aa966596 Revert "Issue #3743 - Updating usages of configure_9_3.dtd to use proper syntax"
This reverts commit fc97acf1ea8f2b6bf6f530518766c18d283f9ba0.
2019-06-07 07:03:44 -05:00
Simone Bordet
dd79b516f3 Fixes #3750 - NPE in WebSocketClient.toString().
Initializing field `sessionTracker` early to avoid NPE.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-07 11:36:42 +02: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
Joakim Erdfelt
0c23808827 Issue #3743 - Applying changes from PR feedback.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 17:38:54 -05:00
Simone Bordet
5b5848eb73
Merge pull request #3716 from eclipse/jetty-9.4.x-log-condense-improvement
Issue #3715 - Improve Log condensePackageString() performance
2019-06-06 22:48:25 +02:00
Joakim Erdfelt
fc97acf1ea Issue #3743 - Updating usages of configure_9_3.dtd to use proper syntax
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 14:06:46 -05:00
Joakim Erdfelt
c065eaa3cc Issue #3743 - Handling StringReader using try-with-resources
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 14:06:23 -05:00
Joakim Erdfelt
a72a6ab875 Issue #3743 - Using Location based XmlConfiguration where possible
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 12:27:41 -05:00
Joakim Erdfelt
6686083462 Issue #3743 - Using only Location based XmlConfiguration in Jetty itself
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 11:55:01 -05:00
Simone Bordet
0bc88ec286 Fixes #3697 - Review JNDI logging.
Deprecated NamingUtil.__log and replaced its
usages with the static logger-per-class idiom.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-06 15:36:37 +02:00
Simone Bordet
900a036664
Merge pull request #3739 from eclipse/jetty-9.4.x-3729-concurrent-naming-context
Jetty 9.4.x 3729 concurrent naming context
2019-06-06 13:37:57 +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
2c634e9125
Remove jetty-util transitive OSGi dependency on servlet-api #3726 (#3741)
Issue #3726 Remove osgi uses clause for deprecated MultiPartInputStreamParser.

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-06-05 23:51:03 +02:00
Lachlan
3651acc5c9
Merge pull request #3707 from lachlan-roberts/jetty-9.4.x-3683-multipart
Issue #3683 - ensure multipart files are still cleaned up if error occurs
2019-06-06 07:38:32 +10:00
Jan Bartel
bc3c650822 Issue #3729 Ensure java:comp/env creation threadsafe.
Also fixed and added some tests for locking of java:comp/env

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-06-05 12:19:33 +02:00
Greg Wilkins
4db934a809 Issue #3729 concurrent JNDI access
+ made locking deep

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-05 12:00:32 +02:00
Greg Wilkins
7484651941 Issue #3729 concurrent JNDI access
+ concurrent map for the NamingContext bindings
+ refactored duplicate code into common methods
+ simplified deepBindSupport

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-04 19:32:53 +02:00
Simone Bordet
b96b4bfffe
Merge pull request #3714 from eclipse/jetty-9.4.x-3713-warn_deprecations_in_xml
#3713 - Emit warning when invoking deprecated method in Jetty XML.
2019-06-04 15:42:22 +02:00
Simone Bordet
2688ed55e5 Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Added warnings for deprecated field get/set.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-04 10:24:13 +02:00
Lachlan
ac8303c45e
Merge pull request #3637 from lachlan-roberts/jetty-9.4.x-3498-websocket-suspend
Issue #3498 - jetty 9.4 websocket suspend for incoming frames
2019-06-04 13:42:24 +10:00
Lachlan Roberts
e75ca325fd Issue #3683 - close part if failure occurs in MultiPartFormInputStream
parameterize MultiPartServletTest over compliance modes

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-04 12:03:24 +10:00
Lachlan Roberts
17b8eb8401 Issue #3683 - ensure multipart files are still cleaned up after errors
- do not parse MultiParts in constructor so the attribute can be set
- deleteParts in MultiPartFormInputStream from _parts MultiMap
- only add the MultiPartCleanerListener once per context

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-04 11:19:42 +10:00
Lachlan Roberts
970b030c4a Issue #3683 - test multipart tmp files are deleted if error occurs
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-04 11:09:55 +10:00
Simone Bordet
5ebd6d4ad2
Merge pull request #3682 from eclipse/jetty-9.4.x-3681-HttpFieldsOptimize
Jetty 9.4.x 3681 http fields optimize
2019-06-03 16:51:58 +02:00
Simone Bordet
4058abd7c7 Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Improved test case to test for log lines with deprecation warnings.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-03 16:08:33 +02:00
Simone Bordet
8dc9f745ff Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Fixed return value from varargs methods.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-03 16:07:45 +02: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
Joakim Erdfelt
4e00f88946 Issue #3715 - Improve Log condensePackageString() performance
+ Removed regex usage
+ More unit tests
+ Adding jmh test for improvements (see PR #3716 for published results
  of old vs new implementation)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-31 10:57:38 -05:00
Joakim Erdfelt
ad3be199e8 Disabling broken slack notifications 2019-05-31 10:43:56 -05:00
Greg Wilkins
39be07871b Issue #3681
updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-31 13:17:25 +02:00
Greg Wilkins
4d60260cd3 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3681-HttpFieldsOptimize 2019-05-31 13:04:12 +02:00
olivier lamy
bea7806c77 single line notification
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-31 19:47:56 +10:00