diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index afd1bc0e44a9..867255013d36 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ Developer resources -------------------- Information regarding source code management, builds, coding standards, and more. -- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/) +- [https://jetty.org/docs/](https://jetty.org/docs/) 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. diff --git a/NOTICE.txt b/NOTICE.txt index afb099daecf9..2dcdea51d20d 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2,7 +2,7 @@ Notices for Eclipse Jetty ========================= This content is produced and maintained by the Eclipse Jetty project. -Project home: https://eclipse.dev/jetty/ +Project home: https://jetty.org/ Trademarks ---------- diff --git a/README.md b/README.md index 425fd311c709..d4fc91065e5a 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Documentation Project documentation is available on the Jetty Eclipse website. -- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/) +- [https://jetty.org/docs/](https://jetty.org/docs/) Building ======== diff --git a/SECURITY.md b/SECURITY.md index 7d4940ff2919..e25a9c84013a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -10,7 +10,7 @@ Do not open a public issue to report a security vulnerability. Please send a me ## Handling a Vulnerability -The [following checklist](https://eclipse.dev/jetty/security_processes.php) is used to handle security issues: +The [following checklist](https://jetty.org/security_processes.php) is used to handle security issues: - [ ] On receipt of a security report via security@webtide.com or other channels, if it cannot be trivially dismissed (already fixed, known not a problem, etc.), then a Github security advisory is created by project leadership. - [ ] Copy this list as a markdown in the security advisory for tracking the completion of various tasks. diff --git a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html index f6c6785184f1..016c0e4887e7 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html +++ b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html @@ -9,9 +9,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
diff --git a/demos/demo-jaas-webapp/src/main/webapp/index.html b/demos/demo-jaas-webapp/src/main/webapp/index.html index 0079d66c6080..e00334b68f49 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/index.html +++ b/demos/demo-jaas-webapp/src/main/webapp/index.html @@ -9,9 +9,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -21,7 +21,7 @@

JAAS Demo

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

diff --git a/demos/demo-jaas-webapp/src/main/webapp/login.html b/demos/demo-jaas-webapp/src/main/webapp/login.html index e4ba0d5715e9..a8f7c64a4d13 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/login.html +++ b/demos/demo-jaas-webapp/src/main/webapp/login.html @@ -6,9 +6,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
diff --git a/demos/demo-jetty-webapp/src/main/webapp/auth.html b/demos/demo-jetty-webapp/src/main/webapp/auth.html index 7e4a587a202e..c5c3ba7da32b 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/auth.html +++ b/demos/demo-jetty-webapp/src/main/webapp/auth.html @@ -9,9 +9,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
diff --git a/demos/demo-jetty-webapp/src/main/webapp/index.html b/demos/demo-jetty-webapp/src/main/webapp/index.html index e0bcd318b2e1..6015956397e1 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/index.html +++ b/demos/demo-jetty-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -20,7 +20,7 @@

Eclipse Jetty Demo Webapp

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

Jetty Tests:

diff --git a/demos/demo-jetty-webapp/src/main/webapp/remote.html b/demos/demo-jetty-webapp/src/main/webapp/remote.html index aa6e337c80fa..5a6c67727cc3 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/remote.html +++ b/demos/demo-jetty-webapp/src/main/webapp/remote.html @@ -8,9 +8,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
diff --git a/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html index 1879be6a4c71..8d0b7f2c8b2c 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html +++ b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html @@ -9,9 +9,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
diff --git a/demos/demo-jndi-webapp/src/main/webapp/index.html b/demos/demo-jndi-webapp/src/main/webapp/index.html index 3972d02649bc..311ba6542561 100644 --- a/demos/demo-jndi-webapp/src/main/webapp/index.html +++ b/demos/demo-jndi-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -20,7 +20,7 @@

Eclipse Jetty JNDI Demo Webapp

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

diff --git a/demos/demo-jsp-webapp/src/main/webapp/index.jsp b/demos/demo-jsp-webapp/src/main/webapp/index.jsp index 0c861cd6444b..a53d45b47cf0 100644 --- a/demos/demo-jsp-webapp/src/main/webapp/index.jsp +++ b/demos/demo-jsp-webapp/src/main/webapp/index.jsp @@ -10,9 +10,9 @@

Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
@@ -22,7 +22,7 @@

Eclipse Jetty JSP Demo Webapp

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

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

diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html index 5a02b4c7a9ff..9bb62b37f88f 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html +++ b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
diff --git a/demos/demo-template/src/main/resources/index.html b/demos/demo-template/src/main/resources/index.html index 7bc052c818f2..7ab19ab72ff3 100644 --- a/demos/demo-template/src/main/resources/index.html +++ b/demos/demo-template/src/main/resources/index.html @@ -10,9 +10,9 @@
Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
diff --git a/documentation/jetty-documentation/src/main/asciidoc/index.adoc b/documentation/jetty-documentation/src/main/asciidoc/index.adoc index 7f8e049f6def..82fdd11c0fa7 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/index.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/index.adoc @@ -23,7 +23,7 @@ The Eclipse Jetty Operations Guide targets sysops, devops, and developers who wa The Eclipse Jetty Programming Guide targets developers who want to use the Eclipse Jetty libraries in their applications, and advanced sysops/devops that want to customize the deployment of web applications. -== https://eclipse.dev/jetty/documentation/contribution-guide/index.html[Jetty Contribution Guide] +== https://jetty.org/docs/contribution-guide/index.html[Jetty Contribution Guide] The Eclipse Jetty Programming Guide targets developers that wish to contribute to the Jetty Project with code patches or documentation improvements. diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc index 61f1bd8c699b..78314c615f7f 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc @@ -17,7 +17,7 @@ ==== Setting up the Classpath You will need to place the following Jetty jar files onto the classpath of your application. -You can obtain them from the https://eclipse.dev/jetty/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]: +You can obtain them from the https://jetty.org/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]: .... jetty-plus.jar diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc index 610f813b0d47..378b8f1ee4f6 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc @@ -246,7 +246,7 @@ Make sure you follow the other examples and include the `rel="nofollow"` attribu ____ [NOTE] -There is a separate Jenkins build job that publishes documentation to https://eclipse.dev/jetty/documentation/ triggered by a push of changed files to the jetty-documentation project. +There is a separate Jenkins build job that publishes documentation to https://jetty.org/docs/ triggered by a push of changed files to the jetty-documentation project. If you commit your change to the number from step 2, then these builds will use the same release version number. It is preferable if you _don't_ commit that version number change, or better yet, ensure that it is set to the next -SNAPSHOT version number for your jetty major release number. ____ diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc index ec9cd77b7b01..869796376960 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc @@ -73,7 +73,7 @@ This module is equivalent to directly modifying the class path configuration wit [source.XML, xml] ------------------------------------------------------------- - + -org.eclipse.jetty.util.Decorator diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc index 11da3b7bccba..89e33a2326c1 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc @@ -24,7 +24,7 @@ To start Jetty on the default port of 8080, run the following command: ---- $ java -jar start.jar 2017-09-20 15:45:11.986:INFO::main: Logging initialized @683ms to org.eclipse.jetty.util.log.StdErrLog -2017-09-20 15:45:12.197:WARN:oejs.HomeBaseWarning:main: This instance of Jetty is not running from a separate {jetty.base} directory, this is not recommended. See documentation at https://eclipse.dev/jetty/documentation/ +2017-09-20 15:45:12.197:WARN:oejs.HomeBaseWarning:main: This instance of Jetty is not running from a separate {jetty.base} directory, this is not recommended. See documentation at https://jetty.org/docs/ 2017-09-20 15:45:12.243:INFO:oejs.Server:main: {VERSION} 2017-09-20 15:45:12.266:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:///installs/repository/jetty/webapps/] at interval 1 2017-09-20 15:45:12.298:INFO:oejs.AbstractConnector:main: Started ServerConnector@39c0f4a{HTTP/1.1,[http/1.1]}{0.0.0.0:8080} diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot b/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot index ba0ed5406094..b78647f17393 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot @@ -1,7 +1,7 @@ /* * GraphViz Graph of Jetty Modules * - * Jetty: https://eclipse.dev/jetty/ + * Jetty: https://jetty.org/ * GraphViz: http://graphviz.org/ * * To Generate Graph image using graphviz: diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc index 68b0a7b9c4fd..7b0042eb038e 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc @@ -20,7 +20,7 @@ In addition to using Jetty in its distribution form and its multiple embedded fo Many products and open source projects out there distribute Jetty themselves, in both distribution and embedded forms, not to mention different operating systems bundling Jetty in other installable forms. If your platform supports Jetty from a distribution or deployment perspective and want to be included on this list just fork the documentation and submit a pull request, or contact us. -Check out our list of https://eclipse.dev/jetty/powered[Powered By] page for software that makes use of Jetty, often in novel and exciting ways. +Check out our list of https://jetty.org/powered[Powered By] page for software that makes use of Jetty, often in novel and exciting ways. include::jelastic.adoc[] include::cloudfoundry.adoc[] diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc index e02f90ef5723..59d57ab1876f 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc @@ -69,7 +69,7 @@ The default Configuration Classes are: `org.eclipse.jetty.plus.webapp.PlusConfiguration` `org.eclipse.jetty.annotations.AnnotationConfiguration` -You can learn more about implementing specific Configuration Classes link:https://eclipse.dev/jetty/documentation/[in the Jetty documentation.] +You can learn more about implementing specific Configuration Classes link:https://jetty.org/docs/[in the Jetty documentation.] ==== Deploying Multiple Contexts diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc index 3c9ebe28d024..e1f29339e19d 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc @@ -406,4 +406,4 @@ public class FooLoginModule extends AbstractLoginModule An example webapp using JAAS can be found in the Jetty GitHub repository: -* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/eclipse/jetty.project/tree/jetty-11.0.x/tests/test-webapps/test-jaas-webapp] +* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/jetty/jetty.project/tree/jetty-11.0.x/tests/test-webapps/test-jaas-webapp] diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc index f801eec62262..10add18b096f 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc @@ -16,7 +16,7 @@ ==== List of Security Reports -A current list of Jetty security reports can be viewed on the link:https://eclipse.dev/jetty/security-reports.php[Project Home Page.] +A current list of Jetty security reports can be viewed on the link:https://jetty.org/security-reports.php[Project Home Page.] ==== Reporting Security Issues diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc index a5bc25998ba7..031593299116 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc @@ -59,7 +59,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ [source,xml,subs=verbatim] ---- - + @@ -85,7 +85,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable [source,xml] ---- - + @@ -110,7 +110,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty' [source,xml] ---- - + diff --git a/documentation/jetty/antora.yml b/documentation/jetty/antora.yml index f69bf37b7563..973e37236e95 100644 --- a/documentation/jetty/antora.yml +++ b/documentation/jetty/antora.yml @@ -3,7 +3,7 @@ version: '11' title: Eclipse Jetty asciidoc: attributes: - javadoc-url: https://eclipse.dev/jetty/javadoc/jetty-11 + javadoc-url: https://jetty.org/javadoc/jetty-11 jdurl: '{javadoc-url}' jetty-home: ${jetty.home}@ version: 11.0.21-SNAPSHOT diff --git a/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc b/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc index fc771fdd0a20..4258e996c242 100644 --- a/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc @@ -498,7 +498,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ [,xml,subs=verbatim] ---- - + @@ -524,7 +524,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable [,xml] ---- - + @@ -549,7 +549,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty' [,xml] ---- - + diff --git a/jetty-home/src/main/resources/NOTICE.txt b/jetty-home/src/main/resources/NOTICE.txt index ee70c29a02f3..db958813251c 100644 --- a/jetty-home/src/main/resources/NOTICE.txt +++ b/jetty-home/src/main/resources/NOTICE.txt @@ -2,7 +2,7 @@ Notices for Eclipse Jetty ========================= This content is produced and maintained by the Eclipse Jetty project. -Project home: https://eclipse.dev/jetty/ +Project home: https://jetty.org/ Trademarks ---------- diff --git a/jetty-home/src/main/resources/README.adoc b/jetty-home/src/main/resources/README.adoc index 8f76a9a2aad0..18528ad9bf0a 100644 --- a/jetty-home/src/main/resources/README.adoc +++ b/jetty-home/src/main/resources/README.adoc @@ -1,6 +1,6 @@ === ECLIPSE JETTY -The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a: +The link:https://jetty.org/[Eclipse Jetty] Project provides a: * Java HTTP & WebSocket Server * Servlet Container @@ -8,7 +8,7 @@ The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a: Jetty is available under an open source link:LICENSE.txt[LICENSE], and the full source code is available at link:https://github.com/jetty/jetty.project[GitHub]. -The Jetty documentation is available at link:https://eclipse.dev/jetty/documentation/[]. +The Jetty documentation is available at link:https://jetty.org/docs/[]. // tag::quick[] ==== Quick Setup @@ -46,7 +46,7 @@ Point your browser at `+http://localhost:8080+` to see the demo web applications The Jetty server can be stopped with `ctrl+c` in the terminal window. // end::quick[] -For more information about how to start Jetty, run this command (or go to the link:https://eclipse.dev/jetty/documentation/[documentation]): +For more information about how to start Jetty, run this command (or go to the link:https://jetty.org/docs/[documentation]): ---- $ java -jar $JETTY_HOME/start.jar --help diff --git a/jetty-home/src/main/resources/modules/demo.d/root/index.html b/jetty-home/src/main/resources/modules/demo.d/root/index.html index 53ae49ba43d9..0744a9cd8d70 100644 --- a/jetty-home/src/main/resources/modules/demo.d/root/index.html +++ b/jetty-home/src/main/resources/modules/demo.d/root/index.html @@ -23,7 +23,7 @@

Welcome to Jetty 11

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

@@ -45,10 +45,10 @@

demos

information