diff --git a/.github/ISSUE_TEMPLATE/enhancement-template.md b/.github/ISSUE_TEMPLATE/enhancement-template.md index 87f5652cac6..f8232ee6327 100644 --- a/.github/ISSUE_TEMPLATE/enhancement-template.md +++ b/.github/ISSUE_TEMPLATE/enhancement-template.md @@ -8,7 +8,7 @@ labels: Enhancement --- **Jetty version(s)** -_[Jetty 9.x is now at End of Community Support](https://github.com/eclipse/jetty.project/issues/7958)_ +_[Jetty 9.x is now at End of Community Support](https://github.com/jetty/jetty.project/issues/7958)_ **Enhancement Description** diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md index 98e009121fc..bded56c3883 100644 --- a/.github/ISSUE_TEMPLATE/issue-template.md +++ b/.github/ISSUE_TEMPLATE/issue-template.md @@ -8,7 +8,7 @@ labels: Bug --- **Jetty version(s)** - + **Jetty Environment** diff --git a/.github/ISSUE_TEMPLATE/release-template.md b/.github/ISSUE_TEMPLATE/release-template.md index 6b95b988a65..b69ae452124 100644 --- a/.github/ISSUE_TEMPLATE/release-template.md +++ b/.github/ISSUE_TEMPLATE/release-template.md @@ -16,18 +16,18 @@ This release process will produce releases: - [x] Create the release(s) issue. - [ ] Update the target Jetty version(s) in the issue. - [ ] Update the target release date in the issue. -- [ ] Link this issue to the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects). +- [ ] Link this issue to the target [GitHub Project(s)](https://github.com/jetty/jetty.project/projects). - [ ] Assign this issue to a "release manager". -- [ ] Review [draft security advisories](https://github.com/eclipse/jetty.project/security/advisories). Ensure that issues are created and assigned to GitHub Projects to capture any advisories that will be announced. -- [ ] Update [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects) +- [ ] Review [draft security advisories](https://github.com/jetty/jetty.project/security/advisories). Ensure that issues are created and assigned to GitHub Projects to capture any advisories that will be announced. +- [ ] Update [GitHub Project(s)](https://github.com/jetty/jetty.project/projects) + [ ] Create new project for the next releases (not this release). + [ ] Ensure new project is public (not private) - + [ ] Freeze the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects) by editing their names to "Jetty X.Y.Z FROZEN" - + [ ] Review the issues/PRs assigned to the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects). Any tasks that are not-yet-started are moved to next releases. -- [ ] Review dependabot status. [Manually](https://github.com/eclipse/jetty.project/network/updates) run dependabot if needed and review resulting PRs for inclusion. + + [ ] Freeze the target [GitHub Project(s)](https://github.com/jetty/jetty.project/projects) by editing their names to "Jetty X.Y.Z FROZEN" + + [ ] Review the issues/PRs assigned to the target [GitHub Project(s)](https://github.com/jetty/jetty.project/projects). Any tasks that are not-yet-started are moved to next releases. +- [ ] Review dependabot status. [Manually](https://github.com/jetty/jetty.project/network/updates) run dependabot if needed and review resulting PRs for inclusion. Such updates should only be included in the week before a release if there is a compelling security or stability reason to do so. - [ ] Wait 24 hours from last change to the issues/PRs included in FROZEN GitHub Project(s). -- [ ] Verify target [project(s)](https://github.com/eclipse/jetty.project/projects) are complete. +- [ ] Verify target [project(s)](https://github.com/jetty/jetty.project/projects) are complete. - [ ] Verify that branch `jetty-10.0.x` is merged to branch `jetty-11.0.x`. - [ ] Assign issue to "build manager", who will stage the releases. + [ ] Create and use branches `release/` to perform version specific release work from. @@ -35,14 +35,14 @@ This release process will produce releases: + [ ] Stage 9.4 release with Java 11. + [ ] Stage 10 release with Java 21. + [ ] Stage 11 release with Java 21. - + [ ] Push release branches `release/` to to https://github.com/eclipse/jetty.project - + [ ] Push release tags `jetty-` to https://github.com/eclipse/jetty.project - + [ ] Edit a draft release (for each Jetty release) in GitHub (https://github.com/eclipse/jetty.project/releases). Content is generated with the "changelog tool". + + [ ] Push release branches `release/` to to https://github.com/jetty/jetty.project + + [ ] Push release tags `jetty-` to https://github.com/jetty/jetty.project + + [ ] Edit a draft release (for each Jetty release) in GitHub (https://github.com/jetty/jetty.project/releases). Content is generated with the "changelog tool". - [ ] Assign issue to "test manager", who will oversee the testing of the staged releases. + [ ] Test [CometD](https://github.com/cometd/cometd). + [ ] Test [Reactive HttpClient](https://github.com/jetty-project/jetty-reactive-httpclient). + [ ] Test [Load Generator](https://github.com/jetty-project/jetty-load-generator). - + [ ] Test [Jetty Docker images](https://github.com/eclipse/jetty.docker). + + [ ] Test [Jetty Docker images](https://github.com/jetty/jetty.docker). + [ ] Test other [Jetty OSS integrations](https://jenkins.webtide.net/job/external_oss). + [ ] Check [TCK CI](https://jenkins.webtide.net/job/tck). + [ ] Test sponsored integrations. @@ -53,12 +53,12 @@ This release process will produce releases: - [ ] Promote staged 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 website ( follow instructions in [jetty-website](https://github.com/eclipse/jetty-website/blob/master/README.md) ). - + [ ] Update (or check) [Download](https://eclipse.dev/jetty/download.php) page is updated. +- [ ] Update Jetty versions on the website (follow instructions in [jetty.website](https://github.com/jetty/jetty.website/blob/master/README.md) ). + + [ ] Update (or check) [Download](https://jetty.org/download.html) page is updated. + [ ] Update (or check) documentation page(s) are updated. - [ ] Publish GitHub Releases. - [ ] Prepare release announcement for mailing lists. -- [ ] Publish any [security advisories](https://github.com/eclipse/jetty.project/security/advisories). +- [ ] Publish any [security advisories](https://github.com/jetty/jetty.project/security/advisories). + [ ] Edit `VERSION.txt` to include any actual CVE number next to correspondent issue. + [ ] Edit any issues for CVEs in github with their CVE number - [ ] Notify downstream maintainers. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 38f9fb35645..afd1bc0e44a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,7 +16,7 @@ Information regarding source code management, builds, coding standards, and more - [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 +The canonical Jetty git repository is located at [GitHub.](https://github.com/jetty/jetty.project) Providing you have completed the contributors agreement mentioned below we will endeavor to pull your commit into Jetty proper. Eclipse Contributor Agreement @@ -43,13 +43,13 @@ Search for bugs ---------------- This project uses GitHub Issues to track ongoing development and issues. -- [https://github.com/eclipse/jetty.project/issues](https://github.com/eclipse/jetty.project/issues) +- [https://github.com/jetty/jetty.project/issues](https://github.com/jetty/jetty.project/issues) Create a new bug ----------------- Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome! -- [https://github.com/eclipse/jetty.project/issues](https://github.com/eclipse/jetty.project/issues) +- [https://github.com/jetty/jetty.project/issues](https://github.com/jetty/jetty.project/issues) Reporting Security Issues ----------------- diff --git a/Jenkinsfile-autobahn b/Jenkinsfile-autobahn index 3366e2d2ec0..620f9c45f45 100644 --- a/Jenkinsfile-autobahn +++ b/Jenkinsfile-autobahn @@ -18,7 +18,7 @@ pipeline { stages { stage("Checkout Jetty Branch") { steps { - git url: 'https://github.com/eclipse/jetty.project/', branch: '${JETTY_BRANCH}' + git url: 'https://github.com/jetty/jetty.project/', branch: '${JETTY_BRANCH}' } } stage( "Build / Test - JDK11" ) { diff --git a/SECURITY.md b/SECURITY.md index b94bf5f07ce..7d4940ff291 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,7 +2,7 @@ ## Supported Versions -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. +All [stable versions](https://jetty.org/download.html) of jetty are actively supported for security issues. [Deprecated versions](https://jetty.org/download.html) may be supported for serious security issues or on a commercial support basis. ## Reporting a Vulnerability diff --git a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml index eea99b8702b..cff4e8d9d2f 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 76a7b85824b..73bf6c35cff 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jaas-webapp/src/main/webapp/index.html b/demos/demo-jaas-webapp/src/main/webapp/index.html index c87f04cfce1..dbaafe5a45e 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/index.html +++ b/demos/demo-jaas-webapp/src/main/webapp/index.html @@ -9,7 +9,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support @@ -45,7 +45,7 @@
-
+
diff --git a/demos/demo-jaas-webapp/src/main/webapp/login.html b/demos/demo-jaas-webapp/src/main/webapp/login.html index 3e82c524c08..a0140e9d205 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/login.html +++ b/demos/demo-jaas-webapp/src/main/webapp/login.html @@ -6,7 +6,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support @@ -28,7 +28,7 @@
-
+
diff --git a/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml b/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml index b5b3234bf57..9ff1cfa4211 100644 --- a/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml +++ b/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml index cedd98cd877..d370e98b478 100644 --- a/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml +++ b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 28127c882b6..48676b52a4e 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml b/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml index 3295cd62306..d03931f44ae 100644 --- a/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml +++ b/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml b/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml index 27829769c0e..adacbdb0120 100644 --- a/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml +++ b/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml index 191d6371497..f5bea072e97 100644 --- a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 4da3d62237c..ee6c6ae42cf 100644 --- a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jndi-webapp/src/main/webapp/index.html b/demos/demo-jndi-webapp/src/main/webapp/index.html index 77d4dfed398..c24f9e853e2 100644 --- a/demos/demo-jndi-webapp/src/main/webapp/index.html +++ b/demos/demo-jndi-webapp/src/main/webapp/index.html @@ -8,7 +8,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support @@ -48,7 +48,7 @@
-
+
diff --git a/demos/demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml index bd90a5e1303..8171068e94f 100644 --- a/demos/demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jsp-webapp/src/main/webapp/index.jsp b/demos/demo-jsp-webapp/src/main/webapp/index.jsp index f9cd990602a..709a38f50f1 100644 --- a/demos/demo-jsp-webapp/src/main/webapp/index.jsp +++ b/demos/demo-jsp-webapp/src/main/webapp/index.jsp @@ -10,7 +10,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support @@ -39,7 +39,7 @@
-
+
diff --git a/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 169c0f903ad..70fbe6ae959 100644 --- a/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-spec/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml b/demos/demo-spec/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml index 76779a891d7..1f4eccfc8ac 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml +++ b/demos/demo-spec/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml @@ -1,5 +1,5 @@ - + /test-spec diff --git a/demos/demo-spec/demo-spec-webapp/src/main/templates/annotations-context-header.xml b/demos/demo-spec/demo-spec-webapp/src/main/templates/annotations-context-header.xml index e5fb833ce02..af37e492619 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/templates/annotations-context-header.xml +++ b/demos/demo-spec/demo-spec-webapp/src/main/templates/annotations-context-header.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-spec/demo-spec-webapp/src/main/templates/plugin-context-header.xml b/demos/demo-spec/demo-spec-webapp/src/main/templates/plugin-context-header.xml index de0c0c9f69c..5696875ec01 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/templates/plugin-context-header.xml +++ b/demos/demo-spec/demo-spec-webapp/src/main/templates/plugin-context-header.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml index c3b96ec098b..34628988688 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 4893c6fa3de..89ddb70cb61 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html index ffa24a8976a..90e3e06b2fe 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html +++ b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html @@ -8,7 +8,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support @@ -80,7 +80,7 @@
-
+
diff --git a/demos/demo-spec/demo-spec-webapp/src/test/jetty-plugin-env.xml b/demos/demo-spec/demo-spec-webapp/src/test/jetty-plugin-env.xml index f3724c601b4..e916fac003e 100644 --- a/demos/demo-spec/demo-spec-webapp/src/test/jetty-plugin-env.xml +++ b/demos/demo-spec/demo-spec-webapp/src/test/jetty-plugin-env.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-template/src/main/resources/index.html b/demos/demo-template/src/main/resources/index.html index 7ebe375fcd6..0b5debc6fc6 100644 --- a/demos/demo-template/src/main/resources/index.html +++ b/demos/demo-template/src/main/resources/index.html @@ -10,7 +10,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support @@ -29,7 +29,7 @@
-
+
diff --git a/demos/embedded/src/main/resources/exampleserver.xml b/demos/embedded/src/main/resources/exampleserver.xml index c7258dddb20..2dfc1f4e0d9 100644 --- a/demos/embedded/src/main/resources/exampleserver.xml +++ b/demos/embedded/src/main/resources/exampleserver.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/embedded/src/main/resources/fileserver.xml b/demos/embedded/src/main/resources/fileserver.xml index 6f67e8d4cdc..4340d18bd03 100644 --- a/demos/embedded/src/main/resources/fileserver.xml +++ b/demos/embedded/src/main/resources/fileserver.xml @@ -1,5 +1,5 @@ - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/ant/jetty-ant.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/ant/jetty-ant.adoc index 9b30e9f6a30..c82c31c1a6a 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/ant/jetty-ant.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/ant/jetty-ant.adoc @@ -32,7 +32,7 @@ Its purpose is to provide almost the same functionality as the Jetty plugin for To set up your project for Ant to run Jetty, you need a Jetty distribution and the jetty-ant Jar: -1. https://eclipse.dev/jetty/download.php[Download] a Jetty distribution and unpack it in the local filesystem. +1. https://jetty.org/download.html[Download] a Jetty distribution and unpack it in the local filesystem. 2. https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-ant/[Get] the jetty-ant Jar. 3. Make a directory in your project called `jetty-lib/`. 4. Copy all of the Jars in your Jetty distribution's `lib` directory, and all its subdirectories, into your new `jetty-lib` dir. 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 bddb11db311..cdb9d405752 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/bugs.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/bugs.adoc index 50edbfe9ba5..0328bde4437 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/bugs.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/bugs.adoc @@ -17,5 +17,5 @@ As with any constantly evolving software project, there will be issues, features, and bugs. We want to know whats bugging you! -File bugs as Issues in our Github repository http://github.com/eclipse/jetty.project[Issues at Github] +File bugs as Issues in our Github repository http://github.com/jetty/jetty.project[Issues at Github] diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc index f2523ab5460..d27142bbe65 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc @@ -49,7 +49,7 @@ Clone the repository: [source, screen, subs="{sub-order}"] .... -$ git clone https://github.com/eclipse/jetty.project.git +$ git clone https://github.com/jetty/jetty.project.git .... You will now have a local directory with all of jetty, including the jetty-documentation. @@ -109,7 +109,7 @@ Obviously we can not allow anyone immediate access to this repository so you mus In English that means that you would go to the url of the documentation in github: .... -https://github.com/eclipse/jetty.project +https://github.com/jetty/jetty.project .... When you are on this page you will see a little button called 'Fork' which you can click and you will be taken back to your main page on github where you have a new repository. 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 8509ef4588f..610f813b0d4 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 @@ -230,7 +230,7 @@ There are two git repositories you need to be aware of for releasing jetty-docum jetty-documentation:: https://github.com/jetty-project/jetty-documentation jetty-website:: -http://git.eclipse.org/c/www.eclipse.org/jetty.git +http://github.com/jetty/jetty.website Do the following steps to publish documentation for the release: diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc index 96c6a246d73..cfaa3fcf830 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc @@ -28,7 +28,7 @@ These are the URLs to the GIT repositories for the Jetty code. They are for people who are working on the Jetty project, as well as for people who are interested in examining or modifying the Jetty code for their own projects. Jetty Project Repository:: - https://github.com/eclipse/jetty.project + https://github.com/jetty/jetty.project ===== Build and Project Infrastructure SCM URLs @@ -53,7 +53,7 @@ Building Jetty should simply be a matter of changing into the relevant directory [source, screen, subs="{sub-order}"] .... -$ git clone https://github.com/eclipse/jetty.project.git +$ git clone https://github.com/jetty/jetty.project.git $ cd jetty.project $ mvn install 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 41fff9a9937..17670bf24e9 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 6b0a29c18e3..94b241ed2fa 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 @@ -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 e9cd4d2517d..d9b24efd246 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 c9b0417d155..5eccb6b64e3 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..736f136de0d 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..c012f5f76ec 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 b3c0c4a9f9d..e30f193c1f9 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 bad8500b497..ec9cd77b7b0 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 ee19f98c8ad..9faf168ddf4 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://eclipse.dev/jetty/download.php[download] a distribution of Jetty. +You can always find the Jetty jars either in the Maven Central repository, or you can link:https://jetty.org/download.html[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 @@ -796,7 +796,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 d6d890a18ac..638abfac59a 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..3dc63f663e8 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 92746df88af..a2a0211f1a2 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 b3f2c541063..a5bc25998ba 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/sessions/session-infinispan.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/sessions/session-infinispan.adoc index d0cc65d8803..cbf6624783a 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/sessions/session-infinispan.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/sessions/session-infinispan.adoc @@ -126,7 +126,7 @@ There are no configuration properties associated with this module. From Jetty-9.4.13 onwards, we have changed the format of the serialized session when using a remote cache (ie using hotrod). Prior to release 9.4.13 we used the default Infinispan serialization, however this was not able to store sufficient information to allow Jetty to properly deserialize session attributes in all circumstances. -See issue link:https://github.com/eclipse/jetty.project/issues/2919[] for more background. +See issue link:https://github.com/jetty/jetty.project/issues/2919[] for more background. We have provided a conversion program which will convert any sessions stored in Infinispan to the new format. 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 17ab9aca528..ebf21db61aa 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/documentation/jetty-documentation/src/main/asciidoc/programming-guide/index.adoc b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/index.adoc index 9e7948d2303..d4bcb554eae 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/programming-guide/index.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/index.adoc @@ -11,7 +11,7 @@ // ======================================================================== // -:doctitle: link:https://eclipse.org/jetty[Eclipse Jetty]: Programming Guide +:doctitle: link:https://jetty.org[Eclipse Jetty]: Programming Guide :toc-title: Jetty Programming Guide :idprefix: pg- :docinfo: private-head diff --git a/documentation/jetty/modules/operations-guide/pages/annotations/index.adoc b/documentation/jetty/modules/operations-guide/pages/annotations/index.adoc index 240a86c5639..b3f1ab6dc33 100644 --- a/documentation/jetty/modules/operations-guide/pages/annotations/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/annotations/index.adoc @@ -47,7 +47,7 @@ Here's an example context xml file that calls this method: [,xml,subs=verbatim] ---- - + <1> false <2> @@ -76,7 +76,7 @@ Here's an example from a context xml file that includes any jar whose name start [,xml,subs=verbatim] ---- - + <1> <2> @@ -107,7 +107,7 @@ Here's an example of a context xml file that sets a pattern that matches any jar [,xml,subs=verbatim] ---- - + <1> <2> @@ -173,7 +173,7 @@ Here's an example of setting the context attribute in a context xml file: [,xml,subs=verbatim] ---- - + <1> <2> @@ -204,7 +204,7 @@ Here is an example context xml file that ensures the `com.example.PrioritySCI` w [,xml,subs=verbatim] ---- - + <1> <2> diff --git a/documentation/jetty/modules/operations-guide/pages/begin/index.adoc b/documentation/jetty/modules/operations-guide/pages/begin/index.adoc index f77381fb44a..017f5725586 100644 --- a/documentation/jetty/modules/operations-guide/pages/begin/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/begin/index.adoc @@ -56,7 +56,7 @@ Read the xref:arch/index.adoc[Jetty architecture section] for more information a [[download]] == Downloading Jetty -The Eclipse Jetty distribution is available for download from https://eclipse.dev/jetty/download.php[] +The Eclipse Jetty distribution is available for download from https://jetty.org/download.html[] The Eclipse Jetty distribution is available in both `zip` and `gzip` formats; download the one most appropriate for your system, typically `zip` for Windows and `gzip` for other operating systems. diff --git a/documentation/jetty/modules/operations-guide/pages/deploy/index.adoc b/documentation/jetty/modules/operations-guide/pages/deploy/index.adoc index 5e16df2a1a7..f7ac109db37 100644 --- a/documentation/jetty/modules/operations-guide/pages/deploy/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/deploy/index.adoc @@ -83,7 +83,7 @@ A simple Jetty context XML file, for example named `wiki.xml` is the following: [,xml,subs=verbatim] ---- - + <1> /wiki <2> @@ -117,7 +117,7 @@ You can use the features of xref:xml/index.adoc[Jetty XML files] to avoid to har [,xml] ---- - + /wiki @@ -141,7 +141,7 @@ The JNDI entry must be _defined_ in a xref:jndi/index.adoc#xml[Jetty XML file], [,xml,subs=normal] ---- - + /mywebapp @@ -215,7 +215,7 @@ If you have a web application `mywebapp.war` you can configure its virtual hosts [,xml] ---- - + /mywebapp @@ -260,7 +260,7 @@ To achieve this, you simply use the same context path of `/` for each of your we [,xml] ---- - + / @@ -277,7 +277,7 @@ To achieve this, you simply use the same context path of `/` for each of your we [,xml] ---- - + / @@ -305,7 +305,7 @@ In this case, you want to xref:protocols/index.adoc[configure multiple connector [,xml,highlight=10] ---- - + / @@ -322,7 +322,7 @@ In this case, you want to xref:protocols/index.adoc[configure multiple connector [,xml,highlight=10] ---- - + / @@ -357,7 +357,7 @@ If you do not want Jetty to extract the `+*.war+` files, you can disable this fe [,xml,highlight=8] ---- - + /mywebapp @@ -377,7 +377,7 @@ This allows you to add host specific configuration or server specific configurat [,xml,highlight=8] ---- - + /mywebapp diff --git a/documentation/jetty/modules/operations-guide/pages/jaas/index.adoc b/documentation/jetty/modules/operations-guide/pages/jaas/index.adoc index c39fb251cc7..c26db134bf9 100644 --- a/documentation/jetty/modules/operations-guide/pages/jaas/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/jaas/index.adoc @@ -95,7 +95,7 @@ Here's an example of this type of XML file: [,xml] ---- - + @@ -113,7 +113,7 @@ Here's an example of this type of XML file: [,xml] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc b/documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc index 32123aea68b..1dd1be9da12 100644 --- a/documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc @@ -26,7 +26,7 @@ Here's an example of using a context xml file to add in a pattern to match files [,xml,subs=verbatim] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/modules/custom.adoc b/documentation/jetty/modules/operations-guide/pages/modules/custom.adoc index 2b32fdfa51a..7bac711e5a3 100644 --- a/documentation/jetty/modules/operations-guide/pages/modules/custom.adoc +++ b/documentation/jetty/modules/operations-guide/pages/modules/custom.adoc @@ -42,7 +42,7 @@ Start with the custom Jetty XML file, `$JETTY_BASE/etc/custom-ssl.xml`: [,xml] ---- - + @@ -158,7 +158,7 @@ Next, let's write the Jetty XML file that wires the auditing component to the `S [,xml,subs=verbatim,options=nowrap] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/modules/index.adoc b/documentation/jetty/modules/operations-guide/pages/modules/index.adoc index be56b270f5a..a8adef6a59d 100644 --- a/documentation/jetty/modules/operations-guide/pages/modules/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/modules/index.adoc @@ -84,7 +84,7 @@ For example, a Jetty XML file that allocates Jetty's `QueuedThreadPool` could be .jetty-threadpool.xml ---- - + @@ -234,7 +234,7 @@ The `custom-server.xml` file is the following: [,xml] ---- - + ---- diff --git a/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc b/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc index 19c5e2fb21f..fc771fdd0a2 100644 --- a/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc @@ -498,7 +498,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ [,xml,subs=verbatim] ---- - + @@ -524,7 +524,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable [,xml] ---- - + @@ -549,7 +549,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty' [,xml] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/session/index.adoc b/documentation/jetty/modules/operations-guide/pages/session/index.adoc index c8d9ba3aa36..483bc9da932 100644 --- a/documentation/jetty/modules/operations-guide/pages/session/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/session/index.adoc @@ -604,7 +604,7 @@ There are no configuration properties associated with this module. From Jetty-9.4.13 onwards, we have changed the format of the serialized session when using a remote cache (ie using hotrod). Prior to release 9.4.13 we used the default Infinispan serialization, however this was not able to store sufficient information to allow Jetty to properly deserialize session attributes in all circumstances. -See issue https://github.com/eclipse/jetty.project/issues/2919[] for more background. +See issue https://github.com/jetty/jetty.project/issues/2919[] for more background. We have provided a conversion program which will convert any sessions stored in Infinispan to the new format. diff --git a/documentation/jetty/modules/operations-guide/pages/xml/index.adoc b/documentation/jetty/modules/operations-guide/pages/xml/index.adoc index 5e7a50fc3a8..44989b48c9a 100644 --- a/documentation/jetty/modules/operations-guide/pages/xml/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/xml/index.adoc @@ -31,7 +31,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha [,xml] ---- - + @@ -43,7 +43,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha [,xml] ---- - + @@ -70,7 +70,7 @@ The following Jetty XML creates an empty `String` and assigns it the id `mystrin [,xml] ---- - + ---- @@ -98,7 +98,7 @@ The following example creates a minimal Jetty `Server`: [,xml] ---- - + 8080 @@ -112,7 +112,7 @@ Arguments may also have a `name` attribute, which is matched with the correspond [,xml] ---- - + 8080 @@ -132,7 +132,7 @@ The following example creates an `ArrayList`: [,xml] ---- - + @@ -159,7 +159,7 @@ Within element `` the return value, if the return type is not `void`, is i [,xml] ---- - + @@ -183,7 +183,7 @@ It is possible to call `static` methods by specifying the `class` attribute: [,xml] ---- - + @@ -206,7 +206,7 @@ For example: [,xml,subs=normal] ---- - + @@ -235,7 +235,7 @@ If the JavaBean property is `foo` (or `Foo`), `` first attempts to invoke _ [,xml] ---- - + @@ -262,7 +262,7 @@ If the JavaBean property is `foo` (or `Foo`), `` first attempts to invoke _ [,xml] ---- - + @@ -287,7 +287,7 @@ The map entries are specified with a sequence of `` elements, each with e [,xml] ---- - + @@ -312,7 +312,7 @@ You can only specify the key value via the `name` attribute, so the key can only [,xml] ---- - + @@ -333,7 +333,7 @@ Element `` creates a new array, whose component type may be specified by [,xml] ---- - + @@ -357,7 +357,7 @@ You must give a unique `id` attribute to the objects you want to reference. [,xml] ---- - + @@ -391,7 +391,7 @@ For example, you may want to configure the context path of your web application [,xml,subs=normal] ---- - + @@ -417,7 +417,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp [,xml] ---- - + @@ -440,7 +440,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp [,xml] ---- - + @@ -472,7 +472,7 @@ The following example illustrates how scopes work: [,xml] ---- - + 8080 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml b/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml index 81ddf0aa7b6..a5a49056c59 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml +++ b/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-cdi/src/main/config/etc/cdi/jetty-cdi.xml b/jetty-cdi/src/main/config/etc/cdi/jetty-cdi.xml index 484c19df26f..c36524d7165 100644 --- a/jetty-cdi/src/main/config/etc/cdi/jetty-cdi.xml +++ b/jetty-cdi/src/main/config/etc/cdi/jetty-cdi.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-deploy/src/main/config/etc/jetty-decorate.xml b/jetty-deploy/src/main/config/etc/jetty-decorate.xml index 3abfb16941b..011abeee7e5 100644 --- a/jetty-deploy/src/main/config/etc/jetty-decorate.xml +++ b/jetty-deploy/src/main/config/etc/jetty-decorate.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-deploy/src/main/config/etc/jetty-deploy.xml index 7a1e8d02d15..e9c20b38538 100644 --- a/jetty-deploy/src/main/config/etc/jetty-deploy.xml +++ b/jetty-deploy/src/main/config/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml b/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml index f91048c4b73..838d345af79 100644 --- a/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml +++ b/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml b/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml index 7f28fd55ca5..f77ea94ac11 100644 --- a/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml +++ b/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml b/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml index 02e338e6c9c..76f73e46665 100644 --- a/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml +++ b/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentTempDirTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentTempDirTest.java index 8411387fb4f..0f2748b00fb 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentTempDirTest.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentTempDirTest.java @@ -101,7 +101,7 @@ public class DeploymentTempDirTest public void testTmpDirectory() throws Exception { Path warPath = MavenTestingUtils.getTestResourcePath("webapps/foo-webapp-1.war"); - String deploymentXml = "\n" + + String deploymentXml = "\n" + "\n" + "" + warPath + "\n" + "" + tmpDir + "\n" + @@ -145,7 +145,7 @@ public class DeploymentTempDirTest public void testPersistentTmpDirectory() throws Exception { Path warPath = MavenTestingUtils.getTestResourcePath("webapps/foo-webapp-1.war"); - String deploymentXml = "\n" + + String deploymentXml = "\n" + "\n" + "" + warPath + "\n" + "" + tmpDir + "\n" + diff --git a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml index 6714b3b2316..50da9ad4484 100644 --- a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml +++ b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/resources/context-binding-test-1.xml b/jetty-deploy/src/test/resources/context-binding-test-1.xml index 9e5215df02a..e1e4497a4a9 100644 --- a/jetty-deploy/src/test/resources/context-binding-test-1.xml +++ b/jetty-deploy/src/test/resources/context-binding-test-1.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/resources/jetty-deploy-wars.xml b/jetty-deploy/src/test/resources/jetty-deploy-wars.xml index 6d66339e7d3..0e8e294f1f0 100644 --- a/jetty-deploy/src/test/resources/jetty-deploy-wars.xml +++ b/jetty-deploy/src/test/resources/jetty-deploy-wars.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml index bde43d34299..ef89d44dcd8 100644 --- a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml +++ b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/resources/jetty-http.xml b/jetty-deploy/src/test/resources/jetty-http.xml index 137da33293f..8ee14df91ae 100644 --- a/jetty-deploy/src/test/resources/jetty-http.xml +++ b/jetty-deploy/src/test/resources/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/resources/jetty.xml b/jetty-deploy/src/test/resources/jetty.xml index 73a091bcc02..a318d48c78a 100644 --- a/jetty-deploy/src/test/resources/jetty.xml +++ b/jetty-deploy/src/test/resources/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml b/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml index 952aab492d1..58d144f3a96 100644 --- a/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml +++ b/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/jetty-deploy/src/test/resources/webapps/foo.xml b/jetty-deploy/src/test/resources/webapps/foo.xml index 8b600c3bdc6..3e43f2c13c2 100644 --- a/jetty-deploy/src/test/resources/webapps/foo.xml +++ b/jetty-deploy/src/test/resources/webapps/foo.xml @@ -1,5 +1,5 @@ - + /foo diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml index 070c76aa25a..b0db7b5d224 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml b/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml index 07b47ee84b3..f0c6035fc71 100644 --- a/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml +++ b/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml b/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml index 377706a27c5..ea09e1a172c 100644 --- a/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml +++ b/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/README.adoc b/jetty-home/src/main/resources/README.adoc index af5739c576d..8f76a9a2aad 100644 --- a/jetty-home/src/main/resources/README.adoc +++ b/jetty-home/src/main/resources/README.adoc @@ -6,7 +6,7 @@ The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a: * Servlet Container * Java HTTP & WebSocket Client -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]. +Jetty is available under an open source link:LICENSE.txt[LICENSE], and the full source code is available at link:https://github.com/jetty/jetty.project[GitHub]. The Jetty documentation is available at link:https://eclipse.dev/jetty/documentation/[]. diff --git a/jetty-home/src/main/resources/etc/jetty-halt.xml b/jetty-home/src/main/resources/etc/jetty-halt.xml index 570f4fe08a1..e77c4553f40 100644 --- a/jetty-home/src/main/resources/etc/jetty-halt.xml +++ b/jetty-home/src/main/resources/etc/jetty-halt.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/etc/jetty-setuid.xml b/jetty-home/src/main/resources/etc/jetty-setuid.xml index 3c70cbb266f..9ed3fcc18bb 100644 --- a/jetty-home/src/main/resources/etc/jetty-setuid.xml +++ b/jetty-home/src/main/resources/etc/jetty-setuid.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/etc/jetty-stop.xml b/jetty-home/src/main/resources/etc/jetty-stop.xml index d1a39642862..9b702ba72f2 100644 --- a/jetty-home/src/main/resources/etc/jetty-stop.xml +++ b/jetty-home/src/main/resources/etc/jetty-stop.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/modules/conscrypt/conscrypt.xml b/jetty-home/src/main/resources/modules/conscrypt/conscrypt.xml index df41e444bcf..4f3d7a5f2bd 100644 --- a/jetty-home/src/main/resources/modules/conscrypt/conscrypt.xml +++ b/jetty-home/src/main/resources/modules/conscrypt/conscrypt.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/modules/demo.d/demo-realm.xml b/jetty-home/src/main/resources/modules/demo.d/demo-realm.xml index 176ab918d23..4743b6c05f3 100644 --- a/jetty-home/src/main/resources/modules/demo.d/demo-realm.xml +++ b/jetty-home/src/main/resources/modules/demo.d/demo-realm.xml @@ -1,5 +1,5 @@ - + 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 28b06d176e8..b9e8466f77e 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 @@ -61,7 +61,7 @@

getting help

  • Mailing lists @ eclipse
    • -
  • Source @ github
    • +
  • Source @ github
  • Developer Advice
  • Custom Development
  • Production support
    • diff --git a/jetty-home/src/main/resources/modules/hawtio/hawtio.xml b/jetty-home/src/main/resources/modules/hawtio/hawtio.xml index 8b66e036292..9a7ff066007 100644 --- a/jetty-home/src/main/resources/modules/hawtio/hawtio.xml +++ b/jetty-home/src/main/resources/modules/hawtio/hawtio.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/modules/jamon/jamon.xml b/jetty-home/src/main/resources/modules/jamon/jamon.xml index e4356d4833f..f2d9c600396 100644 --- a/jetty-home/src/main/resources/modules/jamon/jamon.xml +++ b/jetty-home/src/main/resources/modules/jamon/jamon.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/modules/jolokia/jolokia.xml b/jetty-home/src/main/resources/modules/jolokia/jolokia.xml index a7f9b9a92fd..89c65bedec4 100644 --- a/jetty-home/src/main/resources/modules/jolokia/jolokia.xml +++ b/jetty-home/src/main/resources/modules/jolokia/jolokia.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml b/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml index 78904fd4bba..b4694150e04 100644 --- a/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml +++ b/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml b/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml index a13cf3970f6..2e1286ccf22 100644 --- a/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml +++ b/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-http3/http3-server/src/main/config/etc/jetty-http3.xml b/jetty-http3/http3-server/src/main/config/etc/jetty-http3.xml index ca37ce84f07..f7ee9d9f93b 100644 --- a/jetty-http3/http3-server/src/main/config/etc/jetty-http3.xml +++ b/jetty-http3/http3-server/src/main/config/etc/jetty-http3.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-infinispan/infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml b/jetty-infinispan/infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml index 0092a534815..24645d4f8be 100644 --- a/jetty-infinispan/infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml +++ b/jetty-infinispan/infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-infinispan/infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml b/jetty-infinispan/infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml index 52ca7ddd2ab..e1eed20430b 100644 --- a/jetty-infinispan/infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml +++ b/jetty-infinispan/infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml b/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml index ee0b60b7ab9..79a88aa3b08 100644 --- a/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml +++ b/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-infinispan/infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml b/jetty-infinispan/infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml index 6c2c7565c1a..8d55b74a3cc 100644 --- a/jetty-infinispan/infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml +++ b/jetty-infinispan/infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-infinispan/infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml b/jetty-infinispan/infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml index f9525cddd30..26dcceabc7c 100644 --- a/jetty-infinispan/infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml +++ b/jetty-infinispan/infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jaas/src/main/config/etc/jetty-jaas.xml b/jetty-jaas/src/main/config/etc/jetty-jaas.xml index 881b23292a0..3fc4994f9b4 100644 --- a/jetty-jaas/src/main/config/etc/jetty-jaas.xml +++ b/jetty-jaas/src/main/config/etc/jetty-jaas.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jaspi/src/main/config/etc/jaspi/jaspi-authmoduleconfig.xml b/jetty-jaspi/src/main/config/etc/jaspi/jaspi-authmoduleconfig.xml index 2bece156f6a..3fda49ba251 100644 --- a/jetty-jaspi/src/main/config/etc/jaspi/jaspi-authmoduleconfig.xml +++ b/jetty-jaspi/src/main/config/etc/jaspi/jaspi-authmoduleconfig.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jaspi/src/main/config/etc/jaspi/jaspi-default.xml b/jetty-jaspi/src/main/config/etc/jaspi/jaspi-default.xml index 1742c19568e..bc3e1856c4d 100644 --- a/jetty-jaspi/src/main/config/etc/jaspi/jaspi-default.xml +++ b/jetty-jaspi/src/main/config/etc/jaspi/jaspi-default.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jaspi/src/main/config/etc/jaspi/jaspi-demo.xml b/jetty-jaspi/src/main/config/etc/jaspi/jaspi-demo.xml index a1dde13d2f9..f4b7c5fc2e3 100644 --- a/jetty-jaspi/src/main/config/etc/jaspi/jaspi-demo.xml +++ b/jetty-jaspi/src/main/config/etc/jaspi/jaspi-demo.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml b/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml index 09233ae33c7..2f517dcfd37 100644 --- a/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml +++ b/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx.xml b/jetty-jmx/src/main/config/etc/jetty-jmx.xml index 5aadbb66a70..008ad50b3ab 100644 --- a/jetty-jmx/src/main/config/etc/jetty-jmx.xml +++ b/jetty-jmx/src/main/config/etc/jetty-jmx.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml b/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml index 42b97d1b5ba..adb2adaf276 100644 --- a/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml +++ b/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml @@ -19,7 +19,7 @@ ~ --> - + diff --git a/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml b/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml index ddfb4cb7bb3..78a79d82da2 100644 --- a/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml +++ b/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml @@ -19,7 +19,7 @@ ~ --> - + diff --git a/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml b/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml index e7c39859657..5d3c485db97 100644 --- a/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml +++ b/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/exclude-javax-annotation/src/config/jetty.xml b/jetty-maven-plugin/src/it/exclude-javax-annotation/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/exclude-javax-annotation/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/exclude-javax-annotation/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty-context.xml b/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty-context.xml index c7d7bf4cde7..2fddda64598 100644 --- a/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty-context.xml +++ b/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty-context.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty.xml b/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty.xml index 8f1c473fb3f..96b2d3edd49 100644 --- a/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/src/config/jetty.xml index 7df44bd5ad7..99deb7f254f 100644 --- a/jetty-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml index 3eb5570a37d..dea3edec690 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml +++ b/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml b/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml index 7fa53cc3a33..410080be0d8 100644 --- a/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/main/jettyconf/context.xml b/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/main/jettyconf/context.xml index e1ab206a186..948d34b8028 100644 --- a/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/main/jettyconf/context.xml +++ b/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/main/jettyconf/context.xml @@ -1,5 +1,5 @@ - + org.eclipse.jetty.servlet.Default.useFileMappedBuffer diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/context.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/context.xml index 3eb5570a37d..dea3edec690 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/context.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/webapp-war/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/webapp-war/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/webapp-war/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/webapp-war/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/context.xml b/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/context.xml index 3eb5570a37d..dea3edec690 100644 --- a/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/context.xml +++ b/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml b/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml index 7fa53cc3a33..410080be0d8 100644 --- a/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/main/resources/jetty-maven.xml b/jetty-maven-plugin/src/main/resources/jetty-maven.xml index 47d10a84d4f..822478c9836 100644 --- a/jetty-maven-plugin/src/main/resources/jetty-maven.xml +++ b/jetty-maven-plugin/src/main/resources/jetty-maven.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/main/resources/maven.xml b/jetty-maven-plugin/src/main/resources/maven.xml index 98cf64733c3..a68454ba002 100644 --- a/jetty-maven-plugin/src/main/resources/maven.xml +++ b/jetty-maven-plugin/src/main/resources/maven.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/test/resources/embedder-context.xml b/jetty-maven-plugin/src/test/resources/embedder-context.xml index bde6592cc3e..73dcde3e216 100644 --- a/jetty-maven-plugin/src/test/resources/embedder-context.xml +++ b/jetty-maven-plugin/src/test/resources/embedder-context.xml @@ -1,5 +1,5 @@ - + /embedder diff --git a/jetty-maven-plugin/src/test/resources/embedder-jetty.xml b/jetty-maven-plugin/src/test/resources/embedder-jetty.xml index a7ad2021f67..9394623b341 100644 --- a/jetty-maven-plugin/src/test/resources/embedder-jetty.xml +++ b/jetty-maven-plugin/src/test/resources/embedder-jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml b/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml index 4a22c9b6765..7cf7737769c 100644 --- a/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml +++ b/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml index 28e5a7da378..645d9a1c3ab 100644 --- a/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml +++ b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml index 717f9949cf1..daac2febb08 100644 --- a/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml +++ b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-openid/src/main/config/etc/jetty-openid.xml b/jetty-openid/src/main/config/etc/jetty-openid.xml index acdddbf113f..4fbe0644a48 100644 --- a/jetty-openid/src/main/config/etc/jetty-openid.xml +++ b/jetty-openid/src/main/config/etc/jetty-openid.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-openid/src/main/config/modules/openid/openid-baseloginservice.xml b/jetty-openid/src/main/config/modules/openid/openid-baseloginservice.xml index 1773ebd46db..f0464fefcf6 100644 --- a/jetty-openid/src/main/config/modules/openid/openid-baseloginservice.xml +++ b/jetty-openid/src/main/config/modules/openid/openid-baseloginservice.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml index eb89fb21f7e..ccc9d40c3c1 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml index 7b57f96be2c..9acb8a71774 100644 --- a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml +++ b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml b/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml index f2052300efb..f53fe7d7e2c 100644 --- a/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml +++ b/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/README.txt b/jetty-osgi/test-jetty-osgi/README.txt index 9811ae5018a..58bc75e2f08 100644 --- a/jetty-osgi/test-jetty-osgi/README.txt +++ b/jetty-osgi/test-jetty-osgi/README.txt @@ -143,7 +143,7 @@ If you've upgraded the jetty jar and that's all you've changed, then more than l Also, if you don't see any test failures with unresolved jar messages, then it's also a good indicator that the problem is with SpiFly versioning. Unfortunately, when the problem is a jvm/SpiFly versioning mismatch, the osgi paxexam environment doesn't output any good log messages. There is a java.lang.Error that is thrown from inside asm that the environment doesn't pass on in any useful fashion. To try and catch this error, you can modify the ServletInstanceWrapper at line 163 to catch Throwable instead of Exception: -https://github.com/eclipse/jetty.project/blob/jetty-10.0.x/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163 +https://github.com/jetty/jetty.project/blob/jetty-10.0.x/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163 When you do this, you get output like the following: diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-alpn.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-alpn.xml index 22eacf1cf38..bc73c4d1ffe 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-alpn.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-alpn.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deploy.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deploy.xml index fe917c2430e..629a8cbcad6 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deploy.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml index 5333433aab7..65b17d9f335 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml index b90533d0b60..64c17f608d1 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml index 271f12e042c..69f13636b55 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml index 6cb5d15395a..4a672e9700f 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml index 4ff583996c4..ce7286c93d8 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml index 9edaf7b56c0..2584d302ec9 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml index f77ab2d7227..aa41e76d79e 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml index e1b37e7c70f..8ea67d8a0a4 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml index 6b883c59a0e..bc964cebdc6 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml index ad51713fd9c..4bf134cec4b 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml index 2bf9d1051b1..f3cbd267a76 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml index 941216afee1..e5978d5edb9 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml index b25525dec5c..801de9e53a5 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml index e9ebabc4699..4ef4ccac1dd 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml index 4561574d208..f1922622867 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml index 32eb6404275..04e786508d5 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-proxy/src/main/config/etc/jetty-proxy.xml b/jetty-proxy/src/main/config/etc/jetty-proxy.xml index 3e6b3b91918..0d997a47361 100644 --- a/jetty-proxy/src/main/config/etc/jetty-proxy.xml +++ b/jetty-proxy/src/main/config/etc/jetty-proxy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-quickstart/src/main/config/etc/jetty-quickstart.xml b/jetty-quickstart/src/main/config/etc/jetty-quickstart.xml index 84d030260b0..a939c361d83 100644 --- a/jetty-quickstart/src/main/config/etc/jetty-quickstart.xml +++ b/jetty-quickstart/src/main/config/etc/jetty-quickstart.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-quickstart/src/main/config/modules/jetty-quickstart.d/quickstart-webapp.xml b/jetty-quickstart/src/main/config/modules/jetty-quickstart.d/quickstart-webapp.xml index b0f07545e95..267d38b46b2 100644 --- a/jetty-quickstart/src/main/config/modules/jetty-quickstart.d/quickstart-webapp.xml +++ b/jetty-quickstart/src/main/config/modules/jetty-quickstart.d/quickstart-webapp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-quickstart/src/test/resources/context.xml b/jetty-quickstart/src/test/resources/context.xml index 1ac22a00e2c..a74b3deabfe 100644 --- a/jetty-quickstart/src/test/resources/context.xml +++ b/jetty-quickstart/src/test/resources/context.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml b/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml index c78237e0c03..4cbb42592d7 100644 --- a/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml +++ b/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-rewrite/src/main/config/etc/rewrite-compactpath.xml b/jetty-rewrite/src/main/config/etc/rewrite-compactpath.xml index 7019f342a6d..18117d193c9 100644 --- a/jetty-rewrite/src/main/config/etc/rewrite-compactpath.xml +++ b/jetty-rewrite/src/main/config/etc/rewrite-compactpath.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-rewrite/src/main/config/modules/rewrite/rewrite-msie.xml b/jetty-rewrite/src/main/config/modules/rewrite/rewrite-msie.xml index d4b5b3edccb..6f15b2306b2 100644 --- a/jetty-rewrite/src/main/config/modules/rewrite/rewrite-msie.xml +++ b/jetty-rewrite/src/main/config/modules/rewrite/rewrite-msie.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-rewrite/src/main/config/modules/rewrite/rewrite-rules.xml b/jetty-rewrite/src/main/config/modules/rewrite/rewrite-rules.xml index b12af8f4da3..b2293f1321d 100644 --- a/jetty-rewrite/src/main/config/modules/rewrite/rewrite-rules.xml +++ b/jetty-rewrite/src/main/config/modules/rewrite/rewrite-rules.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/home-base-warning.xml b/jetty-server/src/main/config/etc/home-base-warning.xml index 5b0f42bcb52..8d7e3633c55 100644 --- a/jetty-server/src/main/config/etc/home-base-warning.xml +++ b/jetty-server/src/main/config/etc/home-base-warning.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-acceptratelimit.xml b/jetty-server/src/main/config/etc/jetty-acceptratelimit.xml index 0ae2b002521..faaf45b864f 100644 --- a/jetty-server/src/main/config/etc/jetty-acceptratelimit.xml +++ b/jetty-server/src/main/config/etc/jetty-acceptratelimit.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-bytebufferpool-logarithmic.xml b/jetty-server/src/main/config/etc/jetty-bytebufferpool-logarithmic.xml index 39a1e58911c..aae744f414d 100644 --- a/jetty-server/src/main/config/etc/jetty-bytebufferpool-logarithmic.xml +++ b/jetty-server/src/main/config/etc/jetty-bytebufferpool-logarithmic.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-bytebufferpool.xml b/jetty-server/src/main/config/etc/jetty-bytebufferpool.xml index f1d787a6201..a2f327787b8 100644 --- a/jetty-server/src/main/config/etc/jetty-bytebufferpool.xml +++ b/jetty-server/src/main/config/etc/jetty-bytebufferpool.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-connectionlimit.xml b/jetty-server/src/main/config/etc/jetty-connectionlimit.xml index fd15acb9ff2..f777c87c24f 100644 --- a/jetty-server/src/main/config/etc/jetty-connectionlimit.xml +++ b/jetty-server/src/main/config/etc/jetty-connectionlimit.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-debug.xml b/jetty-server/src/main/config/etc/jetty-debug.xml index bd436d322c8..0e091f017e4 100644 --- a/jetty-server/src/main/config/etc/jetty-debug.xml +++ b/jetty-server/src/main/config/etc/jetty-debug.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-debuglog.xml b/jetty-server/src/main/config/etc/jetty-debuglog.xml index 067192e7114..31500c94753 100644 --- a/jetty-server/src/main/config/etc/jetty-debuglog.xml +++ b/jetty-server/src/main/config/etc/jetty-debuglog.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-gzip.xml b/jetty-server/src/main/config/etc/jetty-gzip.xml index 933f2ef4893..48c835a6e32 100644 --- a/jetty-server/src/main/config/etc/jetty-gzip.xml +++ b/jetty-server/src/main/config/etc/jetty-gzip.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-http-forwarded.xml b/jetty-server/src/main/config/etc/jetty-http-forwarded.xml index ffe0a2cae03..0a839c0648a 100644 --- a/jetty-server/src/main/config/etc/jetty-http-forwarded.xml +++ b/jetty-server/src/main/config/etc/jetty-http-forwarded.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-http.xml b/jetty-server/src/main/config/etc/jetty-http.xml index 9fa1e6a7bfa..2c99e7d2575 100644 --- a/jetty-server/src/main/config/etc/jetty-http.xml +++ b/jetty-server/src/main/config/etc/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-https.xml b/jetty-server/src/main/config/etc/jetty-https.xml index a71de579531..5e5df4ddaa7 100644 --- a/jetty-server/src/main/config/etc/jetty-https.xml +++ b/jetty-server/src/main/config/etc/jetty-https.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-lowresources.xml b/jetty-server/src/main/config/etc/jetty-lowresources.xml index 66e1da74aad..5e2d4650200 100644 --- a/jetty-server/src/main/config/etc/jetty-lowresources.xml +++ b/jetty-server/src/main/config/etc/jetty-lowresources.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml b/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml index 246321829c5..fd61006e376 100644 --- a/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml +++ b/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml b/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml index 49d427e5195..0124d3b59ab 100644 --- a/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml +++ b/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml index 70e6ae0f8c0..510a7773be7 100644 --- a/jetty-server/src/main/config/etc/jetty-requestlog.xml +++ b/jetty-server/src/main/config/etc/jetty-requestlog.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-secure-redirect.xml b/jetty-server/src/main/config/etc/jetty-secure-redirect.xml index b834c2f0c85..a3c68444b60 100644 --- a/jetty-server/src/main/config/etc/jetty-secure-redirect.xml +++ b/jetty-server/src/main/config/etc/jetty-secure-redirect.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-ssl-context-reload.xml b/jetty-server/src/main/config/etc/jetty-ssl-context-reload.xml index 46346359ed7..d301e5ecb54 100644 --- a/jetty-server/src/main/config/etc/jetty-ssl-context-reload.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl-context-reload.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-ssl-context.xml b/jetty-server/src/main/config/etc/jetty-ssl-context.xml index 8e4fbbc87bf..3f3292334c4 100644 --- a/jetty-server/src/main/config/etc/jetty-ssl-context.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl-context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-ssl.xml b/jetty-server/src/main/config/etc/jetty-ssl.xml index c83840f7754..aee17b9d5f3 100644 --- a/jetty-server/src/main/config/etc/jetty-ssl.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-state.xml b/jetty-server/src/main/config/etc/jetty-state.xml index f2ab5c98f80..e80cf6c72ba 100644 --- a/jetty-server/src/main/config/etc/jetty-state.xml +++ b/jetty-server/src/main/config/etc/jetty-state.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-stats.xml b/jetty-server/src/main/config/etc/jetty-stats.xml index 74238e1b046..22977067017 100644 --- a/jetty-server/src/main/config/etc/jetty-stats.xml +++ b/jetty-server/src/main/config/etc/jetty-stats.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-threadlimit.xml b/jetty-server/src/main/config/etc/jetty-threadlimit.xml index 3d0c7e5626d..fc3249f8f77 100644 --- a/jetty-server/src/main/config/etc/jetty-threadlimit.xml +++ b/jetty-server/src/main/config/etc/jetty-threadlimit.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml b/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml index e5c454fb5de..da285e4bb43 100644 --- a/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml +++ b/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml b/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml index 71dc9444ba8..8e65727775d 100644 --- a/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml +++ b/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-threadpool.xml b/jetty-server/src/main/config/etc/jetty-threadpool.xml index 2ef169a6c67..ae55f65a217 100644 --- a/jetty-server/src/main/config/etc/jetty-threadpool.xml +++ b/jetty-server/src/main/config/etc/jetty-threadpool.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml index 3e4c4a890d4..e0db88e97d5 100644 --- a/jetty-server/src/main/config/etc/jetty.xml +++ b/jetty-server/src/main/config/etc/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/file/session-store.xml b/jetty-server/src/main/config/etc/sessions/file/session-store.xml index 7b48c1cafaf..d1816fb82e2 100644 --- a/jetty-server/src/main/config/etc/sessions/file/session-store.xml +++ b/jetty-server/src/main/config/etc/sessions/file/session-store.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/id-manager.xml b/jetty-server/src/main/config/etc/sessions/id-manager.xml index 546f2682a48..70c12f3e668 100644 --- a/jetty-server/src/main/config/etc/sessions/id-manager.xml +++ b/jetty-server/src/main/config/etc/sessions/id-manager.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml b/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml index 5113d8cfb49..c797fcd131b 100644 --- a/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml +++ b/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml b/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml index 1fcd811dab9..142a917c64a 100644 --- a/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml +++ b/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml b/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml index 963c5252b09..7362061c8a6 100644 --- a/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml +++ b/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml b/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml index a6f09ea3ef0..75f8a461e4f 100644 --- a/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml +++ b/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/session-cache-null.xml b/jetty-server/src/main/config/etc/sessions/session-cache-null.xml index 9e8928d0cac..822112a1ffe 100644 --- a/jetty-server/src/main/config/etc/sessions/session-cache-null.xml +++ b/jetty-server/src/main/config/etc/sessions/session-cache-null.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml b/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml index cfcfdaa1e88..a181ba19ed1 100644 --- a/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml +++ b/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/well-known.xml b/jetty-server/src/main/config/etc/well-known.xml index fea5398ad0a..3c110ba2088 100644 --- a/jetty-server/src/main/config/etc/well-known.xml +++ b/jetty-server/src/main/config/etc/well-known.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml b/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml index f30fe062f66..74ee355f285 100644 --- a/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml +++ b/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java index c728c649f7f..f9ffbd77e04 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java @@ -183,8 +183,8 @@ public class DefaultHandler extends AbstractHandler } writer.append("
    \n"); - writer.append("\"icon\" "); - writer.append("Powered by Eclipse Jetty:// Server
    \n"); + writer.append("\"icon\" "); + writer.append("Powered by Eclipse Jetty:// Server
    \n"); writer.append("\n\n"); writer.flush(); byte[] content = outputStream.toByteArray(); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java index 82b30b6fbf7..9e2c55d570f 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java @@ -75,7 +75,7 @@ public class MavenLocalRepoFileInitializerTest public void testGetCoordinateInvalidMaven() { MavenLocalRepoFileInitializer repo = new MavenLocalRepoFileInitializer(baseHome); - String ref = "maven://www.eclipse.org/jetty"; + String ref = "maven://jetty.org"; RuntimeException x = assertThrows(RuntimeException.class, () -> repo.getCoordinates(URI.create(ref))); assertThat(x.getMessage(), containsString("Not a valid maven:// uri")); } diff --git a/jetty-start/src/test/resources/bogus.xml b/jetty-start/src/test/resources/bogus.xml index c1d3126ab22..3dac2d69175 100644 --- a/jetty-start/src/test/resources/bogus.xml +++ b/jetty-start/src/test/resources/bogus.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml b/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml index d59074567be..236563eecef 100644 --- a/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml +++ b/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-forwarded.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-forwarded.xml index e427b94cd9f..43f0cdbd873 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-forwarded.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-forwarded.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http.xml index 009f02a70e6..550c9091d2f 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http2c.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http2c.xml index 3871d02981a..3ec381d3d5b 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http2c.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http2c.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-proxy-protocol.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-proxy-protocol.xml index 33ee605e0f4..f50756eab27 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-proxy-protocol.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-proxy-protocol.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-secure.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-secure.xml index 15110890034..6f78a04c939 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-secure.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-secure.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket.xml index b58242ffd9f..e5e4104a6fa 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-util/src/main/config/etc/console-capture.xml b/jetty-util/src/main/config/etc/console-capture.xml index 439b0375241..fb5f4f76211 100644 --- a/jetty-util/src/main/config/etc/console-capture.xml +++ b/jetty-util/src/main/config/etc/console-capture.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-util/src/main/config/etc/jetty-pid.xml b/jetty-util/src/main/config/etc/jetty-pid.xml index 7ca3084a28c..543d4725194 100644 --- a/jetty-util/src/main/config/etc/jetty-pid.xml +++ b/jetty-util/src/main/config/etc/jetty-pid.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java index d65aa3d3752..4e7748985dd 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java @@ -67,7 +67,7 @@ public class Jetty else VERSION = System.getProperty("jetty.version", __buildProperties.getProperty("version", "10.0.z-SNAPSHOT")); - POWERED_BY = "Powered by Jetty:// " + VERSION + ""; + POWERED_BY = "Powered by Jetty:// " + VERSION + ""; // Show warning when RC# or M# is in version string STABLE = !VERSION.matches("^.*\\.(RC|M)[0-9]+$"); diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java index c19bc4184fe..a79251f04cc 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java @@ -81,7 +81,7 @@ public class RolloverFileOutputStreamTest } /** - * https://github.com/eclipse/jetty.project/issues/1507 + * https://github.com/jetty/jetty.project/issues/1507 */ @Test public void testMidnightRolloverCalcPDTIssue1507() diff --git a/jetty-webapp/src/main/config/etc/jetty-webapp.xml b/jetty-webapp/src/main/config/etc/jetty-webapp.xml index 47c9519abf9..3f655ef3585 100644 --- a/jetty-webapp/src/main/config/etc/jetty-webapp.xml +++ b/jetty-webapp/src/main/config/etc/jetty-webapp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java index 2d89b3da755..329e4aa5a88 100644 --- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java +++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java @@ -100,7 +100,7 @@ public class FrameFlusherTest /** * Ensure that FrameFlusher honors the correct order of websocket frames. * - * @see eclipse/jetty.project#2491 + * @see eclipse/jetty.project#2491 */ @Test public void testLargeSmallText() throws ExecutionException, InterruptedException diff --git a/jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml index f2bab081984..ab940349f2c 100644 --- a/jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml +++ b/jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/jetty-websocket-httpclient.xml index eef3def7410..c59ddb166ed 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/resources/jetty-websocket-httpclient.xml +++ b/jetty-websocket/websocket-javax-tests/src/test/resources/jetty-websocket-httpclient.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml index 4ba6b4cbaa4..c750444e6cb 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml +++ b/jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index f3dc3292203..63a017d40c3 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -45,6 +45,14 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + org.apache.maven.plugins maven-surefire-plugin diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java index 31899d1a3f9..9e274cbcda5 100644 --- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java +++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java @@ -1949,54 +1949,49 @@ public class XmlConfiguration _entry = entry; Class klass = XmlConfiguration.class; + URL config60 = klass.getResource("configure_6_0.dtd"); URL config76 = klass.getResource("configure_7_6.dtd"); URL config90 = klass.getResource("configure_9_0.dtd"); URL config93 = klass.getResource("configure_9_3.dtd"); URL config100 = klass.getResource("configure_10_0.dtd"); - redirectEntity("configure.dtd", config93); - redirectEntity("configure_1_0.dtd", config60); - redirectEntity("configure_1_1.dtd", config60); - redirectEntity("configure_1_2.dtd", config60); - redirectEntity("configure_1_3.dtd", config60); - redirectEntity("configure_6_0.dtd", config60); - redirectEntity("configure_7_6.dtd", config76); - redirectEntity("configure_9_0.dtd", config90); - redirectEntity("configure_9_3.dtd", config93); - redirectEntity("configure_10_0.dtd", config100); + Map dtdRefMap = new HashMap<>(); + dtdRefMap.put("configure.dtd", config93); + dtdRefMap.put("configure_1_0.dtd", config60); + dtdRefMap.put("configure_1_1.dtd", config60); + dtdRefMap.put("configure_1_2.dtd", config60); + dtdRefMap.put("configure_1_3.dtd", config60); + dtdRefMap.put("configure_6_0.dtd", config60); + dtdRefMap.put("configure_7_6.dtd", config76); + dtdRefMap.put("configure_9_0.dtd", config90); + dtdRefMap.put("configure_9_3.dtd", config93); + dtdRefMap.put("configure_10_0.dtd", config100); - redirectEntity("http://jetty.mortbay.org/configure.dtd", config93); - redirectEntity("http://jetty.eclipse.org/configure.dtd", config93); - redirectEntity("https://jetty.eclipse.org/configure.dtd", config93); - redirectEntity("http://www.eclipse.org/jetty/configure.dtd", config93); - redirectEntity("https://www.eclipse.org/jetty/configure.dtd", config93); - redirectEntity("http://eclipse.org/jetty/configure.dtd", config93); - redirectEntity("https://eclipse.org/jetty/configure.dtd", config93); - redirectEntity("http://www.eclipse.dev/jetty/configure.dtd", config93); - redirectEntity("https://www.eclipse.dev/jetty/configure.dtd", config93); - redirectEntity("http://eclipse.dev/jetty/configure.dtd", config93); - redirectEntity("https://eclipse.dev/jetty/configure.dtd", config93); + dtdRefMap.forEach(this::redirectEntity); - redirectEntity("http://jetty.mortbay.org/configure_9_3.dtd", config93); - redirectEntity("http://www.eclipse.org/jetty/configure_9_3.dtd", config93); - redirectEntity("https://www.eclipse.org/jetty/configure_9_3.dtd", config93); - redirectEntity("http://eclipse.org/jetty/configure_9_3.dtd", config93); - redirectEntity("https://eclipse.org/jetty/configure_9_3.dtd", config93); - redirectEntity("http://www.eclipse.dev/jetty/configure_9_3.dtd", config93); - redirectEntity("https://www.eclipse.dev/jetty/configure_9_3.dtd", config93); - redirectEntity("http://eclipse.dev/jetty/configure_9_3.dtd", config93); - redirectEntity("https://eclipse.dev/jetty/configure_9_3.dtd", config93); - - redirectEntity("http://www.eclipse.org/jetty/configure_10_0.dtd", config100); - redirectEntity("https://www.eclipse.org/jetty/configure_10_0.dtd", config100); - redirectEntity("http://eclipse.org/jetty/configure_10_0.dtd", config100); - redirectEntity("https://eclipse.org/jetty/configure_10_0.dtd", config100); - redirectEntity("http://www.eclipse.dev/jetty/configure_10_0.dtd", config100); - redirectEntity("https://www.eclipse.dev/jetty/configure_10_0.dtd", config100); - redirectEntity("http://eclipse.dev/jetty/configure_10_0.dtd", config100); - redirectEntity("https://eclipse.dev/jetty/configure_10_0.dtd", config100); + // Register all variations of DOCTYPE entity references for Configure + List schemes = List.of("http", "https"); + List contexts = List.of( + "jetty.mortbay.org", + "jetty.eclipse.org", + "www.eclipse.org/jetty", + "eclipse.org/jetty", + "www.eclipse.dev/jetty", + "eclipse.dev/jetty", + "jetty.org"); + for (String scheme : schemes) + { + for (String context : contexts) + { + dtdRefMap.forEach((dtdName, dtdUrl) -> + { + String refUrl = String.format("%s://%s/%s", scheme, context, dtdName); + redirectEntity(refUrl, dtdUrl); + }); + } + } redirectEntity("-//Mort Bay Consulting//DTD Configure//EN", config100); redirectEntity("-//Jetty//Configure//EN", config100); } diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java index fcbbed2a6b8..348eaa97e79 100644 --- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java +++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java @@ -1894,16 +1894,16 @@ public class XmlConfigurationTest 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", "/jetty/configure_9_3.dtd", "/jetty/configure_10_0.dtd"}; + String[] contexts = {"eclipse.org/jetty", "www.eclipse.org/jetty", "eclipse.dev/jetty", "www.eclipse.dev/jetty", "jetty.org"}; + String[] paths = {"configure.dtd", "configure_9_3.dtd", "configure_10_0.dtd"}; for (String scheme: schemes) { - for (String host: hosts) + for (String host: contexts) { for (String path: paths) { - ids.add(Arguments.of(String.format("%s://%s%s", scheme, host, path))); + ids.add(Arguments.of(String.format("%s://%s/%s", scheme, host, path))); } } } diff --git a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml index cf8976056ea..d827bd521cd 100644 --- a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml +++ b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml @@ -1,5 +1,5 @@ - + name diff --git a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml index 19447335471..3c33b3ded2b 100644 --- a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml +++ b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml @@ -1,5 +1,5 @@ - + org.eclipse.jetty.xml.TestConfiguration diff --git a/pom.xml b/pom.xml index a9072b61da4..8da160dde12 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ pom Jetty :: Project The Eclipse Jetty Project - https://eclipse.dev/jetty + https://jetty.org 1995 diff --git a/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/websocket/JavaxWebSocketCdiTest.java b/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/websocket/JavaxWebSocketCdiTest.java index e217e3454cc..dde298e7507 100644 --- a/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/websocket/JavaxWebSocketCdiTest.java +++ b/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/websocket/JavaxWebSocketCdiTest.java @@ -163,7 +163,7 @@ public class JavaxWebSocketCdiTest } @Test - @Disabled("See issue https://github.com/eclipse/jetty.project/issues/6174") + @Disabled("See issue https://github.com/jetty/jetty.project/issues/6174") public void testHttpSessionInjection() throws Exception { start((servletContext, wsContainer) -> wsContainer.addEndpoint(CdiHttpSessionSocket.class)); diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index 8abfcb26cb0..8f8086bb1d1 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -859,7 +859,7 @@ public class DistributionTests extends AbstractJettyHomeTest String message = "test-log-line"; String xml = "" + "" + - "" + + "" + "" + " " + " " + loggerName + "" + @@ -920,7 +920,7 @@ public class DistributionTests extends AbstractJettyHomeTest String nextProtocol = "fcgi/1.0"; String xml = "" + "" + - "" + + "" + "" + " " + " " + diff --git a/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_false.xml b/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_false.xml index 7e325b59625..fb8d7764d1c 100644 --- a/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_false.xml +++ b/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_false.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_true.xml b/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_true.xml index 952aab492d1..58d144f3a96 100644 --- a/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_true.xml +++ b/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_true.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir one/test1.xml b/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir one/test1.xml index b16b24aae94..ad4cf12ee4d 100644 --- a/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir one/test1.xml +++ b/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir one/test1.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir two/test2.xml b/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir two/test2.xml index b16b24aae94..ad4cf12ee4d 100644 --- a/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir two/test2.xml +++ b/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir two/test2.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/test-distribution/src/test/resources/test-realm.xml b/tests/test-distribution/src/test/resources/test-realm.xml index 0b4cf7f7c31..a9ef4f11ce3 100644 --- a/tests/test-distribution/src/test/resources/test-realm.xml +++ b/tests/test-distribution/src/test/resources/test-realm.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorInitializer.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorInitializer.java index ad27c08b63c..c04c7e6f9fd 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorInitializer.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorInitializer.java @@ -21,7 +21,7 @@ import javax.servlet.ServletException; /** * A SCI that tosses an Error to intentionally to cause issues with the DeploymentManager * - * @see Issue #1602 + * @see Issue #1602 */ public class DeploymentErrorInitializer implements ServletContainerInitializer { diff --git a/tests/test-integration/src/test/resources/DefaultHandler.xml b/tests/test-integration/src/test/resources/DefaultHandler.xml index e23d89e6d0e..9722b5de0b8 100644 --- a/tests/test-integration/src/test/resources/DefaultHandler.xml +++ b/tests/test-integration/src/test/resources/DefaultHandler.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/NIOHttp.xml b/tests/test-integration/src/test/resources/NIOHttp.xml index 13f9ccca2dd..978d33449bb 100644 --- a/tests/test-integration/src/test/resources/NIOHttp.xml +++ b/tests/test-integration/src/test/resources/NIOHttp.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/NIOHttps.xml b/tests/test-integration/src/test/resources/NIOHttps.xml index db2513ef8b9..69f126cd5c9 100644 --- a/tests/test-integration/src/test/resources/NIOHttps.xml +++ b/tests/test-integration/src/test/resources/NIOHttps.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/RFC2616Base.xml b/tests/test-integration/src/test/resources/RFC2616Base.xml index 449b0174946..2ce56ecd6e4 100644 --- a/tests/test-integration/src/test/resources/RFC2616Base.xml +++ b/tests/test-integration/src/test/resources/RFC2616Base.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/RFC2616_Filters.xml b/tests/test-integration/src/test/resources/RFC2616_Filters.xml index f540bf0f7c9..5808ac05342 100644 --- a/tests/test-integration/src/test/resources/RFC2616_Filters.xml +++ b/tests/test-integration/src/test/resources/RFC2616_Filters.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/RFC2616_Redirects.xml b/tests/test-integration/src/test/resources/RFC2616_Redirects.xml index ab0c7c9da05..4781b7d53a1 100644 --- a/tests/test-integration/src/test/resources/RFC2616_Redirects.xml +++ b/tests/test-integration/src/test/resources/RFC2616_Redirects.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/add-jetty-test-webapp.xml b/tests/test-integration/src/test/resources/add-jetty-test-webapp.xml index 96e6c271d45..3af9297fc24 100644 --- a/tests/test-integration/src/test/resources/add-jetty-test-webapp.xml +++ b/tests/test-integration/src/test/resources/add-jetty-test-webapp.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/basic-server.xml b/tests/test-integration/src/test/resources/basic-server.xml index 74283e41641..8f02cfdcee2 100644 --- a/tests/test-integration/src/test/resources/basic-server.xml +++ b/tests/test-integration/src/test/resources/basic-server.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/deploy.xml b/tests/test-integration/src/test/resources/deploy.xml index 21a9bc9b187..179ce322cd2 100644 --- a/tests/test-integration/src/test/resources/deploy.xml +++ b/tests/test-integration/src/test/resources/deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/docroots/deployerror/badapp-unavailable-false.xml b/tests/test-integration/src/test/resources/docroots/deployerror/badapp-unavailable-false.xml index c51104ddc6b..473a6bc25a4 100644 --- a/tests/test-integration/src/test/resources/docroots/deployerror/badapp-unavailable-false.xml +++ b/tests/test-integration/src/test/resources/docroots/deployerror/badapp-unavailable-false.xml @@ -1,5 +1,5 @@ - + /badapp-uaf diff --git a/tests/test-integration/src/test/resources/docroots/deployerror/badapp.xml b/tests/test-integration/src/test/resources/docroots/deployerror/badapp.xml index 5c45d195481..f9ba58db42a 100644 --- a/tests/test-integration/src/test/resources/docroots/deployerror/badapp.xml +++ b/tests/test-integration/src/test/resources/docroots/deployerror/badapp.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/tests/test-integration/src/test/resources/login-service.xml b/tests/test-integration/src/test/resources/login-service.xml index 64bdfabd3a7..8ee388c2bbc 100644 --- a/tests/test-integration/src/test/resources/login-service.xml +++ b/tests/test-integration/src/test/resources/login-service.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/ssl.xml b/tests/test-integration/src/test/resources/ssl.xml index 88d6cf3e16f..f64e8a9d7cf 100644 --- a/tests/test-integration/src/test/resources/ssl.xml +++ b/tests/test-integration/src/test/resources/ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml b/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml index 7c7a5934411..81f752e18d5 100644 --- a/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml +++ b/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml @@ -1,5 +1,5 @@ - + /rfc2616-webapp /test-webapp-rfc2616.war diff --git a/tests/test-quickstart/src/test/resources/test-jndi.xml b/tests/test-quickstart/src/test/resources/test-jndi.xml index a683d5e5fe0..6fad94e3e9f 100644 --- a/tests/test-quickstart/src/test/resources/test-jndi.xml +++ b/tests/test-quickstart/src/test/resources/test-jndi.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-quickstart/src/test/resources/test-spec.xml b/tests/test-quickstart/src/test/resources/test-spec.xml index 9e6b25b2ed8..b77c82ff2af 100644 --- a/tests/test-quickstart/src/test/resources/test-spec.xml +++ b/tests/test-quickstart/src/test/resources/test-spec.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-quickstart/src/test/resources/test.xml b/tests/test-quickstart/src/test/resources/test.xml index 39e94e5a433..01ba7c555c8 100644 --- a/tests/test-quickstart/src/test/resources/test.xml +++ b/tests/test-quickstart/src/test/resources/test.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-webapps/test-websocket-client-provided-webapp/src/main/resources/jetty-websocket-httpclient.xml b/tests/test-webapps/test-websocket-client-provided-webapp/src/main/resources/jetty-websocket-httpclient.xml index 4e938193675..d370be62c4f 100644 --- a/tests/test-webapps/test-websocket-client-provided-webapp/src/main/resources/jetty-websocket-httpclient.xml +++ b/tests/test-webapps/test-websocket-client-provided-webapp/src/main/resources/jetty-websocket-httpclient.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/test-webapps/test-weld-cdi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/tests/test-webapps/test-weld-cdi-webapp/src/main/webapp/WEB-INF/jetty-env.xml index a079f8241a6..9d04986120c 100644 --- a/tests/test-webapps/test-weld-cdi-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/tests/test-webapps/test-weld-cdi-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,5 +1,5 @@ - +