Commit Graph

22753 Commits

Author SHA1 Message Date
Simone Bordet 95b5cfd532
Fixes #5902 - Grab Jetty startup output in documentation. (#5906)
* Fixes #5902 - Grab Jetty startup output in documentation.

Implemented an Asciidoctor extension that uses `JettyHomeTester` to run
Jetty and capture its output.
This extension is triggered by the `ServiceLoader` mechanism, so the
documentation jar is now in the plugin classpath.

Introduced `jetty-halt.xml` so that the JVM can be halted.
In this way, Jetty does not produce the "stopping" log lines and
therefore they won't be grabbed and included in the documentation.

Used the new `include::jetty[]` directive in the documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
2021-01-25 14:21:17 +01:00
Simone Bordet 755ec458d5 Fixes #5787 - Make ManagedSelector report better JMX data.
Added SampleStatistics to record data and JMX methods to export it.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-22 19:14:31 +01:00
Joakim Erdfelt 81c2c233db
Issue #5872 - DynamicMBean for JettyLoggerFactory
+ Fixing typo in operation names

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-22 10:31:16 -06:00
Joakim Erdfelt 5f9ea7804a
Issue #5872 - DynamicMBean for JettyLoggerFactory
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-22 10:08:46 -06:00
Joakim Erdfelt 87ab8bda8f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-logging-jmx-dynamic 2021-01-22 09:19:07 -06:00
Joakim Erdfelt d8e410bbff
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-22 09:13:12 -06:00
Joakim Erdfelt 1701b83fd5
Merge pull request #5903 from eclipse/jetty-9.4.x-path-normalization-testing
Fix DefaultServletTest cases which deal with filesystem path name normalization
2021-01-22 09:11:36 -06:00
Ludovic Orban 422a63a1b4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-22 08:49:44 +01:00
Ludovic Orban 3331c9ca77
Merge pull request #5884 from eclipse/jetty-9.4.x-5883-force-lang-envvar-for-tests
Issue #5883 - force LC_ALL envvar for tests
2021-01-22 08:38:50 +01:00
Ludovic Orban 9840a82e8c force LC_ALL env variable when running tests
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-22 08:38:26 +01:00
Ludovic Orban b24c0d5416
Merge pull request #5892 from eclipse/jetty-9.4.x-5891-add-missing-source-encoding
Set source encoding of build-resources module to UTF-8
2021-01-22 08:36:18 +01:00
Ludovic Orban e26184ad45 set source encoding to UTF-8
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-22 08:35:47 +01:00
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:05:57 -06:00
Joakim Erdfelt 9c7b6cb62e
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-21 14:56:21 -06:00
Joakim Erdfelt 176e29e408
Happy New Year 2021
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 12:31:00 -06:00
Simone Bordet 7b1e64f6a5 Issue #5880 - Move test-simple-webapp to demos.
Adding dependency to jstl.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-21 17:25:24 +01:00
Simone Bordet 9fe5700260
Fixes #5880 - Move test-simple-webapp to demos. (#5881)
* Fixes #5880 - Move test-simple-webapp to demos.

Moved test-simple-webapp to demos under demo-simple-webapp.
Moved the JSP demos into their own module: out of demo-jetty-webapp into demo-jsp-webapp.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-21 15:27:03 +01:00
gregw 781f589c7c Added history to VERSION.txt
http://web.archive.org/web/19980125013900/http://www.mortbay.com/
2021-01-21 10:12:36 +01:00
Lachlan Roberts ff4f2ef28f only allow adding ServletContainerInitializers before starting
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-21 15:27:15 +11:00
Lachlan Roberts c6c1ccfdd0 Rename JavaxWebSocketClientContainer.initialize to setShutdownContainer.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-20 17:00:33 +11:00
Lachlan f2cde85390
Merge pull request #5874 from eclipse/jetty-10.0.x-5866-WebSocketProgrammaticUpgrade
Issue #5866 - allow WebSocket programmatic upgrades
2021-01-20 16:07:07 +11:00
Lachlan Roberts c8beacb9ad Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-20 16:03:50 +11:00
Lachlan 759805580b
Merge pull request #5860 from eclipse/jetty-9.4.x-5851-WebSocketServletCleanup
Issue #5851 - remove WebSocketServletFactory as ServletContext attribute on destroy
2021-01-20 15:50:48 +11:00
Joakim Erdfelt 7d167e17fa
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-19 10:41:29 -06:00
Joakim Erdfelt 37e7361706
Issue #5872 - JMX DynamicMBean for jetty-slf4j-impl
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-19 10:37:35 -06:00
Simone Bordet f17cc9b311 Improvements to the Jetty documentation.
Fixed typos.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-18 17:09:10 +01:00
Joakim Erdfelt 51d93f0771
Attempt to satisfy Filesystem behaviors in testcase.
+ Not relying on OS type
2021-01-18 09:03:03 -06:00
Lachlan Roberts 99aef1a2c0 Issue #5832 - fix bugs when stopping the JavaxWebSocketClientContainer
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-18 23:50:20 +11:00
Lachlan Roberts a60ecfa4cc Issue #5832 - fix bugs when stopping the JavaxWebSocketClientContainer
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-18 23:23:35 +11:00
Simone Bordet 14f829a8f5
Merge pull request #5886 from eclipse/jetty-10.0.x-5882-simplify_alpn_modules
Fixes #5882 - Simplify ALPN modules.
2021-01-18 10:17:49 +01:00
Lachlan Roberts 29f185931e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5832-WebSocketShutdownThread 2021-01-18 16:01:18 +11:00
Simone Bordet f52521ba75 Fixes #5882 - Simplify ALPN modules.
Deleted alpn-<version>.mod files, replaced by a single alpn-java.mod.
This new module _provides_ "alpn-impl" by default, and so does conscrypt.mod.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-15 16:51:26 +01:00
Simone Bordet e1f62c4905 Issue #5799 - Allow specifying the duration an object can stay in a pool.
Fixed AbstractConnectionPool.accept() to wrap the entry into an EntryHolder.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-14 20:09:15 +01:00
Joakim Erdfelt 2e53ec5384 Updating to version 9.4.37-SNAPSHOT 2021-01-14 11:27:24 -06:00
Joakim Erdfelt 238ec6997c Updating to version 9.4.36.v20210114 2021-01-14 10:29:28 -06:00
Joakim Erdfelt 25a3d19734
Adding IPv6 Address (non-literal) without port test case
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-14 10:03:06 -06:00
Lachlan Roberts 2f6176661a improve testing for JavaxWebSocketClientContainer shutdown
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-14 14:38:12 +11:00
Jan Bartel 87a2cc2698 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-13 22:41:32 +01:00
Jan Bartel b99eb3f76c
Issue #5684 Fix and re-enable ServletRequestLogTest. (#5877)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-13 22:35:36 +01:00
Lachlan Roberts 35051dfde5 Issue #5832 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 17:54:30 +11:00
Lachlan 16acdcf7e9
Merge pull request #5852 from eclipse/jetty-10.0.x-5850-UpgradeRequestNPE
Fix NPE from WebSocketSession.getUserPrincipal() in Jetty10
2021-01-13 12:01:24 +11:00
Lachlan Roberts 0d48b8b991 Issue #5866 - add Programmatic WebSocket Upgrade to Jetty API
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 10:45:45 +11:00
Lachlan Roberts 78707fffde CreatorNegotiator should remain private, use from on WebSocketNegotiator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 09:55:19 +11:00
Jan Bartel 51709dce9d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 17:50:22 +01:00
Jan Bartel a5a8327a1e
Issue #5684 Fix testSetBadBoolean and remove @Disabled (#5875)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 17:48:37 +01:00
Simone Bordet 4b775525ff Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 17:16:47 +01:00
Simone Bordet 03ec5bb773
Merge pull request #5825 from rk1165/issue_5786
Issue #5786 : Revisit Statistics classes
2021-01-12 17:15:44 +01:00
Jan Bartel 8cd0d45ed0 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 16:52:47 +01:00
Ludovic Orban e9832492b3 Add missing files to previous merge of remote-tracking branch origin/jetty-9.4.x into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-12 16:31:13 +01:00
Ludovic Orban 058a488c30 Merge remote-tracking branch origin/jetty-9.4.x into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-12 16:22:11 +01:00