Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Joakim Erdfelt 2024-06-21 07:00:39 -05:00
parent 3ec84034a6 d854cc42d2
commit aa723a2cdc
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
271 changed files with 418 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/enhancement-template.md vendored
View File

@ -8,7 +8,7 @@ labels: Enhancement
--- ---
**Jetty version(s)** **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** **Enhancement Description**

2
.github/ISSUE_TEMPLATE/issue-template.md vendored
View File

@ -8,7 +8,7 @@ labels: Bug
--- ---
**Jetty version(s)** **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) -->
**Jetty Environment** **Jetty Environment**
<!-- Applicable for jetty-12 only, choose: core, ee8, ee9, ee10 --> <!-- Applicable for jetty-12 only, choose: core, ee8, ee9, ee10 -->

28
.github/ISSUE_TEMPLATE/release-template.md vendored
View File

@ -16,18 +16,18 @@ This release process will produce releases:
- [x] Create the release(s) issue. - [x] Create the release(s) issue.
- [ ] Update the target Jetty version(s) in the issue. - [ ] Update the target Jetty version(s) in the issue.
- [ ] Update the target release date 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". - [ ] 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. - [ ] 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/eclipse/jetty.project/projects) - [ ] Update [GitHub Project(s)](https://github.com/jetty/jetty.project/projects)
+ [ ] Create new project for the next releases (not this release). + [ ] Create new project for the next releases (not this release).
+ [ ] Ensure new project is public (not private) + [ ] 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" + [ ] 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/eclipse/jetty.project/projects). Any tasks that are not-yet-started are moved to next releases. + [ ] 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/eclipse/jetty.project/network/updates) run dependabot if needed and review resulting PRs for inclusion. - [ ] 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. 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). - [ ] 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`. - [ ] 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. - [ ] Assign issue to "build manager", who will stage the releases.
+ [ ] Create and use branches `release/<ver>` to perform version specific release work from. + [ ] Create and use branches `release/<ver>` 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 9.4 release with Java 11.
+ [ ] Stage 10 release with Java 21. + [ ] Stage 10 release with Java 21.
+ [ ] Stage 11 release with Java 21. + [ ] Stage 11 release with Java 21.
+ [ ] Push release branches `release/<ver>` to to https://github.com/eclipse/jetty.project + [ ] Push release branches `release/<ver>` to to https://github.com/jetty/jetty.project
+ [ ] Push release tags `jetty-<ver>` to https://github.com/eclipse/jetty.project + [ ] Push release tags `jetty-<ver>` to https://github.com/jetty/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". + [ ] 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. - [ ] Assign issue to "test manager", who will oversee the testing of the staged releases.
+ [ ] Test [CometD](https://github.com/cometd/cometd). + [ ] Test [CometD](https://github.com/cometd/cometd).
+ [ ] Test [Reactive HttpClient](https://github.com/jetty-project/jetty-reactive-httpclient). + [ ] Test [Reactive HttpClient](https://github.com/jetty-project/jetty-reactive-httpclient).
+ [ ] Test [Load Generator](https://github.com/jetty-project/jetty-load-generator). + [ ] 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). + [ ] Test other [Jetty OSS integrations](https://jenkins.webtide.net/job/external_oss).
+ [ ] Check [TCK CI](https://jenkins.webtide.net/job/tck). + [ ] Check [TCK CI](https://jenkins.webtide.net/job/tck).
+ [ ] Test sponsored integrations. + [ ] Test sponsored integrations.
@ -53,12 +53,12 @@ This release process will produce releases:
- [ ] Promote staged releases. - [ ] Promote staged releases.
- [ ] Merge release branches back to main branches and delete release branches. - [ ] Merge release branches back to main branches and delete release branches.
- [ ] Verify release existence in Maven Central by triggering the Jenkins builds of CometD. - [ ] 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 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://eclipse.dev/jetty/download.php) page is updated. + [ ] Update (or check) [Download](https://jetty.org/download.html) page is updated.
+ [ ] Update (or check) documentation page(s) are updated. + [ ] Update (or check) documentation page(s) are updated.
- [ ] Publish GitHub Releases. - [ ] Publish GitHub Releases.
- [ ] Prepare release announcement for mailing lists. - [ ] 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 `VERSION.txt` to include any actual CVE number next to correspondent issue.
+ [ ] Edit any issues for CVEs in github with their CVE number + [ ] Edit any issues for CVEs in github with their CVE number
- [ ] Notify downstream maintainers. - [ ] Notify downstream maintainers.

6
CONTRIBUTING.md
View File

@ -16,7 +16,7 @@ Information regarding source code management, builds, coding standards, and more
- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/) - [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. completed the contributors agreement mentioned below we will endeavor to pull your commit into Jetty proper.
Eclipse Contributor Agreement Eclipse Contributor Agreement
@ -43,13 +43,13 @@ Search for bugs
---------------- ----------------
This project uses GitHub Issues to track ongoing development and issues. 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 Create a new bug
----------------- -----------------
Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome! 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 Reporting Security Issues
----------------- -----------------

2
Jenkinsfile-autobahn
View File

@ -18,7 +18,7 @@ pipeline {
stages { stages {
stage("Checkout Jetty Branch") { stage("Checkout Jetty Branch") {
steps { 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" ) { stage( "Build / Test - JDK11" ) {

2
SECURITY.md
View File

@ -2,7 +2,7 @@
## Supported Versions ## 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 ## Reporting a Vulnerability

2
VERSION.txt
View File

@ -90,6 +90,8 @@ jetty-10.0.18 - 26 October 2023
+ 10537 HTTP/3: Incomplete Data Transfer When Used with Spring Boot WebFlux + 10537 HTTP/3: Incomplete Data Transfer When Used with Spring Boot WebFlux
+ 10696 jetty.sh doesn't work with JETTY_USER in Jetty 10.0.17 thru Jetty + 10696 jetty.sh doesn't work with JETTY_USER in Jetty 10.0.17 thru Jetty
12.0.2 12.0.2
+ 10669 Provide ability to defer initial deployment of webapps until after
Server has started
+ 10705 Creating a `HTTP3ServerConnector` with a `SslContextFactory` that has + 10705 Creating a `HTTP3ServerConnector` with a `SslContextFactory` that has
a non-null `SSLContext` makes the server fail to start with an unclear error a non-null `SSLContext` makes the server fail to start with an unclear error
message message

2
demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- <!--
This is the jetty specific web application configuration file. When starting This is the jetty specific web application configuration file. When starting

2
demos/demo-jaas-webapp/src/main/config/modules/demo.d/demo-jaas.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the demo-jaas webapp --> <!-- Configure the demo-jaas webapp -->

2
demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Get name="servletContext"> <Get name="servletContext">

2
demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- ================================================================== <!-- ==================================================================
Configure and deploy the test web application in $(jetty.home)/webapps/test Configure and deploy the test web application in $(jetty.home)/webapps/test

2
demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-jetty.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- ================================================================== <!-- ==================================================================
Configure and deploy the test web application Configure and deploy the test web application

2
demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-moved-context.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- Simple handler to redirect from old path to new --> <!-- Simple handler to redirect from old path to new -->
<Configure class="org.eclipse.jetty.server.handler.MovedContextHandler"> <Configure class="org.eclipse.jetty.server.handler.MovedContextHandler">

2
demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the demos --> <!-- Configure the demos -->

2
demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- <!--
This is the jetty specific web application configuration file. When starting This is the jetty specific web application configuration file. When starting

2
demos/demo-jndi-webapp/src/main/config/modules/demo.d/demo-jndi.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the test-jndi webapp --> <!-- Configure the test-jndi webapp -->

2
demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the test-jndi webapp --> <!-- Configure the test-jndi webapp -->

2
demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the test-jndi webapp --> <!-- Configure the test-jndi webapp -->

2
demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">

2
demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Get name="servletContext"> <Get name="servletContext">

2
demos/demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Get name="servletContext"> <Get name="servletContext">

2
demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Get name="servletContext"> <Get name="servletContext">

2
demos/demo-spec/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext"> <Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/test-spec</Set> <Set name="contextPath">/test-spec</Set>

2
demos/demo-spec/demo-spec-webapp/src/main/templates/annotations-context-header.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->

2
demos/demo-spec/demo-spec-webapp/src/main/templates/plugin-context-header.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->

2
demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">

2
demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Get name="servletContext"> <Get name="servletContext">

2
demos/demo-spec/demo-spec-webapp/src/test/jetty-plugin-env.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">

2
demos/embedded/src/main/resources/exampleserver.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="ExampleServer" class="org.eclipse.jetty.server.Server"> <Configure id="ExampleServer" class="org.eclipse.jetty.server.Server">

2
demos/embedded/src/main/resources/fileserver.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="FileServer" class="org.eclipse.jetty.server.Server"> <Configure id="FileServer" class="org.eclipse.jetty.server.Server">

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/ant/jetty-ant.adoc
View File

@ -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: 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. 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/`. 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. 4. Copy all of the Jars in your Jetty distribution's `lib` directory, and all its subdirectories, into your new `jetty-lib` dir.

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc
View File

@ -72,7 +72,7 @@ Context files are normally located in `${jetty.base}/webapps/` (see `DeployerMan
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/test</Set> <Set name="contextPath">/test</Set>

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/bugs.adoc
View File

@ -17,5 +17,5 @@
As with any constantly evolving software project, there will be issues, features, and bugs. As with any constantly evolving software project, there will be issues, features, and bugs.
We want to know whats bugging you! 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]

4
documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc
View File

@ -49,7 +49,7 @@ Clone the repository:
[source, screen, subs="{sub-order}"] [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. 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: 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. 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.

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc
View File

@ -230,7 +230,7 @@ There are two git repositories you need to be aware of for releasing jetty-docum
jetty-documentation:: jetty-documentation::
https://github.com/jetty-project/jetty-documentation https://github.com/jetty-project/jetty-documentation
jetty-website:: 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: Do the following steps to publish documentation for the release:

4
documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc
View File

@ -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. 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:: Jetty Project Repository::
https://github.com/eclipse/jetty.project https://github.com/jetty/jetty.project
===== Build and Project Infrastructure SCM URLs ===== 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}"] [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 $ cd jetty.project
$ mvn install $ mvn install

12
documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc
View File

@ -41,7 +41,7 @@ For example, here is a descriptor file that deploys the file `/opt/myapp/myapp.w
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/wiki</Set> <Set name="contextPath">/wiki</Set>
@ -55,7 +55,7 @@ For example, if the system property is set to `myapp.home=/opt/myapp`, the previ
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/wiki</Set> <Set name="contextPath">/wiki</Set>
@ -83,7 +83,7 @@ This can help make it clear that users should not make changes to the temporary
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/wiki</Set> <Set name="contextPath">/wiki</Set>
@ -99,7 +99,7 @@ However, since the `web.xml` for the web application is processed after the depl
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/wiki</Set> <Set name="contextPath">/wiki</Set>
@ -120,7 +120,7 @@ This feature is useful when adding parameters or additional Servlet mappings wit
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/wiki</Set> <Set name="contextPath">/wiki</Set>
@ -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}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/wiki</Set> <Set name="contextPath">/wiki</Set>

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc
View File

@ -99,7 +99,7 @@ In the standard Jetty Distribution, this is configured in the `${jetty.home}/etc
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addBean"> <Call name="addBean">

10
documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc
View File

@ -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}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
@ -162,7 +162,7 @@ They will then be applied to each `WebAppContext` deployed by the deployer:
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
@ -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}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
@ -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}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
@ -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}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc
View File

@ -100,7 +100,7 @@ Otherwise, create a context xml file with the following information (in addition
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.quickstart.QuickStartWebApp"> <Configure class="org.eclipse.jetty.quickstart.QuickStartWebApp">
<Set name="autoPreconfigure">true</Set> <Set name="autoPreconfigure">true</Set>
</Configure> </Configure>

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc
View File

@ -20,7 +20,7 @@ Create a file called `scratch.xml` in the `${jetty.base}/webapps` directory and
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.server.handler.ContextHandler"> <Configure class="org.eclipse.jetty.server.handler.ContextHandler">
<Set name="contextPath">/scratch</Set> <Set name="contextPath">/scratch</Set>
<Set name="handler"> <Set name="handler">

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc
View File

@ -43,7 +43,7 @@ This is a permanent redirection, which also preserves `pathinfo` and query strin
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.server.handler.MovedContextHandler"> <Configure class="org.eclipse.jetty.server.handler.MovedContextHandler">
<Set name="contextPath">/foo</Set> <Set name="contextPath">/foo</Set>

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/fastcgi/configuring-fastcgi.adoc
View File

@ -44,7 +44,7 @@ Copy and paste the following content as `$JETTY_BASE/webapps/jetty-wordpress.xml
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.servlet.ServletContextHandler"> <Configure class="org.eclipse.jetty.servlet.ServletContextHandler">
<New id="root" class="java.lang.String"> <New id="root" class="java.lang.String">

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc
View File

@ -73,7 +73,7 @@ This module is equivalent to directly modifying the class path configuration wit
[source.XML, xml] [source.XML, xml]
------------------------------------------------------------- -------------------------------------------------------------
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Call name="prependServerClass"> <Call name="prependServerClass">
<Arg>-org.eclipse.jetty.util.Decorator</Arg> <Arg>-org.eclipse.jetty.util.Decorator</Arg>

6
documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc
View File

@ -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. 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 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: Here's the absolute minimal set of Jetty jars:
.Minimal Bundles .Minimal Bundles
@ -355,7 +355,7 @@ Here's an example of the contents of a `META-INF/jetty-webapp-context.xml` file:
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="defaultsDescriptor"><Property name="bundle.root"/>META-INF/webdefault.xml</Set> <Set name="defaultsDescriptor"><Property name="bundle.root"/>META-INF/webdefault.xml</Set>
@ -773,7 +773,7 @@ To set the pattern, you will need to provide your own etc files - see the sectio
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>

6
documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc
View File

@ -140,7 +140,7 @@ The deployer discovers and hot deploys context IoC descriptors like the followin
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<!-- <!--
Configure a custom context for serving javadoc as static resources Configure a custom context for serving javadoc as static resources
@ -199,7 +199,7 @@ To set the contextPath from within the WAR file, you can include a `WEB-INF/jett
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/contextpath</Set> <Set name="contextPath">/contextpath</Set>
@ -212,7 +212,7 @@ Instead of allowing the WAR file to be discovered by the deployer, an IoC XML fi
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/test.war</Set> <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/test.war</Set>

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-installing.adoc
View File

@ -19,7 +19,7 @@
The standalone Jetty distribution is available for download from the Eclipse Foundation: The standalone Jetty distribution is available for download from the Eclipse Foundation:
____ ____
*Jetty* *Jetty*
https://eclipse.dev/jetty/download.php https://jetty.org/download.html
____ ____
It is available in both zip and gzip formats; download the one most appropriate for your system. It is available in both zip and gzip formats; download the one most appropriate for your system.

4
documentation/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/jetty-env-xml.adoc
View File

@ -29,7 +29,7 @@ Jetty applies `jetty-env.xml` on a per-webapp basis, and configures an instance
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
.. ..
@ -52,7 +52,7 @@ Place the `jetty-env.xml` file in your web application's WEB-INF folder.
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/jetty-web-xml-config.adoc
View File

@ -28,7 +28,7 @@ For a more in-depth look at the syntax, see xref:jetty-xml-syntax[].
[source, xml, subs="{sub-order}"] [source, xml, subs="{sub-order}"]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
.. ..

4
documentation/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/jetty-xml-config.adoc
View File

@ -26,7 +26,7 @@
Not all Jetty features are configured in `jetty.xml`. Not all Jetty features are configured in `jetty.xml`.
There are several optional configuration files that share the same format as `jetty.xml` and, if specified, concatenate to it. There are several optional configuration files that share the same format as `jetty.xml` and, if specified, concatenate to it.
These configuration files are also stored in `$JETTY_HOME/etc/`, and examples of them are in http://github.com/eclipse/jetty.project/jetty-server/src/main/config/etc/[Github Repository]. These configuration files are also stored in `$JETTY_HOME/etc/`, and examples of them are in http://github.com/jetty/jetty.project/jetty-server/src/main/config/etc/[Github Repository].
The selection of which configuration files to use is controlled by `start.jar` and the process of merging configuration is described in xref:jetty-xml-usage[]. The selection of which configuration files to use is controlled by `start.jar` and the process of merging configuration is described in xref:jetty-xml-usage[].
[[root-element-jetty-xml]] [[root-element-jetty-xml]]
@ -38,7 +38,7 @@ The selection of which configuration files to use is controlled by `start.jar` a
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
... ...

10
documentation/jetty-documentation/src/main/asciidoc/operations-guide/annotations/chapter.adoc
View File

@ -48,7 +48,7 @@ Here's an example context xml file that calls this method:
[source,xml,subs=verbatim] [source,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1>
<Set name="configurationDiscovered">false</Set> <2> <Set name="configurationDiscovered">false</Set> <2>
@ -77,7 +77,7 @@ Here's an example from a context xml file that includes any jar whose name start
[source,xml,subs=verbatim] [source,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1>
<Call name="setAttribute"> <2> <Call name="setAttribute"> <2>
@ -108,7 +108,7 @@ Here's an example of a context xml file that sets a pattern that matches any jar
[source,xml,subs=verbatim] [source,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1>
<Call name="setAttribute"> <2> <Call name="setAttribute"> <2>
@ -174,7 +174,7 @@ Here's an example of setting the context attribute in a context xml file:
[source,xml,subs=verbatim] [source,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1>
<Call name="setAttribute"> <2> <Call name="setAttribute"> <2>
@ -205,7 +205,7 @@ Here is an example context xml file that ensures the `com.example.PrioritySCI` w
[source,xml,subs=verbatim] [source,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1>
<Call name="setAttribute"> <2> <Call name="setAttribute"> <2>

2
documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/download.adoc
View File

@ -14,7 +14,7 @@
[[og-begin-download]] [[og-begin-download]]
==== Downloading Jetty ==== Downloading Jetty
The Eclipse Jetty distribution is available for download from link:https://eclipse.dev/jetty/download.php[] The Eclipse Jetty distribution is available for download from link: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. 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.

2
documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-extract-war.adoc
View File

@ -24,7 +24,7 @@ If you do not want Jetty to extract the `+*.war+` files, you can disable this fe
[source,xml,highlight=8] [source,xml,highlight=8]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/mywebapp</Set> <Set name="contextPath">/mywebapp</Set>

4
documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-jetty.adoc
View File

@ -26,7 +26,7 @@ A simple Jetty context XML file, for example named `wiki.xml` is the following:
[source,xml,subs=verbatim] [source,xml,subs=verbatim]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1>
<Set name="contextPath">/wiki</Set> <2> <Set name="contextPath">/wiki</Set> <2>
@ -60,7 +60,7 @@ You can use the features of xref:og-xml[Jetty XML files] to avoid to hard-code f
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/wiki</Set> <Set name="contextPath">/wiki</Set>

2
documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-jndi.adoc
View File

@ -21,7 +21,7 @@ The JNDI entry must be _defined_ in a xref:og-jndi-xml[Jetty XML file], for exam
[source,xml,subs=normal] [source,xml,subs=normal]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext"> <Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/mywebapp</Set> <Set name="contextPath">/mywebapp</Set>

2
documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-override-webxml.adoc
View File

@ -22,7 +22,7 @@ This allows you to add host specific configuration or server specific configurat
[source,xml,highlight=8] [source,xml,highlight=8]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/mywebapp</Set> <Set name="contextPath">/mywebapp</Set>

10
documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-virtual-hosts.adoc
View File

@ -56,7 +56,7 @@ If you have a web application `mywebapp.war` you can configure its virtual hosts
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/mywebapp</Set> <Set name="contextPath">/mywebapp</Set>
@ -101,7 +101,7 @@ To achieve this, you simply use the same context path of `/` for each of your we
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/</Set> <Set name="contextPath">/</Set>
@ -118,7 +118,7 @@ To achieve this, you simply use the same context path of `/` for each of your we
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/</Set> <Set name="contextPath">/</Set>
@ -146,7 +146,7 @@ In this case, you want to xref:og-protocols[configure multiple connectors], each
[source,xml,highlight=10] [source,xml,highlight=10]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/</Set> <Set name="contextPath">/</Set>
@ -163,7 +163,7 @@ In this case, you want to xref:og-protocols[configure multiple connectors], each
[source,xml,highlight=10] [source,xml,highlight=10]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/</Set> <Set name="contextPath">/</Set>

2
documentation/jetty-documentation/src/main/asciidoc/operations-guide/index.adoc
View File

@ -11,7 +11,7 @@
// ======================================================================== // ========================================================================
// //
:doctitle: link:https://eclipse.org/jetty[Eclipse Jetty]: Operations Guide :doctitle: link:https://jetty.org[Eclipse Jetty]: Operations Guide
:toc-title: Operations Guide :toc-title: Operations Guide
:idprefix: og- :idprefix: og-
:docinfo: private-head :docinfo: private-head

4
documentation/jetty-documentation/src/main/asciidoc/operations-guide/jaas/chapter.adoc
View File

@ -96,7 +96,7 @@ Here's an example of this type of XML file:
[source,xml] [source,xml]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
@ -114,7 +114,7 @@ Here's an example of this type of XML file:
[source,xml] [source,xml]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="securityHandler"> <Set name="securityHandler">
<New class="org.eclipse.jetty.security.ConstraintSecurityHandler"> <New class="org.eclipse.jetty.security.ConstraintSecurityHandler">

2
documentation/jetty-documentation/src/main/asciidoc/operations-guide/jsp/chapter.adoc
View File

@ -195,7 +195,7 @@ Here's an example of using a context xml file to add in a pattern to match files
[source,xml,subs=verbatim] [source,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <!--1--> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <!--1-->
<Call name="setAttribute"> <!--2--> <Call name="setAttribute"> <!--2-->

4
documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc
View File

@ -43,7 +43,7 @@ Start with the custom Jetty XML file, `$JETTY_BASE/etc/custom-ssl.xml`:
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Ref refid="sslContextFactory"> <!--1--> <Ref refid="sslContextFactory"> <!--1-->
<Set name="CipherComparator"> <!--2--> <Set name="CipherComparator"> <!--2-->
@ -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] [source,xml,subs=verbatim,options=nowrap]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Ref refid="httpConnector"> <!--1--> <Ref refid="httpConnector"> <!--1-->
<Call name="addBean"> <!--2--> <Call name="addBean"> <!--2-->

4
documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc
View File

@ -85,7 +85,7 @@ For example, a Jetty XML file that allocates Jetty's `QueuedThreadPool` could be
.jetty-threadpool.xml .jetty-threadpool.xml
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<New id="threadPool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"> <New id="threadPool" class="org.eclipse.jetty.util.thread.QueuedThreadPool">
<Set name="maxThreads" type="int"> <Set name="maxThreads" type="int">
@ -235,7 +235,7 @@ The `custom-server.xml` file is the following:
[source,xml] [source,xml]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="Server" class="com.acme.server.CustomJettyServer"> <Configure id="Server" class="com.acme.server.CustomJettyServer">
</Configure> </Configure>
---- ----

6
documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc
View File

@ -59,7 +59,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ
[source,xml,subs=verbatim] [source,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Ref refid="sslContextFactory"> <Ref refid="sslContextFactory">
@ -85,7 +85,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable
[source,xml] [source,xml]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Ref refid="sslContextFactory"> <Ref refid="sslContextFactory">
@ -110,7 +110,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty'
[source,xml] [source,xml]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Ref refid="sslContextFactory"> <Ref refid="sslContextFactory">

2
documentation/jetty-documentation/src/main/asciidoc/operations-guide/sessions/session-infinispan.adoc
View File

@ -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). 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. 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. We have provided a conversion program which will convert any sessions stored in Infinispan to the new format.

38
documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc
View File

@ -21,7 +21,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Get id="stderr" class="java.lang.System" name="err"> <Get id="stderr" class="java.lang.System" name="err">
@ -33,7 +33,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Get> <Get>
@ -60,7 +60,7 @@ The following Jetty XML creates an empty `String` and assigns it the id `mystrin
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="mystring" class="java.lang.String" /> <Configure id="mystring" class="java.lang.String" />
---- ----
@ -88,7 +88,7 @@ The following example creates a minimal Jetty `Server`:
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.server.Server"> <Configure class="org.eclipse.jetty.server.Server">
<Arg type="int">8080</Arg> <Arg type="int">8080</Arg>
@ -102,7 +102,7 @@ Arguments may also have a `name` attribute, which is matched with the correspond
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.server.Server"> <Configure class="org.eclipse.jetty.server.Server">
<Arg name="port" type="int">8080</Arg> <Arg name="port" type="int">8080</Arg>
@ -122,7 +122,7 @@ The following example creates an `ArrayList`:
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<New id="mylist" class="java.util.ArrayList"> <New id="mylist" class="java.util.ArrayList">
@ -149,7 +149,7 @@ Within element `<Call>` the return value, if the return type is not `void`, is i
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<New class="java.util.ArrayList"> <New class="java.util.ArrayList">
@ -173,7 +173,7 @@ It is possible to call `static` methods by specifying the `class` attribute:
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Call id="myhost" name="getByName" class="java.net.InetAddress"> <Call id="myhost" name="getByName" class="java.net.InetAddress">
@ -196,7 +196,7 @@ For example:
[source,xml,subs=normal] [source,xml,subs=normal]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Call class="java.util.concurrent.Executors" name="newSingleThreadScheduledExecutor"> <Call class="java.util.concurrent.Executors" name="newSingleThreadScheduledExecutor">
@ -225,7 +225,7 @@ If the JavaBean property is `foo` (or `Foo`), `<Get>` first attempts to invoke _
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="server" class="org.eclipse.jetty.server.Server"> <Configure id="server" class="org.eclipse.jetty.server.Server">
<!-- Invokes getter method server.getVersion() --> <!-- Invokes getter method server.getVersion() -->
@ -252,7 +252,7 @@ If the JavaBean property is `foo` (or `Foo`), `<Set>` first attempts to invoke _
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="server" class="org.eclipse.jetty.server.Server"> <Configure id="server" class="org.eclipse.jetty.server.Server">
<!-- The value in the <Set> scope is the string "true" --> <!-- The value in the <Set> scope is the string "true" -->
@ -277,7 +277,7 @@ The map entries are specified with a sequence of `<Entry>` elements, each with e
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Map class="java.util.concurrent.ConcurrentHashMap"> <Map class="java.util.concurrent.ConcurrentHashMap">
@ -302,7 +302,7 @@ You can only specify the key value via the `name` attribute, so the key can only
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<New class="java.util.Properties"> <New class="java.util.Properties">
@ -323,7 +323,7 @@ Element `<Array>` creates a new array, whose component type may be specified by
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Array type="java.lang.Object"> <Array type="java.lang.Object">
@ -347,7 +347,7 @@ You must give a unique `id` attribute to the objects you want to reference.
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- The Jetty Server has id="server" --> <!-- The Jetty Server has id="server" -->
<Configure id="server" class="org.eclipse.jetty.server.Server"> <Configure id="server" class="org.eclipse.jetty.server.Server">
@ -381,7 +381,7 @@ For example, you may want to configure the context path of your web application
[source,xml,subs=normal] [source,xml,subs=normal]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath"> <Set name="contextPath">
@ -407,7 +407,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="server" class="org.eclipse.jetty.server.Server"> <Configure id="server" class="org.eclipse.jetty.server.Server">
<Arg type="int"> <Arg type="int">
@ -430,7 +430,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="server" class="org.eclipse.jetty.server.Server"> <Configure id="server" class="org.eclipse.jetty.server.Server">
<Arg type="int"> <Arg type="int">
@ -462,7 +462,7 @@ The following example illustrates how scopes work:
[source,xml] [source,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="server" class="org.eclipse.jetty.server.Server"> <Configure id="server" class="org.eclipse.jetty.server.Server">
<Arg type="int">8080</Arg> <Arg type="int">8080</Arg>

2
documentation/jetty-documentation/src/main/asciidoc/programming-guide/index.adoc
View File

@ -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 :toc-title: Jetty Programming Guide
:idprefix: pg- :idprefix: pg-
:docinfo: private-head :docinfo: private-head

10
documentation/jetty/modules/operations-guide/pages/annotations/index.adoc
View File

@ -47,7 +47,7 @@ Here's an example context xml file that calls this method:
[,xml,subs=verbatim] [,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1>
<Set name="configurationDiscovered">false</Set> <2> <Set name="configurationDiscovered">false</Set> <2>
@ -76,7 +76,7 @@ Here's an example from a context xml file that includes any jar whose name start
[,xml,subs=verbatim] [,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1>
<Call name="setAttribute"> <2> <Call name="setAttribute"> <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] [,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1>
<Call name="setAttribute"> <2> <Call name="setAttribute"> <2>
@ -173,7 +173,7 @@ Here's an example of setting the context attribute in a context xml file:
[,xml,subs=verbatim] [,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1>
<Call name="setAttribute"> <2> <Call name="setAttribute"> <2>
@ -204,7 +204,7 @@ Here is an example context xml file that ensures the `com.example.PrioritySCI` w
[,xml,subs=verbatim] [,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1>
<Call name="setAttribute"> <2> <Call name="setAttribute"> <2>

2
documentation/jetty/modules/operations-guide/pages/begin/index.adoc
View File

@ -56,7 +56,7 @@ Read the xref:arch/index.adoc[Jetty architecture section] for more information a
[[download]] [[download]]
== Downloading Jetty == 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. 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.

20
documentation/jetty/modules/operations-guide/pages/deploy/index.adoc
View File

@ -83,7 +83,7 @@ A simple Jetty context XML file, for example named `wiki.xml` is the following:
[,xml,subs=verbatim] [,xml,subs=verbatim]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <1>
<Set name="contextPath">/wiki</Set> <2> <Set name="contextPath">/wiki</Set> <2>
@ -117,7 +117,7 @@ You can use the features of xref:xml/index.adoc[Jetty XML files] to avoid to har
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/wiki</Set> <Set name="contextPath">/wiki</Set>
@ -141,7 +141,7 @@ The JNDI entry must be _defined_ in a xref:jndi/index.adoc#xml[Jetty XML file],
[,xml,subs=normal] [,xml,subs=normal]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext"> <Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/mywebapp</Set> <Set name="contextPath">/mywebapp</Set>
@ -215,7 +215,7 @@ If you have a web application `mywebapp.war` you can configure its virtual hosts
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/mywebapp</Set> <Set name="contextPath">/mywebapp</Set>
@ -260,7 +260,7 @@ To achieve this, you simply use the same context path of `/` for each of your we
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/</Set> <Set name="contextPath">/</Set>
@ -277,7 +277,7 @@ To achieve this, you simply use the same context path of `/` for each of your we
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/</Set> <Set name="contextPath">/</Set>
@ -305,7 +305,7 @@ In this case, you want to xref:protocols/index.adoc[configure multiple connector
[,xml,highlight=10] [,xml,highlight=10]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/</Set> <Set name="contextPath">/</Set>
@ -322,7 +322,7 @@ In this case, you want to xref:protocols/index.adoc[configure multiple connector
[,xml,highlight=10] [,xml,highlight=10]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/</Set> <Set name="contextPath">/</Set>
@ -357,7 +357,7 @@ If you do not want Jetty to extract the `+*.war+` files, you can disable this fe
[,xml,highlight=8] [,xml,highlight=8]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/mywebapp</Set> <Set name="contextPath">/mywebapp</Set>
@ -377,7 +377,7 @@ This allows you to add host specific configuration or server specific configurat
[,xml,highlight=8] [,xml,highlight=8]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/mywebapp</Set> <Set name="contextPath">/mywebapp</Set>

4
documentation/jetty/modules/operations-guide/pages/jaas/index.adoc
View File

@ -95,7 +95,7 @@ Here's an example of this type of XML file:
[,xml] [,xml]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
@ -113,7 +113,7 @@ Here's an example of this type of XML file:
[,xml] [,xml]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="securityHandler"> <Set name="securityHandler">
<New class="org.eclipse.jetty.security.ConstraintSecurityHandler"> <New class="org.eclipse.jetty.security.ConstraintSecurityHandler">

2
documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc
View File

@ -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] [,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <!--1--> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <!--1-->
<Call name="setAttribute"> <!--2--> <Call name="setAttribute"> <!--2-->

4
documentation/jetty/modules/operations-guide/pages/modules/custom.adoc
View File

@ -42,7 +42,7 @@ Start with the custom Jetty XML file, `$JETTY_BASE/etc/custom-ssl.xml`:
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Ref refid="sslContextFactory"> <!--1--> <Ref refid="sslContextFactory"> <!--1-->
<Set name="CipherComparator"> <!--2--> <Set name="CipherComparator"> <!--2-->
@ -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] [,xml,subs=verbatim,options=nowrap]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Ref refid="httpConnector"> <!--1--> <Ref refid="httpConnector"> <!--1-->
<Call name="addBean"> <!--2--> <Call name="addBean"> <!--2-->

4
documentation/jetty/modules/operations-guide/pages/modules/index.adoc
View File

@ -84,7 +84,7 @@ For example, a Jetty XML file that allocates Jetty's `QueuedThreadPool` could be
.jetty-threadpool.xml .jetty-threadpool.xml
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<New id="threadPool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"> <New id="threadPool" class="org.eclipse.jetty.util.thread.QueuedThreadPool">
<Set name="maxThreads" type="int"> <Set name="maxThreads" type="int">
@ -234,7 +234,7 @@ The `custom-server.xml` file is the following:
[,xml] [,xml]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="Server" class="com.acme.server.CustomJettyServer"> <Configure id="Server" class="com.acme.server.CustomJettyServer">
</Configure> </Configure>
---- ----

6
documentation/jetty/modules/operations-guide/pages/protocols/index.adoc
View File

@ -498,7 +498,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ
[,xml,subs=verbatim] [,xml,subs=verbatim]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Ref refid="sslContextFactory"> <Ref refid="sslContextFactory">
@ -524,7 +524,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable
[,xml] [,xml]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Ref refid="sslContextFactory"> <Ref refid="sslContextFactory">
@ -549,7 +549,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty'
[,xml] [,xml]
---- ----
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Ref refid="sslContextFactory"> <Ref refid="sslContextFactory">

2
documentation/jetty/modules/operations-guide/pages/session/index.adoc
View File

@ -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). 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. 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. We have provided a conversion program which will convert any sessions stored in Infinispan to the new format.

38
documentation/jetty/modules/operations-guide/pages/xml/index.adoc
View File

@ -31,7 +31,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Get id="stderr" class="java.lang.System" name="err"> <Get id="stderr" class="java.lang.System" name="err">
@ -43,7 +43,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Get> <Get>
@ -70,7 +70,7 @@ The following Jetty XML creates an empty `String` and assigns it the id `mystrin
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="mystring" class="java.lang.String" /> <Configure id="mystring" class="java.lang.String" />
---- ----
@ -98,7 +98,7 @@ The following example creates a minimal Jetty `Server`:
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.server.Server"> <Configure class="org.eclipse.jetty.server.Server">
<Arg type="int">8080</Arg> <Arg type="int">8080</Arg>
@ -112,7 +112,7 @@ Arguments may also have a `name` attribute, which is matched with the correspond
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.server.Server"> <Configure class="org.eclipse.jetty.server.Server">
<Arg name="port" type="int">8080</Arg> <Arg name="port" type="int">8080</Arg>
@ -132,7 +132,7 @@ The following example creates an `ArrayList`:
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<New id="mylist" class="java.util.ArrayList"> <New id="mylist" class="java.util.ArrayList">
@ -159,7 +159,7 @@ Within element `<Call>` the return value, if the return type is not `void`, is i
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<New class="java.util.ArrayList"> <New class="java.util.ArrayList">
@ -183,7 +183,7 @@ It is possible to call `static` methods by specifying the `class` attribute:
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Call id="myhost" name="getByName" class="java.net.InetAddress"> <Call id="myhost" name="getByName" class="java.net.InetAddress">
@ -206,7 +206,7 @@ For example:
[,xml,subs=normal] [,xml,subs=normal]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Call class="java.util.concurrent.Executors" name="newSingleThreadScheduledExecutor"> <Call class="java.util.concurrent.Executors" name="newSingleThreadScheduledExecutor">
@ -235,7 +235,7 @@ If the JavaBean property is `foo` (or `Foo`), `<Get>` first attempts to invoke _
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="server" class="org.eclipse.jetty.server.Server"> <Configure id="server" class="org.eclipse.jetty.server.Server">
<!-- Invokes getter method server.getVersion() --> <!-- Invokes getter method server.getVersion() -->
@ -262,7 +262,7 @@ If the JavaBean property is `foo` (or `Foo`), `<Set>` first attempts to invoke _
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="server" class="org.eclipse.jetty.server.Server"> <Configure id="server" class="org.eclipse.jetty.server.Server">
<!-- The value in the <Set> scope is the string "true" --> <!-- The value in the <Set> scope is the string "true" -->
@ -287,7 +287,7 @@ The map entries are specified with a sequence of `<Entry>` elements, each with e
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Map class="java.util.concurrent.ConcurrentHashMap"> <Map class="java.util.concurrent.ConcurrentHashMap">
@ -312,7 +312,7 @@ You can only specify the key value via the `name` attribute, so the key can only
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<New class="java.util.Properties"> <New class="java.util.Properties">
@ -333,7 +333,7 @@ Element `<Array>` creates a new array, whose component type may be specified by
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure> <Configure>
<Array type="java.lang.Object"> <Array type="java.lang.Object">
@ -357,7 +357,7 @@ You must give a unique `id` attribute to the objects you want to reference.
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- The Jetty Server has id="server" --> <!-- The Jetty Server has id="server" -->
<Configure id="server" class="org.eclipse.jetty.server.Server"> <Configure id="server" class="org.eclipse.jetty.server.Server">
@ -391,7 +391,7 @@ For example, you may want to configure the context path of your web application
[,xml,subs=normal] [,xml,subs=normal]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath"> <Set name="contextPath">
@ -417,7 +417,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="server" class="org.eclipse.jetty.server.Server"> <Configure id="server" class="org.eclipse.jetty.server.Server">
<Arg type="int"> <Arg type="int">
@ -440,7 +440,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="server" class="org.eclipse.jetty.server.Server"> <Configure id="server" class="org.eclipse.jetty.server.Server">
<Arg type="int"> <Arg type="int">
@ -472,7 +472,7 @@ The following example illustrates how scopes work:
[,xml] [,xml]
---- ----
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="server" class="org.eclipse.jetty.server.Server"> <Configure id="server" class="org.eclipse.jetty.server.Server">
<Arg type="int">8080</Arg> <Arg type="int">8080</Arg>

2
jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector"> <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">

2
jetty-cdi/src/main/config/etc/cdi/jetty-cdi.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="setAttribute"> <Call name="setAttribute">

2
jetty-deploy/src/main/config/etc/jetty-decorate.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- Bind the jetty-web-decorate.xml to every deployed webapp --> <!-- Bind the jetty-web-decorate.xml to every deployed webapp -->

2
jetty-deploy/src/main/config/etc/jetty-deploy.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Create the deployment manager --> <!-- Create the deployment manager -->

2
jetty-deploy/src/main/config/etc/jetty-web-decorate.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext" id="context"> <Configure class="org.eclipse.jetty.webapp.WebAppContext" id="context">

2
jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Ref refid="DeploymentManager"> <Ref refid="DeploymentManager">

2
jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">

4
jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentTempDirTest.java
View File

@ -101,7 +101,7 @@ public class DeploymentTempDirTest
public void testTmpDirectory() throws Exception public void testTmpDirectory() throws Exception
{ {
Path warPath = MavenTestingUtils.getTestResourcePath("webapps/foo-webapp-1.war"); Path warPath = MavenTestingUtils.getTestResourcePath("webapps/foo-webapp-1.war");
String deploymentXml = "<!DOCTYPE Configure PUBLIC \"-//Jetty//Configure//EN\" \"https://www.eclipse.org/jetty/configure_10_0.dtd\">\n" + String deploymentXml = "<!DOCTYPE Configure PUBLIC \"-//Jetty//Configure//EN\" \"https://jetty.org/configure_10_0.dtd\">\n" +
"<Configure class=\"org.eclipse.jetty.webapp.WebAppContext\">\n" + "<Configure class=\"org.eclipse.jetty.webapp.WebAppContext\">\n" +
"<Set name=\"war\">" + warPath + "</Set>\n" + "<Set name=\"war\">" + warPath + "</Set>\n" +
"<Set name=\"tempDirectory\">" + tmpDir + "</Set>\n" + "<Set name=\"tempDirectory\">" + tmpDir + "</Set>\n" +
@ -145,7 +145,7 @@ public class DeploymentTempDirTest
public void testPersistentTmpDirectory() throws Exception public void testPersistentTmpDirectory() throws Exception
{ {
Path warPath = MavenTestingUtils.getTestResourcePath("webapps/foo-webapp-1.war"); Path warPath = MavenTestingUtils.getTestResourcePath("webapps/foo-webapp-1.war");
String deploymentXml = "<!DOCTYPE Configure PUBLIC \"-//Jetty//Configure//EN\" \"https://www.eclipse.org/jetty/configure_10_0.dtd\">\n" + String deploymentXml = "<!DOCTYPE Configure PUBLIC \"-//Jetty//Configure//EN\" \"https://jetty.org/configure_10_0.dtd\">\n" +
"<Configure class=\"org.eclipse.jetty.webapp.WebAppContext\">\n" + "<Configure class=\"org.eclipse.jetty.webapp.WebAppContext\">\n" +
"<Set name=\"war\">" + warPath + "</Set>\n" + "<Set name=\"war\">" + warPath + "</Set>\n" +
"<Set name=\"tempDirectory\">" + tmpDir + "</Set>\n" + "<Set name=\"tempDirectory\">" + tmpDir + "</Set>\n" +

2
jetty-deploy/src/test/resources/binding-test-contexts-1.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">

2
jetty-deploy/src/test/resources/context-binding-test-1.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Call name="getServerClassMatcher"> <Call name="getServerClassMatcher">
<Call name="include"> <Call name="include">

2
jetty-deploy/src/test/resources/jetty-deploy-wars.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">

2
jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addBean"> <Call name="addBean">

2
jetty-deploy/src/test/resources/jetty-http.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" --> <!-- Configure the Jetty Server instance with an ID "Server" -->

2
jetty-deploy/src/test/resources/jetty.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Documentation of this file format can be found at: --> <!-- Documentation of this file format can be found at: -->

2
jetty-deploy/src/test/resources/webapps/badapp/badapp.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/badapp</Set> <Set name="contextPath">/badapp</Set>

2
jetty-deploy/src/test/resources/webapps/foo.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/foo</Set> <Set name="contextPath">/foo</Set>
<Set name="war"> <Set name="war">

2
jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">

2
jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">

2
jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">

2
jetty-home/src/main/resources/README.adoc
View File

@ -6,7 +6,7 @@ The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a:
* Servlet Container * Servlet Container
* Java HTTP & WebSocket Client * 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/[]. The Jetty documentation is available at link:https://eclipse.dev/jetty/documentation/[].

2
jetty-home/src/main/resources/etc/jetty-halt.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addEventListener"> <Call name="addEventListener">

2
jetty-home/src/main/resources/etc/jetty-setuid.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<!-- ================================================================ --> <!-- ================================================================ -->
<!-- Configure the Jetty SetUIDListener --> <!-- Configure the Jetty SetUIDListener -->

2
jetty-home/src/main/resources/etc/jetty-stop.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure id="Stop" class="org.eclipse.jetty.util.component.StopLifeCycle"> <Configure id="Stop" class="org.eclipse.jetty.util.component.StopLifeCycle">
<Arg><Ref refid="Server"/></Arg> <Arg><Ref refid="Server"/></Arg>

2
jetty-home/src/main/resources/modules/conscrypt/conscrypt.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
<Configure id="Conscrypt" class="org.conscrypt.OpenSSLProvider"> <Configure id="Conscrypt" class="org.conscrypt.OpenSSLProvider">
<Call class="java.security.Security" name="addProvider"> <Call class="java.security.Security" name="addProvider">
<Arg><Ref refid="Conscrypt"/></Arg> <Arg><Ref refid="Conscrypt"/></Arg>

Some files were not shown because too many files have changed in this diff Show More