Commit Graph

518 Commits

Author SHA1 Message Date
Simone Bordet cd732a175c
Review and normalized all Maven module <name> for consistency.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-01-27 19:09:30 +01:00
Ludovic Orban 12deee847d #9145 re-enable DynamicListenerTests
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-01-27 17:44:09 +01:00
Ludovic Orban d6ecf46e84 #9145 add missing exclusion for ee8 artifacts
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-01-27 17:44:09 +01:00
Greg Poulos 1dc175efac
Jetty 12.0.x documentation (#9096)
* fix broken include
* fix demo module example
* add documentation markup to fix documentation build error
* editorial suggestions for installation instructions
* editorial suggestions for quickstart guide
* fix unresolved directive errors
* fix file not found exception thrown during doc build
* editorial suggestions for deployment quickstart, plus some fixed references
* Update documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/start.adoc

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2023-01-06 17:21:46 +01:00
Joakim Erdfelt ca3101814b
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-06 08:02:21 -06:00
Joakim Erdfelt ccdf6fb983
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-06 08:01:11 -06:00
Joakim Erdfelt 72f8fef392
Excluding javadoc jar from jetty-home 2022-12-05 15:47:43 -06:00
Joakim Erdfelt 18f22816c9
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-17 13:01:00 -06:00
Joakim Erdfelt cba414f255
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-17 11:51:54 -06:00
Joakim Erdfelt 22a810debf
Referencing included /docs/ and /javadoc/ in root index.html
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:55:20 -06:00
Joakim Erdfelt 43615b53f3
Issue #8895 - Fixing jetty-documentation dep reference
Now the jetty-home artifact builds at the right time in the reactor.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-15 14:38:55 -06:00
Joakim Erdfelt 3305440adc
Unpacking the right javadoc artifact 2022-11-14 15:51:27 -06:00
Joakim Erdfelt 67629e68cc
Issue #8895 - Introduce jetty-home-<ver>-with-docs.zip
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-14 15:35:40 -06:00
Simone Bordet 41e9842921
Fixes #8858 - Jetty 12 Review MovedContextHandler. (#8859)
* Fixes #8858 - Jetty 12 Review MovedContextHandler.

Updated method names to avod references to Servlet concepts.
Added test cases.
Updated XML files.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-03 16:13:46 +01:00
Simone Bordet 0d0790834d
Moved FastCGIProxyServlet in ee9 to FastCGIProxyHandler in core. (#8718)
Moved FastCGIProxyServlet in ee9 to FastCGIProxyHandler in core.
Moved TryFilesFilter in ee9 to TryPathsHandler in core.
Update Jetty modules to properly setup the class-path in case of proxy usage.

Fixes Surefire configuration to run the tests.
The problem is that fcgi-proxy depends on fcgi-client, so both will be put on the module-path.
However, fcgi-server is used for the tests, it is in the class-path, but depends on fcgi-client that is on the module-path.
Therefore, when a fcgi-server class tries to access a fcgi-client class, JPMS throws because the fcgi-client module does not export to the unnamed module.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-18 00:00:34 +02:00
Jan Bartel 756cf2102e
Fix jaas demos (#8689)
* Fix jaas demos add distro test
2022-10-12 09:33:14 +11:00
ianrifkin f9616fed93
Issue #7182 having running() delete the state file where it previously only deleted the pid file. (#7184)
* Issue #7182 changing approach from deleting the state file consistently to simply grep'ing for last line in JETTY_STATE file

Signed-off-by: Ian Rifkin <ianrifkin@ianrifkin.com>
2022-10-06 15:33:43 -05:00
Lachlan Roberts 1cc91d36ef Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-09-23 14:42:23 +10:00
Joakim Erdfelt ebfb7c63bb
Bump log4j2 to 2.19.0 (#8605)
* Bump log4j2 to 2.19.0
+ Remove old exclusions to log4j in infinispan
  (no longer relevant)
* fix usage of log4j-slf4j2-impl

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-09-22 17:38:48 +10:00
Simone Bordet 3dd81be051
Updated SLF4J to 2.0.1.
Updated Log4j2 to 2.19.0.
Updated logging-log4j2.mod.
Removed references to og4j-slf4j18-impl, replaced by log4j-slf4j2-impl.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-20 22:04:36 +02:00
Olivier Lamy 6b1611592d
merge back release branch to bump version to 11.0.13-SNAPSHOT (#8594)
* Updating to version 11.0.12

* Updating to version 11.0.13-SNAPSHOT

* add release jetty-9.4.49.v20220914 and 10.0.12 in VERSION.TXT
2022-09-16 19:50:26 +10:00
Olivier Lamy dbd07146ec
merge back release branch to bump version to 10.0.13-SNAPSHOT (#8593)
* Updating to version 10.0.12

* Updating to version 10.0.13-SNAPSHOT

* VERSION.TXT =+ content of jetty-9.4.49.v20220914 release

* remove strange line and reorder
2022-09-16 19:50:12 +10:00
Olivier Lamy d11b5e0742
add module configuration for demo handler (#8490)
* add module configuration for demo handler

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-09-02 17:46:38 +10:00
Olivier Lamy 0e526d9b3f fix deployment of some demo modules
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-23 12:15:38 +10:00
Olivier Lamy 8fdbf50222
Restore jetty-ee8-maven-plugin mvove back ITs to jetty-eeX-maven-plugin modules (#8472)
add back jetty-ee8-maven-plugin
- add back jetty-ee8-jspc-maven-plugin
- remove not used site plugin and simplify code
- moving back ee9 maven plugin ITs to the module
- back of ee10 maven ITs test to the plugin module


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-19 17:50:58 +10:00
Joakim Erdfelt 3d51380922
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-08-16 07:00:11 -05:00
Joakim Erdfelt aff36c1c0c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-08-16 06:59:33 -05:00
Joakim Erdfelt 3157256ff9
Bump slf4j to 2.0.0-beta1 and logback to 1.3.0-beta0 (#8467)
* Bump slf4j to 2.0.0-beta1 and logback to 1.3.0-beta0
* use new artifactId slf4j-reload4j

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-16 06:58:48 -05:00
Simone Bordet f4056d6132
Fixed DemoModulesTests to use <env>-demos.mod (plural) instead of <env>-demo.mod.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 19:09:45 +02:00
Simone Bordet 6f0f8854de
Merged branch 'jetty-12.0.x' into 'jetty-12.0.x-module-renaming'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 17:31:01 +02:00
Simone Bordet 0915492a7b
Jetty 12 module renaming - demos.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 10:12:39 +02:00
Olivier Lamy 44a37746e6
Jetty 12 : reactivate `jetty-ee9-demo-embedded` and `jetty-ee9-demo-proxy-webapp` and add more (#8419)
* ee8 demos to use ee9 demos resources
* add jetty-ee8-demo-jaas-webapp
* add jetty-ee8-demo-jndi-webapp jetty-ee8-demo-mock-resources
* uhm jetty-ee8-demo-jetty-webapp have some issues
* fix jetty-ee8-demo-jetty-webapp
* fix some jetty-ee9-demo-embedded and add back jetty-ee8-demo-proxy-webapp
* demo-embedded need to have jetty-ee9-demo-jsp-webapp built first
* fixing more demos modules. Activate dist test for demo modules and all env


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-12 17:52:53 +10:00
Simone Bordet be2d4ef069
Jetty 12 module renaming - jetty-quic.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 09:33:31 +02:00
Simone Bordet 122b095260
Jetty 12 module renaming - jetty-http3.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 09:33:31 +02:00
Simone Bordet 7d264e6024
Jetty 12 module renaming - jetty-http2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 09:33:31 +02:00
Simone Bordet 11c3642892
Jetty 12 module renaming - jetty-fcgi.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 09:33:31 +02:00
Greg Wilkins 408de26ec2 Created core-demo and updated demo root
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-08-10 12:04:39 +10:00
Olivier Lamy 96a455c157 fix HashLoginService use of Resource
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-05 19:36:50 +10:00
Olivier Lamy d5a0b2bd1e more fixes on Resource
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-05 18:48:08 +10:00
Jan Bartel b6d8bcb7b4 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-ee9-demos 2022-07-13 10:05:35 +10:00
Jan Bartel 34d21dd1ec WIP get ee9 demos working; fix some ee10 demos 2022-07-12 18:23:37 +10:00
Olivier Lamy d164efb779
add jetty-ee8-home and unzip it in the jetty-home (#8283)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-12 12:04:26 +10:00
Jan Bartel a5fcce595f WIP 2022-07-11 23:21:35 +10:00
Jan Bartel d03193a770 WIP make ee9 demos work 2022-07-11 16:43:35 +10:00
Greg Wilkins 33487b5fd8 reenable ee9 distribution tests
Signed-off-by: Jan Bartel <janb@webtide.com>
2022-07-08 09:51:29 +10:00
Jan Bartel fc3fb15dc4 Fix jetty-ee10-demo-jndi/jetty-webapp and ContextProvider 2022-07-04 15:42:17 +10:00
Greg Wilkins ea5bedf072
Jetty 12.0.x deployment (#8208)
Deploy webapps for different environments from the same webapps directory.
The maximal environment known to the AppProviders is used as the default environment.
An explicit environment can be set in a properties file for an application, which is also used for property substitution in any context xml file.
2022-06-30 09:51:19 +10:00
Jan Bartel 5c267ce7ed
Jetty 12.0.x eex jettymavenplugin (#8200)
* Fix ee9/10 jetty maven plugin and refactor it tests
2022-06-29 17:18:18 +10:00
Joakim Erdfelt 1999b39808
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-06-26 12:04:51 -05:00
Olivier Lamy 83f6b80afb remove ee10 websocket as well
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-06-23 13:31:34 +10:00