Skip to content

Commit

Permalink
Updating various old/moved URL references found across project (`jett…
Browse files Browse the repository at this point in the history
…y-10.0.x`) (#10098)

* Now that the migration of `https://eclipse.org/jetty/` to `https://eclipse.dev/jetty/` has occurred, it is time to review the URI use in our project

+ Updated URLs in poms
+ Added more URIs to XmlConfiguration
+ Updated URLs in module files
+ Updated URLs in documentation
+ Updated URLs in HTML
+ Correcting bad double-scheme URLs (eg: `http://https://www.eclipse...`)
+ Updating text in *.mod files
+ Removing `/current/` from path `/jetty/documentation/current/`
+ Fixing mailing list URL

---------

Signed-off-by: Joakim Erdfelt <[email protected]>
  • Loading branch information
joakime authored Jul 14, 2023
1 parent 11d2a32 commit a9c596e
Show file tree
Hide file tree
Showing 162 changed files with 291 additions and 244 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Jetty Security Reports
url: https://www.eclipse.org/jetty/security_reports.php
url: https://eclipse.dev/jetty/security_reports.php
about: Please raise security issues here.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/issue-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ labels: Bug
---

**Jetty version(s)**
_[Jetty 9.x is now at End of Community Support](https://github.com/eclipse/jetty.project/issues/7958)_
<!--[Jetty 9.x is now at End of Community Support](https://github.com/eclipse/jetty.project/issues/7958) -->

**Java version/vendor** `(use: java -version)`

**OS type/version**

**Description**
_Do not report security issues here! See [Jetty Security Reports](https://www.eclipse.org/jetty/security_reports.php)._
<!-- Do not report security issues here! See [Jetty Security Reports](https://eclipse.dev/jetty/security_reports.php) -->

**How to reproduce?**

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/release-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ This release process will produce releases:
- [ ] Merge release branches back to main branches and delete release branches.
- [ ] Verify release existence in Maven Central by triggering the Jenkins builds of CometD.
- [ ] Update Jetty versions on the web sites.
+ [ ] Update (or check) [Download](https://www.eclipse.org/jetty/download.php) page is updated.
+ [ ] Update (or check) [Download](https://eclipse.dev/jetty/download.php) page is updated.
+ [ ] Update (or check) documentation page(s) are updated.
- [ ] Publish GitHub Releases in the order of oldest (eg: 9) to newest (eg: 11) (to ensure that "latest" in github is truly the latest)
- [ ] Prepare release announcement for mailing lists.
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Developer resources
--------------------
Information regarding source code management, builds, coding standards, and more.

- [https://www.eclipse.org/jetty/documentation/current/advanced-contributing.html](https://www.eclipse.org/jetty/documentation/current/advanced-contributing.html)
- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/)

The canonical Jetty git repository is located at [GitHub.](https://github.com/eclipse/jetty.project) Providing you have
completed the contributors agreement mentioned below we will endeavor to pull your commit into Jetty proper.
Expand Down
2 changes: 1 addition & 1 deletion NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Notices for Eclipse Jetty
=========================
This content is produced and maintained by the Eclipse Jetty project.

Project home: https://www.eclipse.org/jetty/
Project home: https://eclipse.dev/jetty/

Trademarks
----------
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Documentation

Project documentation is available on the Jetty Eclipse website.

- [https://www.eclipse.org/jetty/documentation](https://www.eclipse.org/jetty/documentation)
- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/)

Building
========
Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

## Supported Versions

All [stable versions](https://www.eclipse.org/jetty/download.php) of jetty are actively supported for security issues. [Deprecated versions](https://www.eclipse.org/jetty/download.php) may be supported for serious security issues or on a commercial support basis.
All [stable versions](https://eclipse.dev/jetty/download.php) of jetty are actively supported for security issues. [Deprecated versions](https://eclipse.dev/jetty/download.php) may be supported for serious security issues or on a commercial support basis.

## Reporting a Vulnerability

Do not open a public issue to report a security vulnerability. Please send a message to [email protected] and we will create a private issue in which the issue can be triaged and handled.

## Handling a Vulnerability

The [following checklist](https://www.eclipse.org/jetty/security_processes.php) is used to handle security issues:
The [following checklist](https://eclipse.dev/jetty/security_processes.php) is used to handle security issues:

- [ ] On receipt of a security report via [email protected] 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.
Expand Down
2 changes: 1 addition & 1 deletion apache-jsp/src/main/config/modules/apache-jsp.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

[description]
Enables use of the apache implementation of JSP.
Expand Down
2 changes: 1 addition & 1 deletion apache-jstl/src/main/config/modules/apache-jstl.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

[description]
Enables the apache version of JSTL for all webapps.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

[description]
Demo Async Rest webapp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-async-rest">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

[description]
Demo Spec webapp
Expand Down
6 changes: 3 additions & 3 deletions demos/demo-jaas-webapp/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jaas-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand All @@ -21,7 +21,7 @@
</center>
<h1>JAAS Demo</h1>
<p>
This is a demo webapp for the <a href="http://www.eclipse.org/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
This is a demo webapp for the <a href="https://eclipse.dev/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.

It uses a simple login module that stores its configuration in a properties file.
</p>
Expand Down
4 changes: 2 additions & 2 deletions demos/demo-jaas-webapp/src/main/webapp/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jaas-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>
<div class="content">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

[description]
Demo Jetty Webapp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

[description]
Demonstrate a Moved Context Handler.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

[description]
Demonstrate the rewrite module.
Expand Down
4 changes: 2 additions & 2 deletions demos/demo-jetty-webapp/src/main/webapp/auth.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand Down
6 changes: 3 additions & 3 deletions demos/demo-jetty-webapp/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand All @@ -20,7 +20,7 @@
</center>
<h1>Eclipse Jetty Demo Webapp</h1>
<p>
This is a demo webapp for the <a href="http://www.eclipse.org/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
This is a demo webapp for the <a href="https://eclipse.dev/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
</p>

<h2>Jetty Tests:</h2>
Expand Down
4 changes: 2 additions & 2 deletions demos/demo-jetty-webapp/src/main/webapp/remote.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand Down
4 changes: 2 additions & 2 deletions demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

[description]
Demo JNDI Resources Webapp
Expand Down
6 changes: 3 additions & 3 deletions demos/demo-jndi-webapp/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jndi-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand All @@ -20,7 +20,7 @@
</center>
<h1>Eclipse Jetty JNDI Demo Webapp</h1>
<p>
This is a demo webapp for the <a href="http://www.eclipse.org/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
This is a demo webapp for the <a href="https://eclipse.dev/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
</p>

<p>
Expand Down
6 changes: 3 additions & 3 deletions demos/demo-jsp-webapp/src/main/webapp/index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jsp-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand All @@ -22,7 +22,7 @@
</center>
<h1>Eclipse Jetty JSP Demo Webapp</h1>
<p>
This is a demo webapp for the <a href="http://www.eclipse.org/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
This is a demo webapp for the <a href="https://eclipse.dev/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
</p>

<h2>JSP Examples on <%= DateTimeFormatter.ofPattern("d MMMM yyyy").format(LocalDate.now()) %></h2>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

[description]
Download and install some Demo Mock Resources
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

[description]
Demo Proxy Webapp
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<servlet-class>org.eclipse.jetty.proxy.ProxyServlet$Transparent</servlet-class>
<init-param>
<param-name>proxyTo</param-name>
<param-value>https://www.eclipse.org/jetty/javadoc/jetty-10/index.html?overview-summary.html</param-value>
<param-value>https://eclipse.dev/jetty/javadoc/jetty-10/index.html?overview-summary.html</param-value>
</init-param>
<init-param>
<param-name>hostHeader</param-name>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

[description]
Download and deploy the Test Spec webapp demo.
Expand Down
4 changes: 2 additions & 2 deletions demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-spec">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand Down
4 changes: 2 additions & 2 deletions demos/demo-template/src/main/resources/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<!-- Change source to suit -->
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/XXX">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand Down
2 changes: 1 addition & 1 deletion demos/embedded/src/main/resources/demo/webdefault.xml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
<!-- The JSP page compiler and execution servlet, which is the mechanism -->
<!-- used by the jsp container to support JSP pages. Traditionally, -->
<!-- this servlet is mapped to URL pattern "*.jsp". -->
<!-- See http://https://www.eclipse.org/jetty/documentation/ -->
<!-- See https://eclipse.dev/jetty/documentation/ -->
<!-- for applicable configuration params. -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<servlet id="jsp">
Expand Down
2 changes: 1 addition & 1 deletion documentation/jetty-documentation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<version>${project.version}</version>
<prog-guide>../programming-guide/index.html</prog-guide>
<op-guide>../operations-guide/index.html</op-guide>
<javadoc-url>https://www.eclipse.org/jetty/javadoc/jetty-10</javadoc-url>
<javadoc-url>https://eclipse.dev/jetty/javadoc/jetty-10</javadoc-url>
</attributes>
</configuration>
<executions>
Expand Down
Loading

0 comments on commit a9c596e

Please sign in to comment.