Skip to content

Commit

Permalink
Update URLs for new jetty locations
Browse files Browse the repository at this point in the history
  • Loading branch information
joakime committed Jun 21, 2024
1 parent aa723a2 commit 3d7f6d8
Show file tree
Hide file tree
Showing 41 changed files with 78 additions and 78 deletions.
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://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.
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://eclipse.dev/jetty/
Project home: https://jetty.org/

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://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/)
- [https://jetty.org/docs/](https://jetty.org/docs/)

Building
========
Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [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
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<body>
<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-11.0.x/demos/demo-async-rest">Source</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://github.com/jetty/jetty.project/tree/jetty-11.0.x/demos/demo-async-rest">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand Down
8 changes: 4 additions & 4 deletions demos/demo-jaas-webapp/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<body>
<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-11.0.x/demos/demo-jaas-webapp">Source</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://github.com/jetty/jetty.project/tree/jetty-11.0.x/demos/demo-jaas-webapp">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">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="https://eclipse.dev/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://jetty.org/">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
6 changes: 3 additions & 3 deletions demos/demo-jaas-webapp/src/main/webapp/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<body>
<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-11.0.x/demos/demo-jaas-webapp">Source</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://github.com/jetty/jetty.project/tree/jetty-11.0.x/demos/demo-jaas-webapp">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>
<div class="content">
Expand Down
6 changes: 3 additions & 3 deletions demos/demo-jetty-webapp/src/main/webapp/auth.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

<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-11.0.x/demos/demo-jetty-webapp">Source</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://github.com/jetty/jetty.project/tree/jetty-11.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand Down
8 changes: 4 additions & 4 deletions demos/demo-jetty-webapp/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<body>
<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-11.0.x/demos/demo-jetty-webapp">Source</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://github.com/jetty/jetty.project/tree/jetty-11.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">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="https://eclipse.dev/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://jetty.org/">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
6 changes: 3 additions & 3 deletions demos/demo-jetty-webapp/src/main/webapp/remote.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<body>
<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-11.0.x/demos/demo-jetty-webapp">Source</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://github.com/jetty/jetty.project/tree/jetty-11.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">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/rewrite/info.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<body>
<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-11.0.x/demos/demo-jetty-webapp">Source</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://github.com/jetty/jetty.project/tree/jetty-11.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand Down
8 changes: 4 additions & 4 deletions demos/demo-jndi-webapp/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<body>
<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-11.0.x/demos/demo-jndi-webapp">Source</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://github.com/jetty/jetty.project/tree/jetty-11.0.x/demos/demo-jndi-webapp">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">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="https://eclipse.dev/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://jetty.org/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
</p>

<p>
Expand Down
8 changes: 4 additions & 4 deletions demos/demo-jsp-webapp/src/main/webapp/index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

<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-11.0.x/demos/demo-jsp-webapp">Source</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://github.com/jetty/jetty.project/tree/jetty-11.0.x/demos/demo-jsp-webapp">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">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="https://eclipse.dev/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://jetty.org/">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
6 changes: 3 additions & 3 deletions demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<body>
<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-11.0.x/demos/demo-spec">Source</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://github.com/jetty/jetty.project/tree/jetty-11.0.x/demos/demo-spec">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

Expand Down
6 changes: 3 additions & 3 deletions demos/demo-template/src/main/resources/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<div class="topnav">
<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-11.0.x/demos/XXX">Source</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://github.com/jetty/jetty.project/tree/jetty-11.0.x/demos/XXX">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">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
Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <version> 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.
____
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ This module is equivalent to directly modifying the class path configuration wit
[source.XML, xml]
-------------------------------------------------------------
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure.dtd">
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Call name="prependServerClass">
<Arg>-org.eclipse.jetty.util.Decorator</Arg>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ
[source,xml,subs=verbatim]
----
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure_10_0.dtd">
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure>
<Ref refid="sslContextFactory">
Expand All @@ -85,7 +85,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable
[source,xml]
----
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure_10_0.dtd">
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure>
<Ref refid="sslContextFactory">
Expand All @@ -110,7 +110,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty'
[source,xml]
----
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://jetty.org/configure_10_0.dtd">
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure>
<Ref refid="sslContextFactory">
Expand Down
2 changes: 1 addition & 1 deletion documentation/jetty/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 3d7f6d8

Please sign in to comment.