jetty 12.1.x 12184 urls fixes (#12187)

* fix proxy url in web.xml * Issue #12184 Change urls https://eclipse.dev to https://jetty.org Fix #12187 Signed-off-by: Olivier Lamy <olamy@apache.org> --------- Signed-off-by: Olivier Lamy <olamy@apache.org>
jetty · Aug 22, 2024 · 2ef6a34 · 2ef6a34
1 parent 8e6ad22
commit 2ef6a34
Show file tree

Hide file tree

Showing 80 changed files with 88 additions and 88 deletions.
diff --git a/...sync-rest/jetty-servlet4-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml b/...sync-rest/jetty-servlet4-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!--
 This is the jetty specific web application configuration file.  When starting

diff --git a/...-servlet4-demos/jetty-servlet4-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml b/...-servlet4-demos/jetty-servlet4-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee8.webapp.WebAppContext">
   <Get name="servletContext">

diff --git a/...4-demo-javax-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-javax-websocket.xml b/...4-demo-javax-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-javax-websocket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ==================================================================
 Configure and deploy the test web application

diff --git a/...servlet4-demo-javax-websocket-webapp/src/main/config/modules/ee8-demo-javax-websocket.mod b/...servlet4-demo-javax-websocket-webapp/src/main/config/modules/ee8-demo-javax-websocket.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Javax WebSocket Webapp

diff --git a/...servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml b/...servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!--
 This is the jetty specific web application configuration file.  When starting

diff --git a/...st/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod b/...st/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Async Rest webapp

diff --git a/...st/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee11-demo-async-rest.mod b/...st/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee11-demo-async-rest.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Async Rest webapp

diff --git a/...ync-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml b/...ync-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!--
 This is the jetty specific web application configuration file.  When starting

diff --git a/...5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/demo.d/ee11-demo-jaas.xml b/...5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/demo.d/ee11-demo-jaas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the demo-jaas webapp                                  -->

diff --git a/...servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee11-demo-jaas.mod b/...servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee11-demo-jaas.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs
 
 [description]
 Demo EE11 JAAS webapp

diff --git a/...servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml b/...servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee11.webapp.WebAppContext">
   <Get name="servletContext">

diff --git a/...o-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jakarta-websocket.xml b/...o-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jakarta-websocket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ==================================================================
 Configure and deploy the test web application

diff --git a/...o-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jakarta-websocket.xml b/...o-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jakarta-websocket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ==================================================================
 Configure and deploy the test web application

diff --git a/...mo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jakarta-websocket.xml b/...mo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jakarta-websocket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ==================================================================
 Configure and deploy the test web application

diff --git a/...et5-demo-jakarta-websocket-webapp/src/main/config/modules/ee10-demo-jakarta-websocket.mod b/...et5-demo-jakarta-websocket-webapp/src/main/config/modules/ee10-demo-jakarta-websocket.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Jakarta WebSocket Webapp

diff --git a/...et5-demo-jakarta-websocket-webapp/src/main/config/modules/ee11-demo-jakarta-websocket.mod b/...et5-demo-jakarta-websocket-webapp/src/main/config/modules/ee11-demo-jakarta-websocket.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Jakarta WebSocket Webapp

diff --git a/...let5-demo-jakarta-websocket-webapp/src/main/config/modules/ee9-demo-jakarta-websocket.mod b/...let5-demo-jakarta-websocket-webapp/src/main/config/modules/ee9-demo-jakarta-websocket.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Jakarta WebSocket Webapp

diff --git a/...ty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/webapp/index.html b/...ty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/webapp/index.html
@@ -26,7 +26,7 @@ <h1>Eclipse Jetty Demo Websocket Webapp</h1>
     </div>
 
     <div class="footer">
-      <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+      <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
     </div>
 </body>
 </html>
diff --git a/...demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee11-demo-jetty.xml b/...demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee11-demo-jetty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ==================================================================
 Configure and deploy the test web application

diff --git a/...tty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee11-demo-rewrite-rules.xml b/...tty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee11-demo-rewrite-rules.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the demos                                             -->

diff --git a/...rvlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee11-demo-jetty.mod b/...rvlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee11-demo-jetty.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Jetty Webapp

diff --git a/...let5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee11-demo-rewrite.mod b/...let5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee11-demo-rewrite.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demonstrate the rewrite module.

diff --git a/...ervlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml b/...ervlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!--
 This is the jetty specific web application configuration file.  When starting

diff --git a/...servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod b/...servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo JNDI Resources Webapp

diff --git a/...servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee11-demo-jndi.mod b/...servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee11-demo-jndi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo JNDI Resources Webapp

diff --git a/...-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod b/...-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo JNDI Resources Webapp

diff --git a/...-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml b/...-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee11.webapp.WebAppContext">
   <Get name="servletContext">

diff --git a/...s/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod b/...s/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Download and install some Demo Mock Resources

diff --git a/...s/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee11-demo-mock-resources.mod b/...s/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee11-demo-mock-resources.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Download and install some Demo Mock Resources

diff --git a/...os/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod b/...os/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Download and install some Demo Mock Resources

diff --git a/...mo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/demo.d/ee11-demo-spec.xml b/...mo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/demo.d/ee11-demo-spec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="wac" class="org.eclipse.jetty.ee11.webapp.WebAppContext">
   <Set name="contextPath">/ee11-test-spec</Set>

diff --git a/...let5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee11-demo-spec.mod b/...let5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee11-demo-spec.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Download and deploy the Test Spec webapp demo.

diff --git a/...let5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee11-env.xml b/...let5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee11-env.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id='wac' class="org.eclipse.jetty.ee11.webapp.WebAppContext">
 

diff --git a/...let5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml b/...let5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee11.webapp.WebAppContext">
   <Get name="servletContext">

diff --git a/...-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jetty-websocket.xml b/...-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jetty-websocket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ==================================================================
 Configure and deploy the test web application

diff --git a/...ty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/ee10-demo-jetty-websocket.mod b/...ty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/ee10-demo-jetty-websocket.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Jetty WebSocket Webapp

diff --git a/jetty-ee11/jetty-ee11-annotations/src/main/config/modules/ee11-annotations.mod b/jetty-ee11/jetty-ee11-annotations/src/main/config/modules/ee11-annotations.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables Annotation scanning for deployed web applications.

diff --git a/jetty-ee11/jetty-ee11-apache-jsp/src/main/config/modules/ee11-apache-jsp.mod b/jetty-ee11/jetty-ee11-apache-jsp/src/main/config/modules/ee11-apache-jsp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables use of the apache implementation of JSP.

diff --git a/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi-decorate.mod b/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi-decorate.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures Jetty to use the "CdiDecoratingListener" as the default CDI mode.

diff --git a/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi-spi.mod b/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi-spi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures Jetty to use the "CdiSpiDecorator" as the default CDI mode.

diff --git a/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi.mod b/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Provides integration of CDI within webapp to Jetty container object lifecycles.

diff --git a/...e11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/demo/webdefault-ee11.xml b/...e11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/demo/webdefault-ee11.xml
@@ -185,7 +185,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 https://eclipse.dev/jetty/documentation/              -->
+  <!-- See https://jetty.org/docs/              -->
   <!-- for applicable configuration params.                                 -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
   <servlet id="jsp">

diff --git a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/exampleserver.xml b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/exampleserver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="ExampleServer" class="org.eclipse.jetty.server.Server">
 

diff --git a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/fileserver.xml b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/fileserver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="FileServer" class="org.eclipse.jetty.server.Server">
     <Call name="addConnector">

diff --git a/...-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jetty-websocket.xml b/...-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jetty-websocket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ==================================================================
 Configure and deploy the test web application

diff --git a/...ty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/ee11-demo-jetty-websocket.mod b/...ty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/ee11-demo-jetty-websocket.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Jetty WebSocket Webapp

diff --git a/...y-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/webapp/index.html b/...y-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/webapp/index.html
@@ -26,7 +26,7 @@ <h1>Eclipse Jetty Demo Websocket Webapp</h1>
     </div>
 
     <div class="footer">
-      <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+      <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
     </div>
 </body>
 </html>
diff --git a/...jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/ee11-demo-proxy.mod b/...jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/ee11-demo-proxy.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Proxy Webapp

diff --git a/...-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/...-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee11.webapp.WebAppContext">
   <Get name="servletContext">

diff --git a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app
-  xmlns="http://java.sun.com/xml/ns/javaee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-  metadata-complete="false"
-  version="3.0">
+    xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    metadata-complete="false"
+    version="3.0">
 
-  <display-name>EE11 Demo Proxy WebApp</display-name>
+  <display-name>EE10 Demo Proxy WebApp</display-name>
 
   <servlet>
     <servlet-name>JavadocTransparentProxy</servlet-name>
     <servlet-class>org.eclipse.jetty.ee11.proxy.ProxyServlet$Transparent</servlet-class>
     <init-param>
       <param-name>proxyTo</param-name>
-      <param-value>https://eclipse.dev/jetty/javadoc/jetty-12/index.html?overview-summary.html</param-value>
+      <param-value>https://javadoc.jetty.org/</param-value>
     </init-param>
     <init-param>
       <param-name>hostHeader</param-name>
-      <param-value>www.eclipse.org</param-value>
+      <param-value>javadoc.jetty.org</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
     <async-supported>true</async-supported>
   </servlet>
 
   <servlet-mapping>
     <servlet-name>JavadocTransparentProxy</servlet-name>
-    <url-pattern>/current/*</url-pattern>
+    <url-pattern>/jetty-12/*</url-pattern>
   </servlet-mapping>
 
 </web-app>
diff --git a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-template/src/main/resources/index.html b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-template/src/main/resources/index.html
@@ -29,7 +29,7 @@ <h1>Jetty XXX Demo Webapp</h1>
     </div>
 
     <div class="footer">
-      <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+      <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
     </div>
 </body>
 </html>
diff --git a/jetty-ee11/jetty-ee11-glassfish-jstl/src/main/config/modules/ee11-glassfish-jstl.mod b/jetty-ee11/jetty-ee11-glassfish-jstl/src/main/config/modules/ee11-glassfish-jstl.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the glassfish version of JSTL for all webapps.

diff --git a/...-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi-default-auth-config-factory.mod b/...-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi-default-auth-config-factory.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Provides a DefaultAuthConfigFactory for jaspi

diff --git a/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi-demo.mod b/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi-demo.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JASPI basic authentication the /test context path.

diff --git a/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi.mod b/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JASPI authentication for deployed web applications.