diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 4a8d9801168..d61a2c061cc 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: true contact_links: - name: Jetty Security Reports - url: https://www.eclipse.org/jetty/security_reports.php + url: https://eclipse.dev/jetty/security_reports.php about: Please raise security issues here. diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md index d5128ff18d0..4ea70faa974 100644 --- a/.github/ISSUE_TEMPLATE/issue-template.md +++ b/.github/ISSUE_TEMPLATE/issue-template.md @@ -8,14 +8,14 @@ labels: Bug --- **Jetty version(s)** -_[Jetty 9.x is now at End of Community Support](https://github.com/eclipse/jetty.project/issues/7958)_ + **Java version/vendor** `(use: java -version)` **OS type/version** **Description** -_Do not report security issues here! See [Jetty Security Reports](https://www.eclipse.org/jetty/security_reports.php)._ + **How to reproduce?** diff --git a/.github/ISSUE_TEMPLATE/release-template.md b/.github/ISSUE_TEMPLATE/release-template.md index 9e3f87e1afe..feb328263f6 100644 --- a/.github/ISSUE_TEMPLATE/release-template.md +++ b/.github/ISSUE_TEMPLATE/release-template.md @@ -56,7 +56,7 @@ This release process will produce releases: - [ ] Merge release branches back to main branches and delete release branches. - [ ] Verify release existence in Maven Central by triggering the Jenkins builds of CometD. - [ ] Update Jetty versions on the web sites. - + [ ] Update (or check) [Download](https://www.eclipse.org/jetty/download.php) page is updated. + + [ ] Update (or check) [Download](https://eclipse.dev/jetty/download.php) page is updated. + [ ] Update (or check) documentation page(s) are updated. - [ ] Publish GitHub Releases in the order of oldest (eg: 9) to newest (eg: 11) (to ensure that "latest" in github is truly the latest) - [ ] Prepare release announcement for mailing lists. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef6433b76c8..38f9fb35645 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ Developer resources -------------------- Information regarding source code management, builds, coding standards, and more. -- [https://www.eclipse.org/jetty/documentation/current/advanced-contributing.html](https://www.eclipse.org/jetty/documentation/current/advanced-contributing.html) +- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/) The canonical Jetty git repository is located at [GitHub.](https://github.com/eclipse/jetty.project) Providing you have completed the contributors agreement mentioned below we will endeavor to pull your commit into Jetty proper. diff --git a/NOTICE.txt b/NOTICE.txt index 5c5a71e2377..afb099daecf 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2,7 +2,7 @@ Notices for Eclipse Jetty ========================= This content is produced and maintained by the Eclipse Jetty project. -Project home: https://www.eclipse.org/jetty/ +Project home: https://eclipse.dev/jetty/ Trademarks ---------- diff --git a/README.md b/README.md index 263307062b1..804802818e9 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ server.start(); Project documentation is available on the Eclipse Jetty website. -- [https://www.eclipse.org/jetty/documentation](https://www.eclipse.org/jetty/documentation) +- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/) # Building diff --git a/SECURITY.md b/SECURITY.md index e1a5537c733..b94bf5f07ce 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,7 +2,7 @@ ## Supported Versions -All [stable versions](https://www.eclipse.org/jetty/download.php) of jetty are actively supported for security issues. [Deprecated versions](https://www.eclipse.org/jetty/download.php) may be supported for serious security issues or on a commercial support basis. +All [stable versions](https://eclipse.dev/jetty/download.php) of jetty are actively supported for security issues. [Deprecated versions](https://eclipse.dev/jetty/download.php) may be supported for serious security issues or on a commercial support basis. ## Reporting a Vulnerability @@ -10,7 +10,7 @@ Do not open a public issue to report a security vulnerability. Please send a me ## Handling a Vulnerability -The [following checklist](https://www.eclipse.org/jetty/security_processes.php) is used to handle security issues: +The [following checklist](https://eclipse.dev/jetty/security_processes.php) is used to handle security issues: - [ ] On receipt of a security report via security@webtide.com or other channels, if it cannot be trivially dismissed (already fixed, known not a problem, etc.), then a Github security advisory is created by project leadership. - [ ] Copy this list as a markdown in the security advisory for tracking the completion of various tasks. diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index c3dc48dfba1..8848772631e 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -83,7 +83,7 @@ ${project.version} ../programming-guide/index.html ../operations-guide/index.html - https://www.eclipse.org/jetty/javadoc/jetty-11 + https://eclipse.dev/jetty/javadoc/jetty-12 diff --git a/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc b/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc index c0e195bad39..73bc97f0dcb 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc @@ -26,12 +26,13 @@ The https://github.com/eclipse/jetty.project[Eclipse Jetty project] is located a .Active Eclipse Jetty Branches [cols="4"] |=== -| https://github.com/eclipse/jetty.project/tree/jetty-10.0.x[jetty-11.0.x] | Development | Servlet 5.0 | Java 11+ +| https://github.com/eclipse/jetty.project/tree/jetty-12.0.x[jetty-12.0.x] | Development | Servlet 6.0 | Java 17+ +| https://github.com/eclipse/jetty.project/tree/jetty-11.0.x[jetty-11.0.x] | Development | Servlet 5.0 | Java 11+ | https://github.com/eclipse/jetty.project/tree/jetty-10.0.x[jetty-10.0.x] | Development (default branch) | Servlet 4.0 | Java 11+ -| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | Maintenance | Servlet 3.1 | Java 8 -| https://github.com/eclipse/jetty.project/tree/jetty-9.3.x[jetty-9.3.x] | Maintenance | Servlet 3.0 | Java 8 -| https://github.com/eclipse/jetty.project/tree/jetty-8.1.x[jetty-8.1.x] | Historical | Servlet 2.0 | Java 7 -| https://github.com/eclipse/jetty.project/tree/jetty-7[jetty-7] | Mythical | Servlet 1.0 | Java 6 +| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | End of Community Support | Servlet 3.1 | Java 8 +| https://github.com/eclipse/jetty.project/tree/jetty-9.3.x[jetty-9.3.x] | End of Life | Servlet 3.1 | Java 8 +| jetty-8 | Historical | Servlet 3.1 | Java 6 +| jetty-7 | Mythical | Servlet 2.5 | Java 5 |=== If you are planning on working with a specific issue within Jetty it is important to target the correct branch for a pull request. Pull requests that are targeted at Maintenance Branches are typically merged forward into subsequent branches while historical branches are left alone merge wise. Depending on the nature of an issue a historical branch may have an issue cherrypicked forward, but maintenance releases are merged wholesale forward as a matter of project policy. @@ -52,8 +53,6 @@ Administrative pom.xml file:: https://github.com/eclipse/jetty.parent Build related artifacts that release separately, common assembly descriptors, remote resources, etc.:: https://github.com/eclipse/jetty.toolchain -Files associated with the development of Jetty -- code styles, formatting, iplogs, etc.:: - http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git [[cg-contributing-build]] === Maven Build @@ -88,17 +87,15 @@ ____ Jetty uses number of conventions for its source code. The developers of Jetty use a variety of tooling and editors when developing Jetty so standards and conventions are important! -==== Intelli-J +==== IntelliJ IDE -The suggested configuration for Intelli-J when working with Jetty is available here: http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/idea-jetty-codestyle-settings.jar[Intelli-J Codestyle] +The suggested configuration for the IntelliJ IDE when working with Jetty is available in the code tree +`/build-resources/jetty-codestyle-intellij.xml` -==== Eclipse +==== Eclipse IDE -The Eclipse format configuration can be found here: -http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/jetty-eclipse-java-format.xml[Eclipse Java Formatting] - -There are also some templates available for Eclipse here: -http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/jetty-eclipse-codetemplates.xml[Eclipse Code Templates] +The Eclipse IDE format can be found in the code tree +`/build-resources/jetty-codestyle-eclipse-ide.xml` ==== Code Conventions diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc index ad83375fe67..2369b33fc83 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc @@ -17,7 +17,7 @@ ==== Setting up the Classpath You will need to place the following Jetty jar files onto the classpath of your application. -You can obtain them from the https://www.eclipse.org/jetty/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]: +You can obtain them from the https://eclipse.dev/jetty/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]: .... jetty-plus.jar diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc index 53f4f76e04e..dc589e84e21 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc @@ -72,7 +72,7 @@ Context files are normally located in `${jetty.base}/webapps/` (see `DeployerMan [source, xml, subs="{sub-order}"] ---- - + /test diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc index fd3cec0e0ef..8509ef4588f 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc @@ -246,7 +246,7 @@ Make sure you follow the other examples and include the `rel="nofollow"` attribu ____ [NOTE] -There is a separate Jenkins build job that publishes documentation to https://www.eclipse.org/jetty/documentation/current triggered by a push of changed files to the jetty-documentation project. +There is a separate Jenkins build job that publishes documentation to https://eclipse.dev/jetty/documentation/ triggered by a push of changed files to the jetty-documentation project. If you commit your change to the number from step 2, then these builds will use the same release version number. It is preferable if you _don't_ commit that version number change, or better yet, ensure that it is set to the next -SNAPSHOT version number for your jetty major release number. ____ diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc index 9958baae395..307fceb4c1c 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc @@ -41,7 +41,7 @@ For example, here is a descriptor file that deploys the file `/opt/myapp/myapp.w [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -55,7 +55,7 @@ For example, if the system property is set to `myapp.home=/opt/myapp`, the previ [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -83,7 +83,7 @@ This can help make it clear that users should not make changes to the temporary [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -99,7 +99,7 @@ However, since the `web.xml` for the web application is processed after the depl [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -120,7 +120,7 @@ This feature is useful when adding parameters or additional Servlet mappings wit [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -135,7 +135,7 @@ If the `web.xml` does not include a reference to this data source, an override d [source, xml, subs="{sub-order}"] ---- - + /wiki diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc index bef78747b1f..c8e43e578f1 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc @@ -69,7 +69,7 @@ A fifth, non-standard binding, called link:{JDURL}/org/eclipse/jetty/deploy/bind ===== Using GlobalWebappConfigBinding -In addition to the LifeCycle bindings discussed above, there is also the link:https://www.eclipse.org/jetty/javadoc/current/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.html[`GlobalWebappConfigBinding`] which, when added to the `DeploymentManager` will apply an additional configuration XML file to each webapp that it deploys. +In addition to the LifeCycle bindings discussed above, there is also the `GlobalWebappConfigBinding` which, when added to the `DeploymentManager` will apply an additional configuration XML file to each webapp that it deploys. This can useful when setting server or system classes, or when defining link:#override-web-xml[override descriptors.] This configuration XML file will be _in addition to_ any context XML file that exists for the webapp; it will be applied _after_ any context XML files but _before_ the webapp is started. The format for the XML file is the same as any context XML file and can be used to same parameters for a webapp. @@ -99,7 +99,7 @@ In the standard Jetty Distribution, this is configured in the `${jetty.home}/etc [source,xml,subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc index f08bd21110d..1e0f4ca9aad 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc @@ -130,7 +130,7 @@ Let's see an example of how we would add in the Configurations for both JNDI _an [source, xml, subs="{sub-order}"] ---- - + @@ -162,7 +162,7 @@ They will then be applied to each `WebAppContext` deployed by the deployer: [source,xml,subs="{sub-order}"] ---- - + @@ -206,7 +206,7 @@ This example uses an xml file, in fact it is the `$JETTY_HOME/etc/jetty-plus.xml [source, xml, subs="{sub-order}"] ---- - + @@ -256,7 +256,7 @@ Here's an example from a context xml file (although as always, you could have ac [source, xml, subs="{sub-order}"] ---- - + @@ -282,7 +282,7 @@ Here's an example in a xml file of a pattern that matches any jar that starts wi [source, xml, subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc index d43afdbee9e..6f6a5244610 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc @@ -100,7 +100,7 @@ Otherwise, create a context xml file with the following information (in addition [source, xml, subs="{sub-order}"] ---- - + true diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc index 92f62d1eaf3..70f03fd5337 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc @@ -20,7 +20,7 @@ Create a file called `scratch.xml` in the `${jetty.base}/webapps` directory and [source, xml, subs="{sub-order}"] ---- - + /scratch diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc index d860770896e..7b06887aeab 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc @@ -43,7 +43,7 @@ This is a permanent redirection, which also preserves `pathinfo` and query strin [source, xml, subs="{sub-order}"] ---- - + /foo diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/fastcgi/configuring-fastcgi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/fastcgi/configuring-fastcgi.adoc index 629486ac859..ce436123b31 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/fastcgi/configuring-fastcgi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/fastcgi/configuring-fastcgi.adoc @@ -44,7 +44,7 @@ Copy and paste the following content as `$JETTY_BASE/webapps/jetty-wordpress.xml [source,xml,subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc index 64d2cc68667..730fe090877 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc @@ -73,7 +73,7 @@ This module is equivalent to directly modifying the class path configuration wit [source.XML, xml] ------------------------------------------------------------- - + -org.eclipse.jetty.util.Decorator diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc index 95a24084369..91659a0fff5 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc @@ -24,7 +24,7 @@ In addition, the infrastructure also supports the OSGi `HttpService` interface. All of the Jetty jars contain manifest entries appropriate to ensure that they can be deployed into an OSGi container as bundles. You will need to install some jetty jars into your OSGi container. -You can always find the Jetty jars either in the Maven Central repository, or you can link:https://www.eclipse.org/jetty/download.html[download] a distribution of Jetty. +You can always find the Jetty jars either in the Maven Central repository, or you can link:https://eclipse.dev/jetty/download.php[download] a distribution of Jetty. Here's the absolute minimal set of Jetty jars: .Minimal Bundles @@ -355,7 +355,7 @@ Here's an example of the contents of a `META-INF/jetty-webapp-context.xml` file: ---- - + META-INF/webdefault.xml @@ -773,7 +773,7 @@ To set the pattern, you will need to provide your own etc files - see the sectio [source, xml, subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc index 70d25bdd37f..c9f98c10528 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc @@ -140,7 +140,7 @@ The deployer discovers and hot deploys context IoC descriptors like the followin [source, xml, subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc index 61ce8a99e68..282429d4ccd 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc @@ -43,7 +43,7 @@ Start with the custom Jetty XML file, `$JETTY_BASE/etc/custom-ssl.xml`: [source,xml] ---- - + @@ -159,7 +159,7 @@ Next, let's write the Jetty XML file that wires the auditing component to the `S [source,xml,subs=verbatim,options=nowrap] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc index 3db5f769e41..a9207b77b63 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc @@ -85,7 +85,7 @@ For example, a Jetty XML file that allocates Jetty's `QueuedThreadPool` could be .jetty-threadpool.xml ---- - + @@ -235,7 +235,7 @@ The `custom-server.xml` file is the following: [source,xml] ---- - + ---- diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc index e59777f3cd7..c0987c1175a 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc @@ -59,7 +59,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ [source,xml,subs=verbatim] ---- - + @@ -85,7 +85,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable [source,xml] ---- - + @@ -110,7 +110,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty' [source,xml] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc index 20a3235ac34..b6efa1195dc 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc @@ -21,7 +21,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha [source,xml] ---- - + @@ -33,7 +33,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha [source,xml] ---- - + @@ -60,7 +60,7 @@ The following Jetty XML creates an empty `String` and assigns it the id `mystrin [source,xml] ---- - + ---- @@ -88,7 +88,7 @@ The following example creates a minimal Jetty `Server`: [source,xml] ---- - + 8080 @@ -102,7 +102,7 @@ Arguments may also have a `name` attribute, which is matched with the correspond [source,xml] ---- - + 8080 @@ -122,7 +122,7 @@ The following example creates an `ArrayList`: [source,xml] ---- - + @@ -149,7 +149,7 @@ Within element `` the return value, if the return type is not `void`, is i [source,xml] ---- - + @@ -173,7 +173,7 @@ It is possible to call `static` methods by specifying the `class` attribute: [source,xml] ---- - + @@ -196,7 +196,7 @@ For example: [source,xml,subs=normal] ---- - + @@ -225,7 +225,7 @@ If the JavaBean property is `foo` (or `Foo`), `` first attempts to invoke _ [source,xml] ---- - + @@ -252,7 +252,7 @@ If the JavaBean property is `foo` (or `Foo`), `` first attempts to invoke _ [source,xml] ---- - + @@ -277,7 +277,7 @@ The map entries are specified with a sequence of `` elements, each with e [source,xml] ---- - + @@ -302,7 +302,7 @@ You can only specify the key value via the `name` attribute, so the key can only [source,xml] ---- - + @@ -323,7 +323,7 @@ Element `` creates a new array, whose component type may be specified by [source,xml] ---- - + @@ -347,7 +347,7 @@ You must give a unique `id` attribute to the objects you want to reference. [source,xml] ---- - + @@ -381,7 +381,7 @@ For example, you may want to configure the context path of your web application [source,xml,subs=normal] ---- - + @@ -407,7 +407,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp [source,xml] ---- - + @@ -430,7 +430,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp [source,xml] ---- - + @@ -462,7 +462,7 @@ The following example illustrates how scopes work: [source,xml] ---- - + 8080 diff --git a/jetty-core/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml b/jetty-core/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml index 81ddf0aa7b6..b1cb065aff6 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-client/src/main/config/modules/client.mod b/jetty-core/jetty-client/src/main/config/modules/client.mod index 5687ff94fd3..1287200826d 100644 --- a/jetty-core/jetty-client/src/main/config/modules/client.mod +++ b/jetty-core/jetty-client/src/main/config/modules/client.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds the Jetty HTTP client to the server classpath. diff --git a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo-handler.mod b/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo-handler.mod index 967b1a98cc8..966de59a45e 100644 --- a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo-handler.mod +++ b/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo-handler.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo Handler diff --git a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml b/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml index 6a5395379f4..f3cef898b6d 100644 --- a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml +++ b/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml b/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml index 036285fffc3..91c4142b07c 100644 --- a/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml +++ b/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-core/jetty-deploy/src/main/config/etc/jetty-decorate.xml b/jetty-core/jetty-deploy/src/main/config/etc/jetty-decorate.xml index 73069bafa59..9b5002c8eff 100644 --- a/jetty-core/jetty-deploy/src/main/config/etc/jetty-decorate.xml +++ b/jetty-core/jetty-deploy/src/main/config/etc/jetty-decorate.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-core/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-core/jetty-deploy/src/main/config/etc/jetty-deploy.xml index d35c988c4b2..2ed9f8182d6 100644 --- a/jetty-core/jetty-deploy/src/main/config/etc/jetty-deploy.xml +++ b/jetty-core/jetty-deploy/src/main/config/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml b/jetty-core/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml index 25ff88b5f60..6fc546e361a 100644 --- a/jetty-core/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml +++ b/jetty-core/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-core/jetty-deploy/src/main/config/modules/decorate.mod b/jetty-core/jetty-deploy/src/main/config/modules/decorate.mod index fe95fbb3c27..ac34a99f329 100644 --- a/jetty-core/jetty-deploy/src/main/config/modules/decorate.mod +++ b/jetty-core/jetty-deploy/src/main/config/modules/decorate.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Jetty setup to support Decoration of Listeners, Filters and Servlets within a deployed webapp. diff --git a/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml b/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml index 2a933198d95..b3bfe3e17f2 100644 --- a/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml +++ b/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml b/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml index a83fbd4f1e4..1e51105be39 100644 --- a/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml +++ b/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.mod b/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.mod index d28cd1194ad..bd66293a021 100644 --- a/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.mod +++ b/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables Deployer to apply common configuration to all webapp deployments. diff --git a/jetty-core/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml b/jetty-core/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml index 2823256b483..4469e170782 100644 --- a/jetty-core/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml +++ b/jetty-core/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-deploy/src/test/resources/jetty-http.xml b/jetty-core/jetty-deploy/src/test/resources/jetty-http.xml index 137da33293f..aec2b1b9891 100644 --- a/jetty-core/jetty-deploy/src/test/resources/jetty-http.xml +++ b/jetty-core/jetty-deploy/src/test/resources/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-deploy/src/test/resources/jetty.xml b/jetty-core/jetty-deploy/src/test/resources/jetty.xml index 48fb93c25f0..e477b2820c7 100644 --- a/jetty-core/jetty-deploy/src/test/resources/jetty.xml +++ b/jetty-core/jetty-deploy/src/test/resources/jetty.xml @@ -1,9 +1,9 @@ - + - + diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml index 50e55934ba2..16e071f40ab 100644 --- a/jetty-core/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml +++ b/jetty-core/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context-alt.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context-alt.xml index 1a60fa5b9d2..41787f99ed0 100644 --- a/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context-alt.xml +++ b/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context-alt.xml @@ -1,5 +1,5 @@ - + /bar diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context.xml index 8dcb42c4c6b..8af6129f3b4 100644 --- a/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context.xml +++ b/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context.xml @@ -1,5 +1,5 @@ - + /bar diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml index cd6e09e741f..dfadf9a005a 100644 --- a/jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml +++ b/jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml @@ -1,5 +1,5 @@ - + /foo diff --git a/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml index bd0226dd58d..0b9fdc6c7b1 100644 --- a/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml +++ b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml index 3cd4a8c2082..6d0ed5bd00f 100644 --- a/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml +++ b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml b/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml index ca37ce84f07..7dd5b5f3ccb 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml +++ b/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml b/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml index 09233ae33c7..aef61105a32 100644 --- a/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml +++ b/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml b/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml index 5aadbb66a70..2dfe691de24 100644 --- a/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml +++ b/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml b/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml index 42b97d1b5ba..6f1b65ef6fa 100644 --- a/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml +++ b/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml @@ -19,7 +19,7 @@ ~ --> - + diff --git a/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml b/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml index ddfb4cb7bb3..98c0dfc9eba 100644 --- a/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml +++ b/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml @@ -19,7 +19,7 @@ ~ --> - + diff --git a/jetty-core/jetty-jndi/src/main/config/modules/jndi.mod b/jetty-core/jetty-jndi/src/main/config/modules/jndi.mod index efa8d7ff318..a01fd6c48b7 100644 --- a/jetty-core/jetty-jndi/src/main/config/modules/jndi.mod +++ b/jetty-core/jetty-jndi/src/main/config/modules/jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds the Jetty JNDI implementation to the classpath. diff --git a/jetty-core/jetty-openid/src/main/config/modules/openid.mod b/jetty-core/jetty-openid/src/main/config/modules/openid.mod index c61875abeea..8a1a8265462 100644 --- a/jetty-core/jetty-openid/src/main/config/modules/openid.mod +++ b/jetty-core/jetty-openid/src/main/config/modules/openid.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds OpenId Connect authentication to the server. diff --git a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-compactpath.xml b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-compactpath.xml index 822e90e5776..2eab21ff751 100644 --- a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-compactpath.xml +++ b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-compactpath.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml index 7178cb264d3..2dfb8c9c76a 100644 --- a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml +++ b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml index c52711d6755..9b0d0e3118d 100644 --- a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml +++ b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod index 609ee430586..d0b64c295cb 100644 --- a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod +++ b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Add a rule to the rewrite module to compact paths. diff --git a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod index 4147ce7e611..fced4946ee9 100644 --- a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod +++ b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables a rewrite Rules container as a request customizer. diff --git a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite.mod b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite.mod index 1b03693c4e9..ac4963afd23 100644 --- a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite.mod +++ b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the jetty-rewrite handler. diff --git a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite/jetty-rewrite-rules.xml b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite/jetty-rewrite-rules.xml index 92de8ff9318..1bccfe945b1 100644 --- a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite/jetty-rewrite-rules.xml +++ b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite/jetty-rewrite-rules.xml @@ -1,5 +1,5 @@ - + - + diff --git a/jetty-core/jetty-server/src/main/config/modules/acceptratelimit.mod b/jetty-core/jetty-server/src/main/config/modules/acceptratelimit.mod index 45d14fb0171..1e2435f4f9c 100644 --- a/jetty-core/jetty-server/src/main/config/modules/acceptratelimit.mod +++ b/jetty-core/jetty-server/src/main/config/modules/acceptratelimit.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables a server-wide accept rate limit. diff --git a/jetty-core/jetty-server/src/main/config/modules/bytebufferpool-quadratic.mod b/jetty-core/jetty-server/src/main/config/modules/bytebufferpool-quadratic.mod index 4478670b9d3..9c4ba838005 100644 --- a/jetty-core/jetty-server/src/main/config/modules/bytebufferpool-quadratic.mod +++ b/jetty-core/jetty-server/src/main/config/modules/bytebufferpool-quadratic.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Configures the ByteBufferPool used by ServerConnectors. diff --git a/jetty-core/jetty-server/src/main/config/modules/connectionlimit.mod b/jetty-core/jetty-server/src/main/config/modules/connectionlimit.mod index 00661868ea5..3c7b32d2041 100644 --- a/jetty-core/jetty-server/src/main/config/modules/connectionlimit.mod +++ b/jetty-core/jetty-server/src/main/config/modules/connectionlimit.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables a server-wide connection limit. diff --git a/jetty-core/jetty-server/src/main/config/modules/customrequestlog.mod b/jetty-core/jetty-server/src/main/config/modules/customrequestlog.mod index 7305c6f4e2c..710343ee54e 100644 --- a/jetty-core/jetty-server/src/main/config/modules/customrequestlog.mod +++ b/jetty-core/jetty-server/src/main/config/modules/customrequestlog.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Deprecated name for requestlog using custom request logger. diff --git a/jetty-core/jetty-server/src/main/config/modules/debug.mod b/jetty-core/jetty-server/src/main/config/modules/debug.mod index c92e9fbd42e..eb2887e3f43 100644 --- a/jetty-core/jetty-server/src/main/config/modules/debug.mod +++ b/jetty-core/jetty-server/src/main/config/modules/debug.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the DebugListener. diff --git a/jetty-core/jetty-server/src/main/config/modules/debuglog.mod b/jetty-core/jetty-server/src/main/config/modules/debuglog.mod index ba71d1027a2..1a0a3bb36fd 100644 --- a/jetty-core/jetty-server/src/main/config/modules/debuglog.mod +++ b/jetty-core/jetty-server/src/main/config/modules/debuglog.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Deprecated Debug Log using DebugHandle. diff --git a/jetty-core/jetty-server/src/main/config/modules/ext.mod b/jetty-core/jetty-server/src/main/config/modules/ext.mod index 51891a284ba..6fc42b27cb8 100644 --- a/jetty-core/jetty-server/src/main/config/modules/ext.mod +++ b/jetty-core/jetty-server/src/main/config/modules/ext.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds the jar file from $JETTY_HOME/lib/ext and $JETTY_BASE/lib/ext to the server classpath. diff --git a/jetty-core/jetty-server/src/main/config/modules/graceful.mod b/jetty-core/jetty-server/src/main/config/modules/graceful.mod index 3ed0df5a127..0bcf8d6675d 100644 --- a/jetty-core/jetty-server/src/main/config/modules/graceful.mod +++ b/jetty-core/jetty-server/src/main/config/modules/graceful.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables Graceful processing of requests diff --git a/jetty-core/jetty-server/src/main/config/modules/gzip.mod b/jetty-core/jetty-server/src/main/config/modules/gzip.mod index 4a4320fba6e..8764dccfc42 100644 --- a/jetty-core/jetty-server/src/main/config/modules/gzip.mod +++ b/jetty-core/jetty-server/src/main/config/modules/gzip.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables GzipHandler for dynamic gzip compression for the entire server. diff --git a/jetty-core/jetty-server/src/main/config/modules/home-base-warning.mod b/jetty-core/jetty-server/src/main/config/modules/home-base-warning.mod index 0e848406d52..e4ed15823bb 100644 --- a/jetty-core/jetty-server/src/main/config/modules/home-base-warning.mod +++ b/jetty-core/jetty-server/src/main/config/modules/home-base-warning.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Generates a warning that server has been run from $JETTY_HOME rather than from a $JETTY_BASE. diff --git a/jetty-core/jetty-server/src/main/config/modules/https.mod b/jetty-core/jetty-server/src/main/config/modules/https.mod index 943191df309..59ae07ca018 100644 --- a/jetty-core/jetty-server/src/main/config/modules/https.mod +++ b/jetty-core/jetty-server/src/main/config/modules/https.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds HTTPS protocol support to the TLS(SSL) Connector. diff --git a/jetty-core/jetty-server/src/main/config/modules/inetaccess.mod b/jetty-core/jetty-server/src/main/config/modules/inetaccess.mod index 70900e4d9a1..8716b1d4e79 100644 --- a/jetty-core/jetty-server/src/main/config/modules/inetaccess.mod +++ b/jetty-core/jetty-server/src/main/config/modules/inetaccess.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the InetAccessHandler. diff --git a/jetty-core/jetty-server/src/main/config/modules/jaas.mod b/jetty-core/jetty-server/src/main/config/modules/jaas.mod index 3f35dcfd393..1f969842cd8 100644 --- a/jetty-core/jetty-server/src/main/config/modules/jaas.mod +++ b/jetty-core/jetty-server/src/main/config/modules/jaas.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables JAAS for deployed web applications. diff --git a/jetty-core/jetty-server/src/main/config/modules/jdbc.mod b/jetty-core/jetty-server/src/main/config/modules/jdbc.mod index 47ee5d24bce..2177507f381 100644 --- a/jetty-core/jetty-server/src/main/config/modules/jdbc.mod +++ b/jetty-core/jetty-server/src/main/config/modules/jdbc.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the java.sql JPMS module. diff --git a/jetty-core/jetty-server/src/main/config/modules/jvm.mod b/jetty-core/jetty-server/src/main/config/modules/jvm.mod index 066d597c476..578f163b578 100644 --- a/jetty-core/jetty-server/src/main/config/modules/jvm.mod +++ b/jetty-core/jetty-server/src/main/config/modules/jvm.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Creates an ini template for setting JVM arguments (eg -Xmx ). diff --git a/jetty-core/jetty-server/src/main/config/modules/lowresources.mod b/jetty-core/jetty-server/src/main/config/modules/lowresources.mod index 72e0b636924..6acebbfdcc5 100644 --- a/jetty-core/jetty-server/src/main/config/modules/lowresources.mod +++ b/jetty-core/jetty-server/src/main/config/modules/lowresources.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables a low resource monitor on the server. diff --git a/jetty-core/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod b/jetty-core/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod index 1919f83d53a..8c0611c68c6 100644 --- a/jetty-core/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod +++ b/jetty-core/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the Proxy Protocol on the TLS(SSL) Connector. diff --git a/jetty-core/jetty-server/src/main/config/modules/requestlog.mod b/jetty-core/jetty-server/src/main/config/modules/requestlog.mod index 786f90cd298..bb5cb3ce95e 100644 --- a/jetty-core/jetty-server/src/main/config/modules/requestlog.mod +++ b/jetty-core/jetty-server/src/main/config/modules/requestlog.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Logs requests using CustomRequestLog and AsyncRequestLogWriter. diff --git a/jetty-core/jetty-server/src/main/config/modules/resources.mod b/jetty-core/jetty-server/src/main/config/modules/resources.mod index 9d518f6ae8b..9c503c55480 100644 --- a/jetty-core/jetty-server/src/main/config/modules/resources.mod +++ b/jetty-core/jetty-server/src/main/config/modules/resources.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] # tag::description[] diff --git a/jetty-core/jetty-server/src/main/config/modules/secure-redirect.mod b/jetty-core/jetty-server/src/main/config/modules/secure-redirect.mod index a0b54bc6e78..80e47924cf3 100644 --- a/jetty-core/jetty-server/src/main/config/modules/secure-redirect.mod +++ b/jetty-core/jetty-server/src/main/config/modules/secure-redirect.mod @@ -1,4 +1,4 @@ -DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enable SecuredRedirectHandler to redirect all http requests to https on the secure port configured in the server.ini file. diff --git a/jetty-core/jetty-server/src/main/config/modules/security.mod b/jetty-core/jetty-server/src/main/config/modules/security.mod index c428e06765f..f6bad5e4933 100644 --- a/jetty-core/jetty-server/src/main/config/modules/security.mod +++ b/jetty-core/jetty-server/src/main/config/modules/security.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds core security handling to the classpath. diff --git a/jetty-core/jetty-server/src/main/config/modules/session-cache-hash.mod b/jetty-core/jetty-server/src/main/config/modules/session-cache-hash.mod index c7ea422034b..79c4e753ec2 100644 --- a/jetty-core/jetty-server/src/main/config/modules/session-cache-hash.mod +++ b/jetty-core/jetty-server/src/main/config/modules/session-cache-hash.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enable first level session cache. diff --git a/jetty-core/jetty-server/src/main/config/modules/session-cache-null.mod b/jetty-core/jetty-server/src/main/config/modules/session-cache-null.mod index a851d17e73b..4e7af393f3b 100644 --- a/jetty-core/jetty-server/src/main/config/modules/session-cache-null.mod +++ b/jetty-core/jetty-server/src/main/config/modules/session-cache-null.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] A SessionCache that does not actually cache sessions. diff --git a/jetty-core/jetty-server/src/main/config/modules/session-store-cache.mod b/jetty-core/jetty-server/src/main/config/modules/session-store-cache.mod index 8baf6256ddb..7485b70aa54 100644 --- a/jetty-core/jetty-server/src/main/config/modules/session-store-cache.mod +++ b/jetty-core/jetty-server/src/main/config/modules/session-store-cache.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables caching of SessionData in front of a SessionDataStore. diff --git a/jetty-core/jetty-server/src/main/config/modules/session-store-file.mod b/jetty-core/jetty-server/src/main/config/modules/session-store-file.mod index 7ddb8ade418..e00163a4883 100644 --- a/jetty-core/jetty-server/src/main/config/modules/session-store-file.mod +++ b/jetty-core/jetty-server/src/main/config/modules/session-store-file.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables session persistent storage in files. diff --git a/jetty-core/jetty-server/src/main/config/modules/session-store-jdbc.mod b/jetty-core/jetty-server/src/main/config/modules/session-store-jdbc.mod index 2982b7afa22..c60038f0cac 100644 --- a/jetty-core/jetty-server/src/main/config/modules/session-store-jdbc.mod +++ b/jetty-core/jetty-server/src/main/config/modules/session-store-jdbc.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables JDBC persistent/distributed session storage. diff --git a/jetty-core/jetty-server/src/main/config/modules/sessions.mod b/jetty-core/jetty-server/src/main/config/modules/sessions.mod index fc93c186f81..ade7f539642 100644 --- a/jetty-core/jetty-server/src/main/config/modules/sessions.mod +++ b/jetty-core/jetty-server/src/main/config/modules/sessions.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables session management. diff --git a/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod b/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod index 0ae4d1e9868..e60eb16c4ed 100644 --- a/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod +++ b/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] JDBC Datasource connections for session storage. diff --git a/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod b/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod index 89f361c09c5..4d4af55f330 100644 --- a/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod +++ b/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] JDBC Driver connections for session storage. diff --git a/jetty-core/jetty-server/src/main/config/modules/statistics.mod b/jetty-core/jetty-server/src/main/config/modules/statistics.mod index 1b00ec0f7ae..7eb8c22caf2 100644 --- a/jetty-core/jetty-server/src/main/config/modules/statistics.mod +++ b/jetty-core/jetty-server/src/main/config/modules/statistics.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables statistics collection for the server. diff --git a/jetty-core/jetty-server/src/main/config/modules/well-known.mod b/jetty-core/jetty-server/src/main/config/modules/well-known.mod index 4db3029b075..1c6b07598ea 100644 --- a/jetty-core/jetty-server/src/main/config/modules/well-known.mod +++ b/jetty-core/jetty-server/src/main/config/modules/well-known.mod @@ -1,4 +1,4 @@ -DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Serve static files from a directory for the "/.well-known" context path. diff --git a/jetty-core/jetty-server/src/main/config/modules/work.mod b/jetty-core/jetty-server/src/main/config/modules/work.mod index 2d93c2bbe5e..0299b7f92f5 100644 --- a/jetty-core/jetty-server/src/main/config/modules/work.mod +++ b/jetty-core/jetty-server/src/main/config/modules/work.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Creates the $JETTY_BASE/work directory as a persistent temp directory. diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java index 0081b874aa3..681150359b7 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java @@ -63,7 +63,7 @@ public class HomeBaseWarning { StringBuilder warn = new StringBuilder(); warn.append("This instance of Jetty is not running from a separate {jetty.base} directory"); - warn.append(", this is not recommended. See documentation at https://www.eclipse.org/jetty/documentation/current/startup.html"); + warn.append(", this is not recommended. See documentation at https://eclipse.dev/jetty/documentation/"); LOG.warn("{}", warn.toString()); } } diff --git a/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java b/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java index cf1c8797381..d01ad6935c8 100644 --- a/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java +++ b/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java @@ -121,7 +121,7 @@ public class ModuleGraphWriter out.println("/*"); out.println(" * GraphViz Graph of Jetty Modules"); out.println(" * "); - out.println(" * Jetty: https://eclipse.org/jetty/"); + out.println(" * Jetty: https://eclipse.dev/jetty/"); out.println(" * GraphViz: http://graphviz.org/"); out.println(" * "); out.println(" * To Generate Graph image using graphviz:"); diff --git a/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java b/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java index 06133b86d3f..01ab03b243b 100644 --- a/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java +++ b/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java @@ -68,7 +68,7 @@ public class MavenLocalRepoFileInitializerTest public void testGetCoordinateNotMaven() { MavenLocalRepoFileInitializer repo = new MavenLocalRepoFileInitializer(baseHome); - String ref = "https://www.eclipse.org/jetty/"; + String ref = "https://eclipse.dev/jetty/"; Coordinates coords = repo.getCoordinates(URI.create(ref)); assertThat("Coords", coords, nullValue()); } @@ -77,7 +77,7 @@ public class MavenLocalRepoFileInitializerTest public void testGetCoordinateInvalidMaven() { MavenLocalRepoFileInitializer repo = new MavenLocalRepoFileInitializer(baseHome); - String ref = "maven://www.eclipse.org/jetty"; + String ref = "maven://eclipse.dev/jetty"; RuntimeException x = assertThrows(RuntimeException.class, () -> repo.getCoordinates(URI.create(ref))); assertThat(x.getMessage(), containsString("Not a valid maven:// uri")); } diff --git a/jetty-core/jetty-start/src/test/resources/dist-home/modules/main.mod b/jetty-core/jetty-start/src/test/resources/dist-home/modules/main.mod index 8fd93990e8a..8e398221e85 100644 --- a/jetty-core/jetty-start/src/test/resources/dist-home/modules/main.mod +++ b/jetty-core/jetty-start/src/test/resources/dist-home/modules/main.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Example of a module diff --git a/jetty-core/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml b/jetty-core/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml index d59074567be..7e7d8beda77 100644 --- a/jetty-core/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml +++ b/jetty-core/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-util/src/main/config/modules/console-capture.mod b/jetty-core/jetty-util/src/main/config/modules/console-capture.mod index 0fa45415ae6..24bb34984c0 100644 --- a/jetty-core/jetty-util/src/main/config/modules/console-capture.mod +++ b/jetty-core/jetty-util/src/main/config/modules/console-capture.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Redirects the JVM console stderr and stdout to a rolling log file. diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java index 35ca58094d4..4b6f6bb0440 100644 --- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java +++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java @@ -1496,12 +1496,12 @@ public class LazyListTest uris.add(URI.create("http://www.mortbay.org/")); uris.add(URI.create("http://jetty.codehaus.org/jetty/")); uris.add(URI.create("http://www.intalio.com/jetty/")); - uris.add(URI.create("https://www.eclipse.org/jetty/")); + uris.add(URI.create("https://eclipse.dev/jetty/")); // Make sure that Generics pass through the 'get' routine safely. // We should be able to call this without casting the result to URI URI eclipseUri = LazyList.get(uris, 3); - assertEquals("https://www.eclipse.org/jetty/", eclipseUri.toASCIIString()); + assertEquals("https://eclipse.dev/jetty/", eclipseUri.toASCIIString()); } /** diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java index dd9ebc53d49..95fa0519d99 100644 --- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java +++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java @@ -82,7 +82,7 @@ public class Utf8LineParserTest public void testWildHttpRequestParse() { // Arbitrary Http Response Headers seen in the wild. - // Request URI -> http://www.eclipse.org/jetty/ + // Request URI -> https://eclipse.dev/jetty/ List expected = new ArrayList<>(); expected.add("HEAD /jetty/ HTTP/1.0"); expected.add("User-Agent: \"Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.6) Gecko/20060601 Firefox/2.0.0.6 (Ubuntu-feisty)\""); diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java index b2a9f98cc46..30596dec1e5 100644 --- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java +++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java @@ -187,7 +187,7 @@ public class FileSystemResourceTest public void testNotFileURI() { assertThrows(IllegalArgumentException.class, - () -> ResourceFactory.root().newResource(new URI("https://www.eclipse.org/jetty/"))); + () -> ResourceFactory.root().newResource(new URI("https://eclipse.dev/jetty/"))); } @Test diff --git a/jetty-core/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-core/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java index c2199981d54..7bea699a8dd 100644 --- a/jetty-core/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java +++ b/jetty-core/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java @@ -13,6 +13,7 @@ package org.eclipse.jetty.xml; +import java.io.Closeable; import java.io.IOException; import java.io.InputStream; import java.lang.annotation.Annotation; @@ -203,7 +204,7 @@ public class XmlConfiguration private final String _dtd; private ConfigurationProcessor _processor; - ConfigurationParser getParser() + public XmlParser getXmlParser() { Pool.Entry entry = __parsers.acquire(ConfigurationParser::new); if (entry == null) @@ -234,7 +235,8 @@ public class XmlConfiguration */ public XmlConfiguration(Resource resource, Map idMap, Map properties) throws SAXException, IOException { - try (ConfigurationParser parser = getParser(); InputStream inputStream = resource.newInputStream()) + XmlParser parser = getXmlParser(); + try (InputStream inputStream = resource.newInputStream()) { _location = resource; setConfig(parser.parse(inputStream)); @@ -242,6 +244,11 @@ public class XmlConfiguration _idMap = idMap == null ? new HashMap<>() : idMap; _propertyMap = properties == null ? new HashMap<>() : properties; } + finally + { + if (parser instanceof Closeable) + ((Closeable)parser).close(); + } } @Override @@ -2004,7 +2011,7 @@ public class XmlConfiguration } } - private static class ConfigurationParser extends XmlParser implements AutoCloseable + private static class ConfigurationParser extends XmlParser implements Closeable { private final Pool.Entry _entry; diff --git a/jetty-core/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java b/jetty-core/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java index 6165ac4b708..49c7d410f53 100644 --- a/jetty-core/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java +++ b/jetty-core/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java @@ -303,7 +303,7 @@ public class XmlParser return parse(new InputSource(in)); } - private InputSource resolveEntity(String pid, String sid) + InputSource resolveEntity(String pid, String sid) { if (LOG.isDebugEnabled()) LOG.debug("resolveEntity({},{})", pid, sid); @@ -321,6 +321,9 @@ public class XmlParser LOG.trace("IGNORE EntityResolver exception for (pid=%s, sid=%s)".formatted(pid, sid), e); } } + + if (LOG.isDebugEnabled()) + LOG.debug("Entity not found for PID:{} / SID:{}", pid, sid); return null; } diff --git a/jetty-core/jetty-xml/src/main/resources/org/eclipse/jetty/xml/catalog-configure.xml b/jetty-core/jetty-xml/src/main/resources/org/eclipse/jetty/xml/catalog-configure.xml index d4e6c7863b7..b55bd94fcfb 100644 --- a/jetty-core/jetty-xml/src/main/resources/org/eclipse/jetty/xml/catalog-configure.xml +++ b/jetty-core/jetty-xml/src/main/resources/org/eclipse/jetty/xml/catalog-configure.xml @@ -1,13 +1,24 @@ - + - + + + + + + + + + + + + @@ -23,6 +34,12 @@ + + + + + + @@ -32,6 +49,12 @@ + + + + + + @@ -39,5 +62,10 @@ - + + + + + + diff --git a/jetty-core/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java b/jetty-core/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java index 4f57e7527a0..0150556b86c 100644 --- a/jetty-core/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java +++ b/jetty-core/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java @@ -64,6 +64,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.xml.sax.InputSource; import org.xml.sax.SAXException; import static java.nio.charset.StandardCharsets.UTF_8; @@ -117,9 +118,12 @@ public class XmlConfigurationTest } } - public static String[] xmlConfigs() + public static Stream xmlConfigs() { - return new String[]{"org/eclipse/jetty/xml/configureWithAttr.xml", "org/eclipse/jetty/xml/configureWithElements.xml"}; + return Stream.of( + Arguments.of("org/eclipse/jetty/xml/configureWithAttr.xml"), + Arguments.of("org/eclipse/jetty/xml/configureWithElements.xml") + ); } @ParameterizedTest @@ -1963,6 +1967,46 @@ public class XmlConfigurationTest assertThat(tc.testObject, instanceOf(ScheduledExecutorService.class)); } + public static Stream xmlSystemIdSource() + { + List ids = new ArrayList<>(); + + String[] schemes = {"http", "https"}; + String[] hosts = {"eclipse.org", "www.eclipse.org", "eclipse.dev", "www.eclipse.dev"}; + String[] paths = {"/jetty/configure.dtd", // version-less + "/jetty/configure_9_0.dtd", // 9.0 + "/jetty/configure_9_3.dtd", // 9.3 + "/jetty/configure_10_0.dtd"}; // 10. + + for (String scheme: schemes) + { + for (String host: hosts) + { + for (String path: paths) + { + ids.add(Arguments.of(String.format("%s://%s%s", scheme, host, path))); + } + } + } + + return ids.stream(); + } + + /** + * Test to ensure that all required XML System ID variants are covered in the + * {@link XmlConfiguration} internals. + */ + @ParameterizedTest + @MethodSource("xmlSystemIdSource") + public void testSystemIdVariants(String xmlSystemId) throws IOException, SAXException + { + // empty raw xml, just to instantiate XmlConfiguration, so we can access the XmlParser / ConfigurationParser. + XmlConfiguration xmlConfiguration = asXmlConfiguration(""); + XmlParser configurationProcessor = xmlConfiguration.getXmlParser(); + InputSource inputSource = configurationProcessor.resolveEntity(null, xmlSystemId); + assertNotNull(inputSource, "SystemID: " + xmlSystemId + " does not exist"); + } + private ByteArrayOutputStream captureLoggingBytes(ThrowableAction action) throws Exception { Logger slf4jLogger = LoggerFactory.getLogger(XmlConfiguration.class); diff --git a/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod b/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod index ca8274bd10e..b617100a5dc 100644 --- a/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod +++ b/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables Annotation scanning for deployed web applications. diff --git a/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod b/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod index 7da00327ca6..77cce3ca8ab 100644 --- a/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod +++ b/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables use of the apache implementation of JSP. diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/etc/cdi/jetty-ee10-cdi.xml b/jetty-ee10/jetty-ee10-cdi/src/main/config/etc/cdi/jetty-ee10-cdi.xml index 05911314079..bdca8872143 100644 --- a/jetty-ee10/jetty-ee10-cdi/src/main/config/etc/cdi/jetty-ee10-cdi.xml +++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/etc/cdi/jetty-ee10-cdi.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod index f59f540a473..a5d664bbf6e 100644 --- a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod +++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Configures Jetty to use the "CdiDecoratingListener" as the default CDI mode. diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod index fab2f044126..981e689feba 100644 --- a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod +++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Configures Jetty to use the "CdiSpiDecorator" as the default CDI mode. diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod index b661f5d2e00..94d490847a8 100644 --- a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod +++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Provides integration of CDI within webapp to Jetty container object lifecycles. diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod index b89f71e0e9c..d015f02487e 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo Async Rest webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 0a572e46421..993604c2427 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/exampleserver.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/exampleserver.xml index 8e86cdfec1c..b8056cdbecb 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/exampleserver.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/exampleserver.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml index cf7086184e8..2fcadfe77b0 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/demo.d/ee10-demo-jaas.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/demo.d/ee10-demo-jaas.xml index b657c3b8253..1167c1494f6 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/demo.d/ee10-demo-jaas.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/demo.d/ee10-demo-jaas.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod index 269086a9535..c3d1976e4b2 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo EE10 JAAS webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml index f375ddfa644..794ff67798b 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html index d243af9c4be..b796ad28ac6 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html @@ -9,9 +9,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -21,7 +21,7 @@

JAAS Demo

- This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. It uses a simple login module that stores its configuration in a properties file.

@@ -36,7 +36,7 @@
-
+
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html index 7486bcc4ca3..2571bf9ea31 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html @@ -6,9 +6,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -28,7 +28,7 @@
-
+
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml index 5d21ea6a539..0c505467149 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-jetty.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-jetty.mod index 138479e2dd4..62ad256f8a3 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-jetty.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-jetty.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo Jetty Webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-rewrite.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-rewrite.mod index 68064609aff..ef3f514ebce 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-rewrite.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-rewrite.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demonstrate the rewrite module. diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml index deaf55036d2..94c1864b1c3 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod index 8ef4e75c1b9..c0aa4795c3f 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo JNDI Resources Webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml index 2609adcdbeb..cd6088270b5 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/templates/plugin-context-header.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/templates/plugin-context-header.xml index 4671bb6ab86..ecc7ce424a5 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/templates/plugin-context-header.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/templates/plugin-context-header.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml index bd7b5254d9d..5eb8e5e07d2 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml index d0f0fb5d2c0..e8ae7739ec5 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html index 5a1f71dd72d..40f2e92ca78 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -20,7 +20,7 @@

Eclipse Jetty JNDI Demo Webapp

- This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

@@ -48,7 +48,7 @@

-
+
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 23ff79579d1..ff51f399af0 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp index 671da0a396b..05c0ac224ba 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp @@ -10,9 +10,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -22,7 +22,7 @@

Eclipse Jetty JSP Demo Webapp

- This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

JSP Examples on <%= DateTimeFormatter.ofPattern("d MMMM yyyy").format(LocalDate.now()) %>

@@ -39,7 +39,7 @@
-
+
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod index 32860c274ae..84498fdb234 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Download and install some Demo Mock Resources diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod index 89c01e515b1..ae219aea510 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo Proxy Webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 459ee9eaccc..631a65bbd7d 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml index 01c8eee8d93..e224e2019e4 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml @@ -13,7 +13,7 @@ org.eclipse.jetty.ee10.proxy.ProxyServlet$Transparent proxyTo - https://www.eclipse.org/jetty/javadoc/jetty-11/index.html?overview-summary.html + https://eclipse.dev/jetty/javadoc/jetty-12/index.html?overview-summary.html hostHeader diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/demo.d/ee10-demo-spec.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/demo.d/ee10-demo-spec.xml index 9faa813d3a8..071adde3e76 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/demo.d/ee10-demo-spec.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/demo.d/ee10-demo-spec.xml @@ -1,5 +1,5 @@ - + /ee10-test-spec diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod index 9e947ceeb2e..6b5ebb414d5 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Download and deploy the Test Spec webapp demo. diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/templates/annotations-context-header.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/templates/annotations-context-header.xml index 4c57c6ce96d..d1288bed8b2 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/templates/annotations-context-header.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/templates/annotations-context-header.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/templates/plugin-context-header.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/templates/plugin-context-header.xml index 2411bbd3ebd..55c52c739b4 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/templates/plugin-context-header.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/templates/plugin-context-header.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml index 46067757a90..c11c4a91235 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 364dfaf1197..170908cfed3 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/index.html index 8fa3b6f52e2..8d8ab831742 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -80,7 +80,7 @@
-
+
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/test/jetty-plugin-env.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/test/jetty-plugin-env.xml index aa2340db709..a01523f88c8 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/test/jetty-plugin-env.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/test/jetty-plugin-env.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/index.html index 356750e8686..14aa5f6d1fc 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/index.html @@ -10,9 +10,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -29,7 +29,7 @@
-
+
diff --git a/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod b/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod index 2cc48dd80e2..4bb6bb07b56 100644 --- a/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod +++ b/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the glassfish version of JSTL for all webapps. diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod index 3b1e4892ccc..6a3841ac8f1 100644 --- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod +++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Provides a DefaultAuthConfigFactory for jaspi diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod index 00289d6dcff..b9342914a66 100644 --- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod +++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables JASPI basic authentication the /test context path. diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod index d31975f5815..f463d213d06 100644 --- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod +++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables JASPI authentication for deployed web applications. diff --git a/jetty-ee10/jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod b/jetty-ee10/jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod index 1f7467cbecf..093f4a0fc3f 100644 --- a/jetty-ee10/jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod +++ b/jetty-ee10/jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds the Jetty EE10 JNDI reference factories diff --git a/jetty-ee10/jetty-ee10-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee10/jspc/plugin/JspcMojo.java b/jetty-ee10/jetty-ee10-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee10/jspc/plugin/JspcMojo.java index e92037aabd7..f78e5780f52 100644 --- a/jetty-ee10/jetty-ee10-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee10/jspc/plugin/JspcMojo.java +++ b/jetty-ee10/jetty-ee10-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee10/jspc/plugin/JspcMojo.java @@ -58,9 +58,8 @@ import org.eclipse.jetty.util.IO; * Note that the same java compiler will be used as for on-the-fly compiled * jsps, which will be the Eclipse java compiler. *

- * See Usage - * Guide for instructions on using this plugin. + * See Usage Guide for + * instructions on using this plugin. *

* Runs jspc compiler to produce .java and .class files */ diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod index 21f9975558d..6278dc43d66 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables test setup diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod index 56dfa289d0a..78134aace9c 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables test setup diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod b/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod index 483b60e4a14..8920fbe1cd8 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables an un-assembled Maven webapp to run in a Jetty distribution. diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty-deploy.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty-deploy.xml index 8cfd3fe6104..88fc1a79e59 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty-deploy.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty-http.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty-http.xml index 303ada127b6..bbd9ab19ed5 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty-http.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml index 0e9be689a0b..5d006b44c9a 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml @@ -1,12 +1,12 @@ - + - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty.xml index dde7ec29432..ed1e4f3433e 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty.xml @@ -6,7 +6,7 @@ - + diff --git a/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod b/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod index 079efee0488..e62d7f38b5b 100644 --- a/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod +++ b/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the Jetty Proxy service. diff --git a/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod b/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod index 93832267762..daacb58fad4 100644 --- a/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod +++ b/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the Jetty Quickstart module for rapid deployment of preconfigured web applications. diff --git a/jetty-ee10/jetty-ee10-runner/src/main/java/org/eclipse/jetty/ee10/runner/Runner.java b/jetty-ee10/jetty-ee10-runner/src/main/java/org/eclipse/jetty/ee10/runner/Runner.java index 989a9f451d7..b16bb84c63e 100644 --- a/jetty-ee10/jetty-ee10-runner/src/main/java/org/eclipse/jetty/ee10/runner/Runner.java +++ b/jetty-ee10/jetty-ee10-runner/src/main/java/org/eclipse/jetty/ee10/runner/Runner.java @@ -569,7 +569,7 @@ public class Runner { System.err.println("WARNING: jetty-runner is deprecated."); System.err.println(" See Jetty Documentation for startup options"); - System.err.println(" https://www.eclipse.org/jetty/documentation/"); + System.err.println(" https://eclipse.dev/jetty/documentation/"); Runner runner = new Runner(); diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-openid.mod b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-openid.mod index a2115183e55..bcddc284d2e 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-openid.mod +++ b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-openid.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds openid security for EE10. diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod index 4555dfd83b3..19657b869f3 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod +++ b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds servlet standard security handling to the classpath. diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod index 2191941a9ef..e679f195524 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod +++ b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables standard Servlet handling. diff --git a/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod b/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod index c277623821c..df4881f1a85 100644 --- a/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod +++ b/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds Jetty utility servlets and filters available to a webapp. diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml b/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml index aeab8a19103..04c28db52cb 100644 --- a/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml +++ b/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml @@ -185,7 +185,7 @@ - + diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod b/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod index 2131c905c1e..298e6b98ef1 100644 --- a/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod +++ b/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] # tag::description[] diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod index 8b67a488f86..9f8dc1569be 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Expose the Jetty WebSocket Client classes to deployed web applications. diff --git a/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod b/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod index 1be23648b4f..77296c6c1e3 100644 --- a/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod +++ b/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables Annotation scanning for deployed web applications. diff --git a/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod b/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod index 49f94f4c4f0..abc42f5a466 100644 --- a/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod +++ b/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables use of the apache implementation of JSP. diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/src/main/config/modules/ee8-demo-async-rest.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/src/main/config/modules/ee8-demo-async-rest.mod index f3d78cfc181..ac42cf7bef0 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/src/main/config/modules/ee8-demo-async-rest.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/src/main/config/modules/ee8-demo-async-rest.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo Async Rest webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/src/main/config/modules/ee8-demo-jaas.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/src/main/config/modules/ee8-demo-jaas.mod index e5e8aff612d..81f32b960ea 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/src/main/config/modules/ee8-demo-jaas.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/src/main/config/modules/ee8-demo-jaas.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo EE8 JAAS webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-jetty.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-jetty.mod index 31a8555533d..6bbd2313074 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-jetty.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-jetty.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo Jetty Webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-moved-context.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-moved-context.mod index bf7e9df581f..18a631c2da3 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-moved-context.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-moved-context.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demonstrate a Moved Context Handler. diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-rewrite.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-rewrite.mod index 27d51d573cf..d5c75002682 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-rewrite.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-rewrite.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demonstrate the rewrite module. diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/demo.d/ee8-demo-jndi.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/demo.d/ee8-demo-jndi.xml index 0b55c5f947e..693f9cf826c 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/demo.d/ee8-demo-jndi.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/demo.d/ee8-demo-jndi.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/ee8-demo-jndi.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/ee8-demo-jndi.mod index 6b7d85620b5..24b9850ce6c 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/ee8-demo-jndi.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/ee8-demo-jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo JNDI Resources Webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/src/main/config/modules/ee8-demo-mock-resources.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/src/main/config/modules/ee8-demo-mock-resources.mod index 457d4fc4338..d6b26a5d05d 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/src/main/config/modules/ee8-demo-mock-resources.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/src/main/config/modules/ee8-demo-mock-resources.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Download and install some Demo Mock Resources diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/src/main/config/modules/ee8-demo-proxy.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/src/main/config/modules/ee8-demo-proxy.mod index e3a66559801..f7ad5f95122 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/src/main/config/modules/ee8-demo-proxy.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/src/main/config/modules/ee8-demo-proxy.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo Proxy Webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/demo.d/ee8-demo-spec.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/demo.d/ee8-demo-spec.xml index 799e5fa79b2..366c5f16c94 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/demo.d/ee8-demo-spec.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/demo.d/ee8-demo-spec.xml @@ -1,5 +1,5 @@ - + /ee8-test-spec diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/ee8-demo-spec.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/ee8-demo-spec.mod index 52324e85f4a..c665d14aa29 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/ee8-demo-spec.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/ee8-demo-spec.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Download and deploy the Test Spec webapp demo. diff --git a/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod b/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod index 755530fa22a..dc45914255b 100644 --- a/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod +++ b/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the glassfish version of JSTL for all webapps. diff --git a/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod b/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod index 186c4b746bb..05f2e868dc0 100644 --- a/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod +++ b/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds the Jetty EE8 JNDI reference factories diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod index b391b0dc40b..a2fc225ca68 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod +++ b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables test setup diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod index 465bd0f16f1..604ee1f920f 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod +++ b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables test setup diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod b/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod index 8f1f046708f..e7f64949321 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod +++ b/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables an un-assembled Maven webapp to run in a Jetty distribution. diff --git a/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod b/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod index aaad1ff3cc1..436bbc3c19e 100644 --- a/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod +++ b/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds OpenId Connect authentication to the server. diff --git a/jetty-ee8/jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod b/jetty-ee8/jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod index d2d675af92b..372c4e5f1bd 100644 --- a/jetty-ee8/jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod +++ b/jetty-ee8/jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the Jetty Proxy service. diff --git a/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod b/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod index e999a138e89..c4f50ab8f39 100644 --- a/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod +++ b/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the Jetty Quickstart module for rapid deployment of preconfigured web applications. diff --git a/jetty-ee8/jetty-ee8-security/src/main/config/modules/ee8-security.mod b/jetty-ee8/jetty-ee8-security/src/main/config/modules/ee8-security.mod index c471df388ba..5e786362647 100644 --- a/jetty-ee8/jetty-ee8-security/src/main/config/modules/ee8-security.mod +++ b/jetty-ee8/jetty-ee8-security/src/main/config/modules/ee8-security.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds servlet standard security handling to the classpath. diff --git a/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod b/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod index b675250f36d..ef6c975365f 100644 --- a/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod +++ b/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables standard Servlet handling. diff --git a/jetty-ee8/jetty-ee8-servlets/src/main/config/modules/ee8-servlets.mod b/jetty-ee8/jetty-ee8-servlets/src/main/config/modules/ee8-servlets.mod index 1d7838b893a..dbcb84da6c9 100644 --- a/jetty-ee8/jetty-ee8-servlets/src/main/config/modules/ee8-servlets.mod +++ b/jetty-ee8/jetty-ee8-servlets/src/main/config/modules/ee8-servlets.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds Jetty utility servlets and filters available to a webapp. diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml index 46beee47a63..27ba8771132 100644 --- a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml +++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-webapp.xml b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-webapp.xml index 2bfa7239f9b..cd3cb99317f 100644 --- a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-webapp.xml +++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-webapp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml index 35684b93bd1..3ff80aeed14 100644 --- a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml +++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml @@ -187,7 +187,7 @@ - + diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod b/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod index a35334fe59c..b4a2f2fef2d 100644 --- a/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod +++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds support for servlet specification web applications to the server classpath. diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod index 5834191f5ec..2922b9a4d48 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Expose the Jetty WebSocket Client classes to deployed web applications. diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod index 066a0572ed7..ea9e00b9813 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Expose the Jetty WebSocket Client classes to deployed web applications. diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod index c865a5184d5..7239486bef4 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enable the Jetty WebSocket API support for deployed web applications. diff --git a/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod b/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod index 10ba819b431..85bed0d2fc3 100644 --- a/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod +++ b/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables Annotation scanning for deployed web applications. diff --git a/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod b/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod index b6478d46a78..43383d0f7ce 100644 --- a/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod +++ b/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables use of the apache implementation of JSP. diff --git a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/cdi-decorate.mod b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/cdi-decorate.mod index f222fa0fbaf..00eb26adcba 100644 --- a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/cdi-decorate.mod +++ b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/cdi-decorate.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Configures Jetty to use the "CdiDecoratingListener" as the default CDI mode. diff --git a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/cdi-spi.mod b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/cdi-spi.mod index c608e93e653..a82b2a98cb3 100644 --- a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/cdi-spi.mod +++ b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/cdi-spi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Configures Jetty to use the "CdiSpiDecorator" as the default CDI mode. diff --git a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/cdi.mod b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/cdi.mod index add3304b304..c070092d8be 100644 --- a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/cdi.mod +++ b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/cdi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Provides integration of CDI within webapp to Jetty container object lifecycles. diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/config/modules/ee9-demo-async-rest.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/config/modules/ee9-demo-async-rest.mod index be791dfde0d..7b3fd77221d 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/config/modules/ee9-demo-async-rest.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/config/modules/ee9-demo-async-rest.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo Async Rest webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 2cc317ae3cd..d6abf37f497 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/config/modules/ee9-demo-jaas.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/config/modules/ee9-demo-jaas.mod index b1a8ffb985c..20f7a11e720 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/config/modules/ee9-demo-jaas.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/config/modules/ee9-demo-jaas.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo EE9 JAAS webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 969ca660c77..c979828b30b 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html index ec37ce29158..5a6407aac34 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html @@ -9,9 +9,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -21,7 +21,7 @@

JAAS Demo

- This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. It uses a simple login module that stores its configuration in a properties file.

@@ -36,7 +36,7 @@
-
+
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html index 7486bcc4ca3..7bc289b9070 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html @@ -6,9 +6,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -28,7 +28,7 @@
-
+
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml index 6a7eaa3f667..ba842025ad2 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod index 5a95a92c3b5..43e90e8d890 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo Jetty Webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-rewrite.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-rewrite.mod index a6d53336cda..433ed68d12e 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-rewrite.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-rewrite.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demonstrate the rewrite module. diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 96407cdfe5f..976016cc6bc 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod index a96effe6aa0..5d5f3244d58 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo JNDI Resources Webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml index 519833d85e0..b8cc80a3fb9 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/plugin-context-header.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/plugin-context-header.xml index 33535054b0f..d93f6fc546e 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/plugin-context-header.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/plugin-context-header.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html index 7c3bdecfc59..d42918a27b5 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -20,7 +20,7 @@

Eclipse Jetty JNDI Demo Webapp

- This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

@@ -48,7 +48,7 @@

-
+
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml index d97c50ef8bf..de6fa8e5426 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp index d74286de635..abab28cf0d9 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp @@ -10,9 +10,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -22,7 +22,7 @@

Eclipse Jetty JSP Demo Webapp

- This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

JSP Examples on <%= DateTimeFormatter.ofPattern("d MMMM yyyy").format(LocalDate.now()) %>

@@ -39,7 +39,7 @@
-
+
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod index 750734ec525..4d4560395d4 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Download and install some Demo Mock Resources diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/config/modules/ee9-demo-proxy.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/config/modules/ee9-demo-proxy.mod index ca731bd10ac..519c5cfb5d6 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/config/modules/ee9-demo-proxy.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/config/modules/ee9-demo-proxy.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo Proxy Webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 03ad89b6d4a..3f52695fefe 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml index f0d4645b939..8d832bd8372 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml @@ -13,7 +13,7 @@ org.eclipse.jetty.ee9.proxy.ProxyServlet$Transparent proxyTo - https://www.eclipse.org/jetty/javadoc/jetty-10/index.html?overview-summary.html + https://eclipse.dev/jetty/javadoc/jetty-12/index.html?overview-summary.html hostHeader diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod index 44823380b26..502d3ba67b3 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Download and deploy the Test Spec webapp demo. diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/index.html index e2ba14dd1e4..ac23a15fa5b 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -80,7 +80,7 @@
-
+
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html index 356750e8686..addecf99227 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html @@ -10,9 +10,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -29,7 +29,7 @@
-
+
diff --git a/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod b/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod index a94abfe8851..90cfc70abcd 100644 --- a/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod +++ b/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the glassfish version of JSTL for all webapps. diff --git a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-default-auth-config-factory.mod b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-default-auth-config-factory.mod index e021b1c42fd..39762bc79f9 100644 --- a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-default-auth-config-factory.mod +++ b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-default-auth-config-factory.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Provides a DefaultAuthConfigFactory for jaspi diff --git a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-demo.mod b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-demo.mod index fd012f4fa2e..4ba345f9752 100644 --- a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-demo.mod +++ b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-demo.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables JASPI basic authentication the /test context path. diff --git a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod index 2be70ceb4ac..50f57661b01 100644 --- a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod +++ b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables JASPI authentication for deployed web applications. diff --git a/jetty-ee9/jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod b/jetty-ee9/jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod index e851479382c..1c2e7d6e653 100644 --- a/jetty-ee9/jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod +++ b/jetty-ee9/jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds the Jetty EE9 JNDI reference factories diff --git a/jetty-ee9/jetty-ee9-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee9/jspc/plugin/JspcMojo.java b/jetty-ee9/jetty-ee9-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee9/jspc/plugin/JspcMojo.java index 80a8238a598..b1ff4f31755 100644 --- a/jetty-ee9/jetty-ee9-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee9/jspc/plugin/JspcMojo.java +++ b/jetty-ee9/jetty-ee9-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee9/jspc/plugin/JspcMojo.java @@ -57,12 +57,11 @@ import org.eclipse.jetty.util.IO; *

* Note that the same java compiler will be used as for on-the-fly compiled * jsps, which will be the Eclipse java compiler. - *

- * See Usage - * Guide for instructions on using this plugin. *

+ *

* Runs jspc compiler to produce .java and .class files + *

+ * @see Usage Guide */ @Mojo(name = "jspc", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, threadSafe = true) diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod index 3773898f478..5e40e47dbbf 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables test setup diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod index 62335eec292..efc4adfa0c9 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables test setup diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod b/jetty-ee9/jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod index 9a236855c0a..b418b19c1d1 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables an un-assembled Maven webapp to run in a Jetty distribution. diff --git a/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod b/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod index 7a12a8c31c5..c69b9925205 100644 --- a/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod +++ b/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds OpenId Connect authentication to the server. diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml index 8cfd3fe6104..88fc1a79e59 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml index 303ada127b6..bbd9ab19ed5 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml index b395642ab68..a2e40523909 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml @@ -1,11 +1,11 @@ - + - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml index 22eacf1cf38..f07dfa10807 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-deploy.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-deploy.xml index c6d09cb401c..21d724916da 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-deploy.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml index 75a73574423..368b7b13f04 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml index 36b3a7d3c8a..0f8a95f6ba2 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml index 030a2e46832..2f192b9ad76 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml index 82f0bb0841f..55833c5cdd6 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml index e21afb24057..7ed60324940 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml index 1b1f7b8dbb1..250f55485ff 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml index d5230f18f43..c5a60d87957 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml index a9117044c8e..03817aee22a 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2-jdk9.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2-jdk9.xml index ad51713fd9c..fe6ec6306b2 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2-jdk9.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2-jdk9.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml index 2bf9d1051b1..750062e2bfd 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml index dfadf89bb92..4ea09074388 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml index b25525dec5c..e76e7cfda34 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-testrealm.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-testrealm.xml index 2ce036e69ec..b7af3243b8e 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-testrealm.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-testrealm.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-with-custom-class.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-with-custom-class.xml index d6b3407b745..2cd7293ce47 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-with-custom-class.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-with-custom-class.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty.xml index dde7ec29432..3042e2e31d5 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty.xml @@ -1,12 +1,12 @@ - + - + diff --git a/jetty-ee9/jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml b/jetty-ee9/jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml index 7dc15177e3c..746d13edf87 100644 --- a/jetty-ee9/jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml +++ b/jetty-ee9/jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod b/jetty-ee9/jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod index 8243766f95b..9e8dd912cae 100644 --- a/jetty-ee9/jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod +++ b/jetty-ee9/jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the Jetty Proxy service. diff --git a/jetty-ee9/jetty-ee9-quickstart/src/main/config/modules/ee9-quickstart.mod b/jetty-ee9/jetty-ee9-quickstart/src/main/config/modules/ee9-quickstart.mod index 36995723292..76931992e2d 100644 --- a/jetty-ee9/jetty-ee9-quickstart/src/main/config/modules/ee9-quickstart.mod +++ b/jetty-ee9/jetty-ee9-quickstart/src/main/config/modules/ee9-quickstart.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the Jetty Quickstart module for rapid deployment of preconfigured web applications. diff --git a/jetty-ee9/jetty-ee9-runner/src/main/java/org/eclipse/jetty/ee9/runner/Runner.java b/jetty-ee9/jetty-ee9-runner/src/main/java/org/eclipse/jetty/ee9/runner/Runner.java index 99bf286cb1d..9603030c7ea 100644 --- a/jetty-ee9/jetty-ee9-runner/src/main/java/org/eclipse/jetty/ee9/runner/Runner.java +++ b/jetty-ee9/jetty-ee9-runner/src/main/java/org/eclipse/jetty/ee9/runner/Runner.java @@ -556,7 +556,7 @@ public class Runner { System.err.println("WARNING: jetty-runner is deprecated."); System.err.println(" See Jetty Documentation for startup options"); - System.err.println(" https://www.eclipse.org/jetty/documentation/"); + System.err.println(" https://eclipse.dev/jetty/documentation/"); Runner runner = new Runner(); diff --git a/jetty-ee9/jetty-ee9-security/src/main/config/modules/ee9-security.mod b/jetty-ee9/jetty-ee9-security/src/main/config/modules/ee9-security.mod index ee58b7d32b0..a16d6791250 100644 --- a/jetty-ee9/jetty-ee9-security/src/main/config/modules/ee9-security.mod +++ b/jetty-ee9/jetty-ee9-security/src/main/config/modules/ee9-security.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds servlet standard security handling to the classpath. diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod b/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod index 424fc24ca95..4066aee5d99 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod +++ b/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables standard Servlet handling. diff --git a/jetty-ee9/jetty-ee9-servlets/src/main/config/modules/ee9-servlets.mod b/jetty-ee9/jetty-ee9-servlets/src/main/config/modules/ee9-servlets.mod index 3eab5637c7f..8da861623a8 100644 --- a/jetty-ee9/jetty-ee9-servlets/src/main/config/modules/ee9-servlets.mod +++ b/jetty-ee9/jetty-ee9-servlets/src/main/config/modules/ee9-servlets.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds Jetty EE9 utility servlets and filters available to a webapp. diff --git a/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml b/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml index 6a0d57307ac..e15e762f30c 100644 --- a/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml +++ b/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml @@ -187,7 +187,7 @@ - + diff --git a/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod b/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod index 9813872aa0f..37e3a46627f 100644 --- a/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod +++ b/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Adds support for servlet specification web applications to the server classpath. diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod index fce753cdf91..4a46174b3aa 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Expose the Jetty WebSocket Client classes to deployed web applications. diff --git a/jetty-home/src/main/resources/NOTICE.txt b/jetty-home/src/main/resources/NOTICE.txt index 361c3a0915b..ee70c29a02f 100644 --- a/jetty-home/src/main/resources/NOTICE.txt +++ b/jetty-home/src/main/resources/NOTICE.txt @@ -2,7 +2,7 @@ Notices for Eclipse Jetty ========================= This content is produced and maintained by the Eclipse Jetty project. -Project home: https://www.eclipse.org/jetty/ +Project home: https://eclipse.dev/jetty/ Trademarks ---------- diff --git a/jetty-home/src/main/resources/README.adoc b/jetty-home/src/main/resources/README.adoc index 47f8b29b0bc..1e91e952ecb 100644 --- a/jetty-home/src/main/resources/README.adoc +++ b/jetty-home/src/main/resources/README.adoc @@ -1,6 +1,6 @@ === ECLIPSE JETTY -The link:https://www.eclipse.org/jetty/[Eclipse Jetty] Project provides a: +The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a: * Java HTTP (HTTP/1.1, HTTP/2 and HTTP/3) Server and Client * Jakarta EE Servlet Container @@ -8,7 +8,7 @@ The link:https://www.eclipse.org/jetty/[Eclipse Jetty] Project provides a: Jetty is available under an open source link:LICENSE.txt[license], and the full source code is available at link:https://github.com/eclipse/jetty.project[GitHub]. -The Jetty documentation is available at link:https://www.eclipse.org/jetty/documentation[]. +The Jetty documentation is available at link:https://eclipse.dev/jetty/documentation/[]. // tag::quick[] ==== Quick Setup @@ -48,7 +48,7 @@ Point your browser at `+http://localhost:8080+` to see the demo web applications The Jetty server can be stopped with `ctrl+c` in the terminal window. // end::quick[] -For more information about how to start Jetty, you can read the link:https://www.eclipse.org/jetty/documentation[documentation], or run this command: +For more information about how to start Jetty, you can read the link:https://eclipse.dev/jetty/documentation/[documentation], or run this command: ---- $ java -jar $JETTY_HOME/start.jar --help diff --git a/jetty-home/src/main/resources/modules/core-demos.mod b/jetty-home/src/main/resources/modules/core-demos.mod index 87d6666d9ce..9928322ca0b 100644 --- a/jetty-home/src/main/resources/modules/core-demos.mod +++ b/jetty-home/src/main/resources/modules/core-demos.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] A meta module to enable all core demo modules. diff --git a/jetty-home/src/main/resources/modules/demo-jaas.mod b/jetty-home/src/main/resources/modules/demo-jaas.mod index 133d17cba30..ec8c8351b84 100644 --- a/jetty-home/src/main/resources/modules/demo-jaas.mod +++ b/jetty-home/src/main/resources/modules/demo-jaas.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Setup for jaas demos. diff --git a/jetty-home/src/main/resources/modules/demo-moved-context.mod b/jetty-home/src/main/resources/modules/demo-moved-context.mod index a7c002c3d33..e695fa659a9 100644 --- a/jetty-home/src/main/resources/modules/demo-moved-context.mod +++ b/jetty-home/src/main/resources/modules/demo-moved-context.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demonstrate a Moved Context Handler setup in XML diff --git a/jetty-home/src/main/resources/modules/demo-realm.mod b/jetty-home/src/main/resources/modules/demo-realm.mod index fa09d59693d..808d3fadfeb 100644 --- a/jetty-home/src/main/resources/modules/demo-realm.mod +++ b/jetty-home/src/main/resources/modules/demo-realm.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Configure a demo authentication realm. diff --git a/jetty-home/src/main/resources/modules/demo-root.mod b/jetty-home/src/main/resources/modules/demo-root.mod index de2803b50ba..c777c4f3060 100644 --- a/jetty-home/src/main/resources/modules/demo-root.mod +++ b/jetty-home/src/main/resources/modules/demo-root.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Demo root context. diff --git a/jetty-home/src/main/resources/modules/demo.d/moved/index.html b/jetty-home/src/main/resources/modules/demo.d/moved/index.html index ca4106a6ed3..1e47065f797 100644 --- a/jetty-home/src/main/resources/modules/demo.d/moved/index.html +++ b/jetty-home/src/main/resources/modules/demo.d/moved/index.html @@ -8,9 +8,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -22,7 +22,7 @@
-
+
diff --git a/jetty-home/src/main/resources/modules/demo.d/root/index.html b/jetty-home/src/main/resources/modules/demo.d/root/index.html index f9f7719494c..6d507c8dd12 100644 --- a/jetty-home/src/main/resources/modules/demo.d/root/index.html +++ b/jetty-home/src/main/resources/modules/demo.d/root/index.html @@ -23,7 +23,7 @@

The project is 100% Open Source and hosted by the - Eclipse Foundation at https://www.eclipse.org/jetty/. + Eclipse Foundation at https://eclipse.dev/jetty/.

@@ -74,10 +74,10 @@

Information

    -
  • Jetty Homepage
    • -
  • Jetty Documentation Hub
    • +
  • Jetty Homepage
    • +
  • Jetty Documentation Hub
  • Javadoc (via transparent proxy)
    • -
  • Jetty Powered
    • +
  • Jetty Powered
  • Optional content found only in
    jetty-home-<ver>-with-docs.zip
    • Jetty Documentation
      • @@ -89,7 +89,7 @@

      Getting Help

        -
      • Mailing lists @ eclipse
        • +
      • Mailing lists @ eclipse
      • Source @ github
      • Developer Advice
      • Custom Development
        • diff --git a/jetty-home/src/main/resources/modules/demos.mod b/jetty-home/src/main/resources/modules/demos.mod index 78b819457fc..226c4801597 100644 --- a/jetty-home/src/main/resources/modules/demos.mod +++ b/jetty-home/src/main/resources/modules/demos.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] A meta module to enable all demo modules. diff --git a/jetty-home/src/main/resources/modules/ee10-demos.mod b/jetty-home/src/main/resources/modules/ee10-demos.mod index 3ccc1af9822..7b977365d95 100644 --- a/jetty-home/src/main/resources/modules/ee10-demos.mod +++ b/jetty-home/src/main/resources/modules/ee10-demos.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] A meta module to enable all EE10 demo modules. diff --git a/jetty-home/src/main/resources/modules/ee10-jsp.mod b/jetty-home/src/main/resources/modules/ee10-jsp.mod index 2b1aab64fe3..5f6bcb2050b 100644 --- a/jetty-home/src/main/resources/modules/ee10-jsp.mod +++ b/jetty-home/src/main/resources/modules/ee10-jsp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables JSP for all web applications deployed on the server. diff --git a/jetty-home/src/main/resources/modules/ee10-jstl.mod b/jetty-home/src/main/resources/modules/ee10-jstl.mod index ffefed1fd46..4aa55bb4969 100644 --- a/jetty-home/src/main/resources/modules/ee10-jstl.mod +++ b/jetty-home/src/main/resources/modules/ee10-jstl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables JSTL for all web applications deployed on the server. diff --git a/jetty-home/src/main/resources/modules/ee8-demos.mod b/jetty-home/src/main/resources/modules/ee8-demos.mod index 360943a3793..71c00121aa8 100644 --- a/jetty-home/src/main/resources/modules/ee8-demos.mod +++ b/jetty-home/src/main/resources/modules/ee8-demos.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] A meta module to enable all EE8 demo modules. diff --git a/jetty-home/src/main/resources/modules/ee8-jsp.mod b/jetty-home/src/main/resources/modules/ee8-jsp.mod index 0386ff02ee1..f98d636dd34 100644 --- a/jetty-home/src/main/resources/modules/ee8-jsp.mod +++ b/jetty-home/src/main/resources/modules/ee8-jsp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables JSP for all web applications deployed on the server. diff --git a/jetty-home/src/main/resources/modules/ee8-jstl.mod b/jetty-home/src/main/resources/modules/ee8-jstl.mod index 52f2d1896f6..a5458d41bd3 100644 --- a/jetty-home/src/main/resources/modules/ee8-jstl.mod +++ b/jetty-home/src/main/resources/modules/ee8-jstl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables JSTL for all web applications deployed on the server. diff --git a/jetty-home/src/main/resources/modules/ee9-demos.mod b/jetty-home/src/main/resources/modules/ee9-demos.mod index cb47c1225f1..06c023136c8 100644 --- a/jetty-home/src/main/resources/modules/ee9-demos.mod +++ b/jetty-home/src/main/resources/modules/ee9-demos.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] A meta module to enable all EE9 demo modules. diff --git a/jetty-home/src/main/resources/modules/ee9-jsp.mod b/jetty-home/src/main/resources/modules/ee9-jsp.mod index cb49f01e8c6..2dbb8d8cac9 100644 --- a/jetty-home/src/main/resources/modules/ee9-jsp.mod +++ b/jetty-home/src/main/resources/modules/ee9-jsp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables JSP for all web applications deployed on the server. diff --git a/jetty-home/src/main/resources/modules/ee9-jstl.mod b/jetty-home/src/main/resources/modules/ee9-jstl.mod index 37b9edbf99f..abc388f6b61 100644 --- a/jetty-home/src/main/resources/modules/ee9-jstl.mod +++ b/jetty-home/src/main/resources/modules/ee9-jstl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables JSTL for all web applications deployed on the server. diff --git a/jetty-home/src/main/resources/modules/logging-jcl-capture.mod b/jetty-home/src/main/resources/modules/logging-jcl-capture.mod index 9b77b4d5c66..5ef75a8d856 100644 --- a/jetty-home/src/main/resources/modules/logging-jcl-capture.mod +++ b/jetty-home/src/main/resources/modules/logging-jcl-capture.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Captures jakarta-commons-logging events and bridges them to SLF4J. diff --git a/jetty-home/src/main/resources/modules/logging-jetty.mod b/jetty-home/src/main/resources/modules/logging-jetty.mod index b0a623c4834..e6aa3e3a631 100644 --- a/jetty-home/src/main/resources/modules/logging-jetty.mod +++ b/jetty-home/src/main/resources/modules/logging-jetty.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Base configuration for the jetty logging mechanism. diff --git a/jetty-home/src/main/resources/modules/logging-jul-capture.mod b/jetty-home/src/main/resources/modules/logging-jul-capture.mod index 3243dc0923b..efd6103d94f 100644 --- a/jetty-home/src/main/resources/modules/logging-jul-capture.mod +++ b/jetty-home/src/main/resources/modules/logging-jul-capture.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Captures java.util.logging events and bridges them to slf4j. diff --git a/jetty-home/src/main/resources/modules/logging-jul.mod b/jetty-home/src/main/resources/modules/logging-jul.mod index 2097219c226..87e950b25ce 100644 --- a/jetty-home/src/main/resources/modules/logging-jul.mod +++ b/jetty-home/src/main/resources/modules/logging-jul.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Configures jetty logging to use Java Util Logging (jul). diff --git a/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod b/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod index 182c365984c..9e1ca062248 100644 --- a/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod +++ b/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Captures Apache log4j events and bridges them to SLF4J. diff --git a/jetty-home/src/main/resources/modules/logging-log4j1.mod b/jetty-home/src/main/resources/modules/logging-log4j1.mod index 848b66b3fb4..653e33eb93c 100644 --- a/jetty-home/src/main/resources/modules/logging-log4j1.mod +++ b/jetty-home/src/main/resources/modules/logging-log4j1.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Configures Jetty logging to use Log4j. diff --git a/jetty-home/src/main/resources/modules/logging-log4j2.mod b/jetty-home/src/main/resources/modules/logging-log4j2.mod index 505095f5a66..2fed6c18a4d 100644 --- a/jetty-home/src/main/resources/modules/logging-log4j2.mod +++ b/jetty-home/src/main/resources/modules/logging-log4j2.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Configures Jetty logging to use log4j version 2. diff --git a/jetty-home/src/main/resources/modules/logging-logback.mod b/jetty-home/src/main/resources/modules/logging-logback.mod index ffba31c4c0b..40538f43ac0 100644 --- a/jetty-home/src/main/resources/modules/logging-logback.mod +++ b/jetty-home/src/main/resources/modules/logging-logback.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Configures Jetty logging to use Logback Logging. diff --git a/jetty-home/src/main/resources/modules/logging-noop.mod b/jetty-home/src/main/resources/modules/logging-noop.mod index 6f146768a94..ef1c7ff6f2c 100644 --- a/jetty-home/src/main/resources/modules/logging-noop.mod +++ b/jetty-home/src/main/resources/modules/logging-noop.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Configures Jetty logging to use SLF4J No-Op Implementation. diff --git a/jetty-home/src/main/resources/modules/logging/slf4j.mod b/jetty-home/src/main/resources/modules/logging/slf4j.mod index 861dd9e3b13..4ebb74a2a87 100644 --- a/jetty-home/src/main/resources/modules/logging/slf4j.mod +++ b/jetty-home/src/main/resources/modules/logging/slf4j.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Configures logging to use SLF4J. diff --git a/jetty-home/src/main/resources/modules/setuid.mod b/jetty-home/src/main/resources/modules/setuid.mod index 4278f82f4eb..977cbb81869 100644 --- a/jetty-home/src/main/resources/modules/setuid.mod +++ b/jetty-home/src/main/resources/modules/setuid.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables the UNIX setUID configuration. diff --git a/jetty-home/src/main/resources/modules/stop.mod b/jetty-home/src/main/resources/modules/stop.mod index b9407b6347c..6b18509cd18 100644 --- a/jetty-home/src/main/resources/modules/stop.mod +++ b/jetty-home/src/main/resources/modules/stop.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] This module causes Jetty to stop immediately after starting. diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml index 070c76aa25a..291b56b5ad9 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod index 3106d070039..e14b772ff0d 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables GCloud Datastore API and implementation. diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod index ff7e68aee28..2dc51d64d74 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Controls GCloud API classpath. diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod index 6e76f7df628..a975e1083ce 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables GCloudDatastore session management. diff --git a/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml b/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml index 07b47ee84b3..a53b2c52ac5 100644 --- a/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml +++ b/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml b/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml index 377706a27c5..8a931ec2611 100644 --- a/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml +++ b/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod b/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod index 3e65e85df24..ec33e8c390e 100644 --- a/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod +++ b/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables session data store in an embedded Hazelcast Map. diff --git a/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod b/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod index 7842d1a1dbb..6223f681883 100644 --- a/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod +++ b/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables session data store in a remote Hazelcast Map. diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml index 0092a534815..d60a140879b 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml index 52ca7ddd2ab..5828fc2fa1a 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml index ee0b60b7ab9..c84714a4867 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml index 6c2c7565c1a..d9b9f50a6db 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml index f9525cddd30..aa0fb75f01f 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml index 4a22c9b6765..97785fb05ff 100644 --- a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml +++ b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod index b55223b4c4d..8f12f871e2c 100644 --- a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod +++ b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Memcache cache for SessionData. diff --git a/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml b/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml index 28e5a7da378..3dde37177e4 100644 --- a/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml +++ b/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml b/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml index 717f9949cf1..1c0664c497a 100644 --- a/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml +++ b/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod b/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod index 89150dd08b0..1f74348c7e0 100644 --- a/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod +++ b/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Enables NoSql session management with a MongoDB driver. diff --git a/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod b/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod index 4ba49715eaf..3467a0f55cb 100644 --- a/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod +++ b/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] Server/port connections for Mongo session storage. diff --git a/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod b/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod index 220d33c4a8b..2e8732c8401 100644 --- a/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod +++ b/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ [description] MongoURI connections for Mongo session storage diff --git a/pom.xml b/pom.xml index 58fd854ea7c..8b824332206 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ Jetty :: Project The Eclipse Jetty Project pom - https://eclipse.org/jetty + https://eclipse.dev/jetty 1995 @@ -16,7 +16,8 @@ 17 17 17 - https://www.eclipse.org/jetty/ + false + https://eclipse.dev/jetty/ benchmarks org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)" UTF-8 @@ -205,7 +206,7 @@ Eclipse Public License - Version 2.0 - https://www.eclipse.org/legal/epl-2.0 + https://www.eclipse.org/legal/epl-2.0/ Apache Software License - Version 2.0 @@ -862,10 +863,10 @@ asciidoctor-diagram - https://www.eclipse.org/jetty/javadoc/jetty-11 + https://eclipse.dev/jetty/javadoc/jetty-12 ${basedir}/.. - https://github.com/eclipse/jetty.project/tree/jetty-9.4.x - https://github.com/eclipse/jetty.project/tree/jetty-10.0.x-doc-refactor/jetty-documentation/src/main/asciidoc + https://github.com/eclipse/jetty.project/tree/jetty-12.0.x + https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/documentation/jetty-documentation/src/main/asciidoc http://central.maven.org/maven2 ${project.version} ${maven.build.timestamp} @@ -2302,27 +2303,18 @@ Jetty Developer Mailing List - https://dev.eclipse.org/mhonarc/lists/jetty-dev/maillist.html - https://dev.eclipse.org/mailman/listinfo/jetty-dev - https://dev.eclipse.org/mailman/listinfo/jetty-dev - - - Jetty Commit Mailing List - https://dev.eclipse.org/mhonarc/lists/jetty-commit/maillist.html - https://dev.eclipse.org/mailman/listinfo/jetty-commit - https://dev.eclipse.org/mailman/listinfo/jetty-commit + https://www.eclipse.org/lists/jetty-dev/ + https://accounts.eclipse.org/mailing-list/jetty-dev Jetty Users Mailing List - https://dev.eclipse.org/mhonarc/lists/jetty-users/maillist.html - https://dev.eclipse.org/mailman/listinfo/jetty-users - https://dev.eclipse.org/mailman/listinfo/jetty-users + https://www.eclipse.org/lists/jetty-users/ + https://accounts.eclipse.org/mailing-list/jetty-users Jetty Announce Mailing List - https://dev.eclipse.org/mhonarc/lists/jetty-announce/maillist.html - https://dev.eclipse.org/mailman/listinfo/jetty-announce - https://dev.eclipse.org/mailman/listinfo/jetty-announce + https://www.eclipse.org/lists/jetty-announce/ + https://accounts.eclipse.org/mailing-list/jetty-announce @@ -2408,10 +2400,6 @@ Jetty Snapshot Repository https://oss.sonatype.org/content/repositories/jetty-snapshots/ - - jetty.eclipse.website - scp://build.eclipse.org:/home/data/httpd/download.eclipse.org/jetty/${project.version}/ - diff --git a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index 582609f26d9..ff440a718b1 100644 --- a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -719,7 +719,7 @@ public class DistributionTests extends AbstractJettyHomeTest String message = "test-log-line"; String xml = "" + "" + - "" + + "" + "" + " " + " " + loggerName + "" + @@ -777,7 +777,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path sslPatchXML = jettyBaseEtc.resolve("ssl-patch.xml"); String xml = """ - + @@ -1229,7 +1229,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path fcgiConnectorXML = jettyBaseEtc.resolve("fcgi-connector.xml"); Files.writeString(fcgiConnectorXML, """ - + @@ -1259,7 +1259,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path phpXML = jettyBase.resolve("webapps").resolve("php.xml"); Files.writeString(phpXML, """ - + /php @@ -1281,7 +1281,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path proxyXML = jettyBase.resolve("webapps").resolve("proxy.xml"); Files.writeString(proxyXML, """ - + /proxy @@ -1344,7 +1344,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path fcgiConnectorXML = jettyBaseEtc.resolve("fcgi-connector.xml"); Files.writeString(fcgiConnectorXML, """ - + @@ -1374,7 +1374,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path phpXML = jettyBase.resolve("webapps").resolve("php.xml"); Files.writeString(phpXML, """ - + /php @@ -1396,7 +1396,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path proxyXML = jettyBase.resolve("webapps").resolve("proxy.xml"); Files.writeString(proxyXML, """ - + /proxy