Updating XML dtd refs for jetty.org

joakime · joakime · commit 5d59b7e8665c · 2024-06-20T09:34:51.000-05:00
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentTempDirTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentTempDirTest.java
@@ -103,7 +103,7 @@ public void testTmpDirectory() throws Exception
         Path warPath = MavenTestingUtils.getTestResourcePath("webapps/foo-webapp-1.war");
         String deploymentXml =
             "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-            "<!DOCTYPE Configure PUBLIC \"-//Jetty//Configure//EN\" \"https://eclipse.dev/jetty/configure.dtd\">\n" +
+            "<!DOCTYPE Configure PUBLIC \"-//Jetty//Configure//EN\" \"https://jetty.org/configure.dtd\">\n" +
             "<Configure class=\"org.eclipse.jetty.webapp.WebAppContext\">\n" +
             "<Set name=\"war\">" + warPath + "</Set>\n" +
             "<Set name=\"tempDirectory\">" + tmpDir + "</Set>\n" +
@@ -146,7 +146,7 @@ public void testPersistentTmpDirectory() throws Exception
         Path warPath = MavenTestingUtils.getTestResourcePath("webapps/foo-webapp-1.war");
         String deploymentXml =
             "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-            "<!DOCTYPE Configure PUBLIC \"-//Jetty//Configure//EN\" \"https://eclipse.dev/jetty/configure.dtd\">\n" +
+            "<!DOCTYPE Configure PUBLIC \"-//Jetty//Configure//EN\" \"https://jetty.org/configure.dtd\">\n" +
             "<Configure class=\"org.eclipse.jetty.webapp.WebAppContext\">\n" +
             "<Set name=\"war\">" + warPath + "</Set>\n" +
             "<Set name=\"tempDirectory\">" + tmpDir + "</Set>\n" +
diff --git a/jetty-deploy/src/test/resources/context-binding-test-1.xml b/jetty-deploy/src/test/resources/context-binding-test-1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
 
   <Call name="addServerClass">
diff --git a/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/src/config/jetty.xml b/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/src/config/jetty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
diff --git a/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/src/main/jettyconf/context.xml b/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/src/main/jettyconf/context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Call name="setInitParameter">
diff --git a/jetty-start/src/test/resources/bogus.xml b/jetty-start/src/test/resources/bogus.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 <Configure />
diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
@@ -1970,8 +1970,8 @@ private ConfigurationParser(Pool<ConfigurationParser>.Entry entry)
 
             // Register all variations of DOCTYPE entity references for Config 9.3
             String[] schemes = {"http", "https"};
-            String[] hosts = {"www.eclipse.org", "eclipse.org", "www.eclipse.dev", "eclipse.dev"};
-            String[] paths = {"/jetty/configure.dtd", "/jetty/configure_9_3.dtd"};
+            String[] hosts = {"www.eclipse.org/jetty", "eclipse.org/jetty", "www.eclipse.dev/jetty", "eclipse.dev/jetty", "jetty.org"};
+            String[] paths = {"/configure.dtd", "/configure_9_3.dtd"};
 
             for (String scheme : schemes)
             {
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
@@ -1742,16 +1742,16 @@ public static Stream<Arguments> xmlSystemIdSource()
         List<Arguments> ids = new ArrayList<>();
 
         String[] schemes = {"http", "https"};
-        String[] hosts = {"eclipse.org", "www.eclipse.org", "eclipse.dev", "www.eclipse.dev"};
-        String[] paths = {"/jetty/configure.dtd", "/jetty/configure_9_3.dtd"};
+        String[] hostAndContexts = {"eclipse.org/jetty", "www.eclipse.org/jetty", "eclipse.dev/jetty", "www.eclipse.dev/jetty", "jetty.org"};
+        String[] dtdNames = {"/configure.dtd", "/configure_9_3.dtd"};
 
         for (String scheme: schemes)
         {
-            for (String host: hosts)
+            for (String hostAndContext: hostAndContexts)
             {
-                for (String path: paths)
+                for (String dtdName: dtdNames)
                 {
-                    ids.add(Arguments.of(String.format("%s://%s%s", scheme, host, path)));
+                    ids.add(Arguments.of(String.format("%s://%s%s", scheme, hostAndContext, dtdName)));
                 }
             }
         }
diff --git a/tests/test-integration/src/test/resources/ssl.xml b/tests/test-integration/src/test/resources/ssl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 <Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
   <Set name="KeyStorePath"><Property name="jetty.home" default="." />/<Property name="jetty.sslContext.keyStorePath" default="keystore"/></Set>
   <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
diff --git a/tests/test-webapps/test-owb-cdi-webapp/src/main/webapp/WEB-INF/jetty-web-owb.xml b/tests/test-webapps/test-owb-cdi-webapp/src/main/webapp/WEB-INF/jetty-web-owb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext">
   <!-- Rename this file to jetty-web.xml if the cdi-spi module is not used-->
diff --git a/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
     <servlet-class>org.eclipse.jetty.proxy.ProxyServlet$Transparent</servlet-class>
     <init-param>
       <param-name>proxyTo</param-name>
-      <param-value>https://eclipse.dev/jetty/javadoc/jetty-9/index.html?overview-summary.html</param-value>
+      <param-value>https://jetty.org/javadoc/jetty-9/index.html?overview-summary.html</param-value>
     </init-param>
     <init-param>
       <param-name>hostHeader</param-name>

Original file line number	Diff line number	Diff line change
`@@ -1970,8 +1970,8 @@ private ConfigurationParser(Pool<ConfigurationParser>.Entry entry)`
`1970`	`1970`
`1971`	`1971`	`// Register all variations of DOCTYPE entity references for Config 9.3`
`1972`	`1972`	`String[] schemes = {"http", "https"};`
`1973`		`- String[] hosts = {"www.eclipse.org", "eclipse.org", "www.eclipse.dev", "eclipse.dev"};`
`1974`		`- String[] paths = {"/jetty/configure.dtd", "/jetty/configure_9_3.dtd"};`
	`1973`	`+ String[] hosts = {"www.eclipse.org/jetty", "eclipse.org/jetty", "www.eclipse.dev/jetty", "eclipse.dev/jetty", "jetty.org"};`
	`1974`	`+ String[] paths = {"/configure.dtd", "/configure_9_3.dtd"};`
`1975`	`1975`
`1976`	`1976`	`for (String scheme : schemes)`
`1977`	`1977`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1742,16 +1742,16 @@ public static Stream<Arguments> xmlSystemIdSource()`
`1742`	`1742`	`List<Arguments> ids = new ArrayList<>();`
`1743`	`1743`
`1744`	`1744`	`String[] schemes = {"http", "https"};`
`1745`		`- String[] hosts = {"eclipse.org", "www.eclipse.org", "eclipse.dev", "www.eclipse.dev"};`
`1746`		`- String[] paths = {"/jetty/configure.dtd", "/jetty/configure_9_3.dtd"};`
	`1745`	`+ String[] hostAndContexts = {"eclipse.org/jetty", "www.eclipse.org/jetty", "eclipse.dev/jetty", "www.eclipse.dev/jetty", "jetty.org"};`
	`1746`	`+ String[] dtdNames = {"/configure.dtd", "/configure_9_3.dtd"};`
`1747`	`1747`
`1748`	`1748`	`for (String scheme: schemes)`
`1749`	`1749`	`{`
`1750`		`- for (String host: hosts)`
	`1750`	`+ for (String hostAndContext: hostAndContexts)`
`1751`	`1751`	`{`
`1752`		`- for (String path: paths)`
	`1752`	`+ for (String dtdName: dtdNames)`
`1753`	`1753`	`{`
`1754`		`- ids.add(Arguments.of(String.format("%s://%s%s", scheme, host, path)));`
	`1754`	`+ ids.add(Arguments.of(String.format("%s://%s%s", scheme, hostAndContext, dtdName)));`
`1755`	`1755`	`}`
`1756`	`1756`	`}`
`1757`	`1757`	`}`