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 49000f73ac34..8067213c7ec5 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..d3ce495a4efc 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 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 ce1b3273cf26..24c0e3e2475e 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 @@ -10,8 +10,8 @@
Demo Home Source - Jetty Project Home - Documentation + 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 dbaafe5a45ea..205ed826b7b8 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/index.html +++ b/demos/demo-jaas-webapp/src/main/webapp/index.html @@ -10,8 +10,8 @@
Demo Home Source - Jetty Project Home - Documentation + 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 a0140e9d205a..20bae181cabe 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/login.html +++ b/demos/demo-jaas-webapp/src/main/webapp/login.html @@ -7,8 +7,8 @@
Demo Home Source - Jetty Project Home - Documentation + 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 57d6cf8e06b4..5d78ef1b2b6d 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/auth.html +++ b/demos/demo-jetty-webapp/src/main/webapp/auth.html @@ -10,8 +10,8 @@
Demo Home Source - Jetty Project Home - Documentation + 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 81bfdc4e1697..023ba702baae 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/index.html +++ b/demos/demo-jetty-webapp/src/main/webapp/index.html @@ -9,8 +9,8 @@
Demo Home Source - Jetty Project Home - Documentation + 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 7b1822787b33..f77ddf15ff67 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/remote.html +++ b/demos/demo-jetty-webapp/src/main/webapp/remote.html @@ -9,8 +9,8 @@
Demo Home Source - Jetty Project Home - Documentation + 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 0e85b8213e44..b2b79a1fd9b4 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html +++ b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html @@ -10,8 +10,8 @@
Demo Home Source - Jetty Project Home - Documentation + 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 c24f9e853e27..a5b7b18f05a4 100644 --- a/demos/demo-jndi-webapp/src/main/webapp/index.html +++ b/demos/demo-jndi-webapp/src/main/webapp/index.html @@ -9,8 +9,8 @@
Demo Home Source - Jetty Project Home - Documentation + 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 709a38f50f1b..fc443987340a 100644 --- a/demos/demo-jsp-webapp/src/main/webapp/index.jsp +++ b/demos/demo-jsp-webapp/src/main/webapp/index.jsp @@ -11,8 +11,8 @@

Demo Home Source - Jetty Project Home - Documentation + 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 90e3e06b2fe6..9c464287a115 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 @@ -9,8 +9,8 @@
Demo Home Source - Jetty Project Home - Documentation + 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 0b5debc6fc6b..ebe029d88e5e 100644 --- a/demos/demo-template/src/main/resources/index.html +++ b/demos/demo-template/src/main/resources/index.html @@ -11,8 +11,8 @@ Demo Home Source - Jetty Project Home - Documentation + 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 657f5b2cf78a..6939b11fd66d 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/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 1a073abaaea9..f6078de1f1a6 100644 --- a/documentation/jetty/antora.yml +++ b/documentation/jetty/antora.yml @@ -3,7 +3,7 @@ version: '10' title: Eclipse Jetty asciidoc: attributes: - javadoc-url: https://eclipse.dev/jetty/javadoc/jetty-10 + javadoc-url: https://jetty.org/javadoc/jetty-10 jdurl: '{javadoc-url}' jetty-home: ${jetty.home}@ version: 10.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 b9e8466f77e1..bf988ee89d7e 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 10

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

    -
  • Jetty Homepage
    • -
  • Jetty Documentation Hub
    • +
  • Jetty Homepage
    • +
  • Jetty Documentation Hub
  • Javadoc (via transparent proxy)
    • -
  • Jetty Powered
    • +
  • Jetty Powered
  • Optional content found only in
    jetty-home-<ver>-with-docs.zip
    • Jetty Documentation
      • diff --git a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java index 4a7c63bb2583..74b98f9fbb38 100644 --- a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java +++ b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java @@ -59,7 +59,7 @@ * Note that the same java compiler will be used as for on-the-fly compiled * jsps, which will be the Eclipse java compiler. *

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

      * Runs jspc compiler to produce .java and .class files diff --git a/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java b/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java index 2924ea9c28cf..f3667528ef4c 100644 --- a/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java +++ b/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java @@ -579,7 +579,7 @@ public static void main(String[] args) { System.err.println("WARNING: jetty-runner is deprecated."); System.err.println(" See Jetty Documentation for startup options"); - System.err.println(" https://eclipse.dev/jetty/documentation/"); + System.err.println(" https://jetty.org/docs/"); Runner runner = new Runner(); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java index 681150359b70..14a8d3d65943 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java @@ -63,7 +63,7 @@ public HomeBaseWarning() { StringBuilder warn = new StringBuilder(); warn.append("This instance of Jetty is not running from a separate {jetty.base} directory"); - warn.append(", this is not recommended. See documentation at https://eclipse.dev/jetty/documentation/"); + warn.append(", this is not recommended. See documentation at https://jetty.org/docs/"); LOG.warn("{}", warn.toString()); } } diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java index d01ad6935c8f..e04c4dc007ef 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java @@ -121,7 +121,7 @@ private void writeHeaderMessage(PrintWriter out, Path outputFile) out.println("/*"); out.println(" * GraphViz Graph of Jetty Modules"); out.println(" * "); - out.println(" * Jetty: https://eclipse.dev/jetty/"); + out.println(" * Jetty: https://jetty.org/"); out.println(" * GraphViz: http://graphviz.org/"); out.println(" * "); out.println(" * To Generate Graph image using graphviz:"); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java index 9e2c55d570f1..2b9f6bfe683c 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java @@ -66,7 +66,7 @@ public void setupBaseHome() throws IOException public void testGetCoordinateNotMaven() { MavenLocalRepoFileInitializer repo = new MavenLocalRepoFileInitializer(baseHome); - String ref = "https://eclipse.dev/jetty/"; + String ref = "https://jetty.org/"; Coordinates coords = repo.getCoordinates(URI.create(ref)); assertThat("Coords", coords, nullValue()); } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java index 4b6f6bb0440b..e89902917a8c 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java @@ -1496,12 +1496,12 @@ public void testGetGenericListInput() uris.add(URI.create("http://www.mortbay.org/")); uris.add(URI.create("http://jetty.codehaus.org/jetty/")); uris.add(URI.create("http://www.intalio.com/jetty/")); - uris.add(URI.create("https://eclipse.dev/jetty/")); + uris.add(URI.create("https://jetty.org/")); // Make sure that Generics pass through the 'get' routine safely. // We should be able to call this without casting the result to URI URI eclipseUri = LazyList.get(uris, 3); - assertEquals("https://eclipse.dev/jetty/", eclipseUri.toASCIIString()); + assertEquals("https://jetty.org/", eclipseUri.toASCIIString()); } /** diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java index 95fa0519d992..c3461efe7c3c 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java @@ -82,7 +82,7 @@ public void testHttpLineParse() public void testWildHttpRequestParse() { // Arbitrary Http Response Headers seen in the wild. - // Request URI -> https://eclipse.dev/jetty/ + // Request URI -> https://jetty.org/ List expected = new ArrayList<>(); expected.add("HEAD /jetty/ HTTP/1.0"); expected.add("User-Agent: \"Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.6) Gecko/20060601 Firefox/2.0.0.6 (Ubuntu-feisty)\""); diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java index 7e052dc7fe8f..8b2ac0681bf1 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java @@ -218,7 +218,7 @@ public void testNonAbsoluteURI(Class resourceClass) public void testNotFileURI(Class resourceClass) { assertThrows(IllegalArgumentException.class, - () -> newResource(resourceClass, new URI("https://eclipse.dev/jetty/"))); + () -> newResource(resourceClass, new URI("https://jetty.org/"))); } @ParameterizedTest diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java index 348eaa97e792..9f9cbeab1577 100644 --- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java +++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java @@ -286,7 +286,7 @@ public XmlConfiguration asXmlConfiguration(String rawXml) throws IOException, SA { if (!rawXml.contains("!DOCTYPE")) rawXml = "\n" + - "\n" + + "\n" + rawXml; return asXmlConfiguration("raw.xml", rawXml); } @@ -295,7 +295,7 @@ public XmlConfiguration asXmlConfiguration(String filename, String rawXml) throw { if (!rawXml.contains("!DOCTYPE")) rawXml = "\n" + - "\n" + + "\n" + rawXml; Path testFile = workDir.getEmptyPathDir().resolve(filename); try (BufferedWriter writer = Files.newBufferedWriter(testFile, UTF_8)) diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java index d12dabd6e043..5d89c89adea3 100644 --- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java +++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java @@ -45,7 +45,7 @@ protected InputSource resolveEntity(String pid, String sid) URL configURL = XmlConfiguration.class.getResource("configure_10_0.dtd"); parser.redirectEntity("configure_10_0.dtd", configURL); - parser.redirectEntity("https://www.eclipse.org/jetty/configure_10_0.dtd", configURL); + parser.redirectEntity("https://jetty.org/configure_10_0.dtd", configURL); parser.redirectEntity("-//Jetty//Configure//EN", configURL); URL url = XmlParserTest.class.getClassLoader().getResource("org/eclipse/jetty/xml/configureWithAttr.xml");