Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,950 Commits 68 Branches 465 Tags 359 MiB
Commit Graph

18950 Commits

Author SHA1 Message Date
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
Lachlan 0d9de28226
Issue #3661 - move WebSocketSessionListener to WebSocket-API 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-11 21:08:52 +10:00
Lachlan 1ead2ee370
Issue #3616 - fix merge back of SessionTracker back to jetty10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-11 21:07:15 +10:00
Lachlan Roberts e007634e53 Issue #3170 - cleanups of WebSocketProxy and WebSocketProxyTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-11 17:12:02 +10:00
Lachlan Roberts 327783e1ce Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-3170-websocket-proxy 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-11 15:17:54 +10:00
Joakim Erdfelt ae21126cad Updating to version 9.4.20-SNAPSHOT 2019-06-10 13:40:17 -05:00
Joakim Erdfelt 9e4332017f Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2019-06-10 12:43:36 -05:00
Joakim Erdfelt c73f849711 Fixing post-merge test errors 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 12:43:26 -05:00
Simone Bordet 81f22e3873 Issue #3748 - @Resource field not injected in Jetty Demo. 
Adding Jetty 10 specific bits to make the test pass.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-10 19:23:04 +02:00
Joakim Erdfelt 68a9498092 Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 11:51:55 -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 1683df2da6 Putting new JMH test in correct place (fix from last merge) 2019-06-10 10:04:30 -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 2e9aa24d02 Fixing Jenkinsfile 2019-06-10 09:28:28 -05:00
Simone Bordet 2523e828b3 Issue #3751 - Use Modern DTD/FPI consistently. 
Fixed duplicate `redirectEntity()` after merge.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-10 16:09:49 +02: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 826d68e80a Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-10 11:41:47 +02: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 5346980dbb Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-10 11:29:25 +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 fc97acf1ea.
 2019-06-07 07:03:44 -05:00
Joakim Erdfelt 550fb99e86 Issue #3698 - fixing javadoc 2019-06-07 07:01:06 -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
Joakim Erdfelt 986dd77e60 Issue #3698 - Applying changes from PR feedback. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-06 16:44:35 -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
Joakim Erdfelt 631f0cd9f6 Issue #3648 - SSL based on WebSocket behavior (CLIENT vs SERVER) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-06 11:39:55 -05:00
Simone Bordet bf53925cfb Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-06 17:58:49 +02: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
Lachlan Roberts 3190672ffc fix bad merge of MultiPartServletTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-06 09:17:13 +10:00
Lachlan 62eedebd17
Issue #3705 - WebSocket upgrade failure and CompletableFuture refactor 
* Issue #3705 - notify WebSocket framehandler on client upgrade failure

getFrameHandler on the ClientUpgradeRequest no longer takes
the upgrade response, the response must be set later if it is
required by the framehandler implementation

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - throw if FrameHandler could not be created

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* wip

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - count down the onOpen latch in NetworkFuzzer

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - WebSocket Session CompletableFuture refactor

- sessionFutures for jetty and javax are now implemented using the
futureCoreSession which will occur after onOpen

- the request and response are set on the FrameHandler before the
upgrade

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-06 08:13:33 +10:00
Greg Wilkins 76051192a2 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-06 00:00:56 +02:00