From 77aef61885c41d8a8b9b280abb85f5342c19cffb Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sun, 20 Apr 2025 17:32:17 -0400
Subject: [PATCH] Build: Change Ref id to refid in Jetty config files

to make validators that insist on unique id values happy.
Change DTD to the 9.3 DTD.

For new installs only; migration code for existing installs to follow.
---
 installer/resources/eepsite/jetty-jmx.xml     |  2 +-
 installer/resources/eepsite/jetty-rewrite.xml |  2 +-
 installer/resources/eepsite/jetty-ssl.xml     |  6 +++---
 installer/resources/eepsite/jetty.xml         | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/installer/resources/eepsite/jetty-jmx.xml b/installer/resources/eepsite/jetty-jmx.xml
index aca96f7c2..ba6ca1471 100644
--- a/installer/resources/eepsite/jetty-jmx.xml
+++ b/installer/resources/eepsite/jetty-jmx.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/installer/resources/eepsite/jetty-rewrite.xml b/installer/resources/eepsite/jetty-rewrite.xml
index 1f93937d5..46f0f74be 100644
--- a/installer/resources/eepsite/jetty-rewrite.xml
+++ b/installer/resources/eepsite/jetty-rewrite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <!-- =============================================================== -->
 <!-- Mixin the RewriteHandler                                        -->
diff --git a/installer/resources/eepsite/jetty-ssl.xml b/installer/resources/eepsite/jetty-ssl.xml
index 7afa3bdfd..23df8b462 100644
--- a/installer/resources/eepsite/jetty-ssl.xml
+++ b/installer/resources/eepsite/jetty-ssl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <!-- This configuration supports Jetty 9. Do not remove this line. -->
 
@@ -253,14 +253,14 @@
   <Call name="addConnector">
     <Arg>
       <New class="org.eclipse.jetty.server.ServerConnector">
-        <Arg><Ref id="Server" /></Arg>
+        <Arg><Ref refid="Server" /></Arg>
         <Arg type="int">1</Arg>     <!-- number of acceptors -->
         <Arg type="int">0</Arg>     <!-- default number of selectors -->
         <Arg>
            <Array type="org.eclipse.jetty.server.ConnectionFactory">    <!-- varargs so we need an array -->
               <Item>
                 <New class="org.eclipse.jetty.server.SslConnectionFactory">
-                  <Arg><Ref id="sslContextFactory" /></Arg>
+                  <Arg><Ref refid="sslContextFactory" /></Arg>
                   <Arg>http/1.1</Arg>
                 </New>
               </Item>
diff --git a/installer/resources/eepsite/jetty.xml b/installer/resources/eepsite/jetty.xml
index 91c23bb75..716c99fe3 100644
--- a/installer/resources/eepsite/jetty.xml
+++ b/installer/resources/eepsite/jetty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <!-- This configuration supports Jetty 9. Do not remove this line. -->
 
@@ -107,7 +107,7 @@
     <Call name="addConnector">
       <Arg>
           <New class="org.eclipse.jetty.server.ServerConnector">
-            <Arg><Ref id="Server" /></Arg>
+            <Arg><Ref refid="Server" /></Arg>
             <Arg type="int">1</Arg>     <!-- number of acceptors -->
             <Arg type="int">0</Arg>     <!-- default number of selectors -->
             <Arg>
@@ -187,7 +187,7 @@
       <Arg>
         <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
           <Set name="contexts">
-            <Ref id="Contexts" />
+            <Ref refid="Contexts" />
           </Set>
           <Call name="setContextAttribute">
             <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
@@ -208,7 +208,7 @@
     <!-- in the $JETTY_HOME/contexts directory                       -->
     <!--                                                             -->
     <!-- =========================================================== -->
-    <Ref id="DeploymentManager">
+    <Ref refid="DeploymentManager">
       <Call name="addAppProvider">
         <Arg>
           <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
@@ -232,7 +232,7 @@
     <!-- Normally only one type of deployer need be used.            -->
     <!--                                                             -->
     <!-- =========================================================== -->
-    <Ref id="DeploymentManager">
+    <Ref refid="DeploymentManager">
       <Call id="webappprovider" name="addAppProvider">
         <Arg>
           <New id="WebAppProvider" class="org.eclipse.jetty.deploy.providers.WebAppProvider">
@@ -267,7 +267,7 @@
     <!-- DefaultHandler config -->
     <!-- http://stackoverflow.com/questions/4202275/how-to-prevent-jetty-from-showing-context-related-information -->
     <!-- ===================== -->
-    <Ref id="DefaultHandler">
+    <Ref refid="DefaultHandler">
       <Set name="showContexts">false</Set>
     </Ref>
 
@@ -299,7 +299,7 @@
     <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
     <!-- for an example).                                            -->
     <!-- =========================================================== -->
-    <Ref id="RequestLog">
+    <Ref refid="RequestLog">
       <Set name="requestLog">
         <New id="RequestLogImpl" class="net.i2p.jetty.I2PRequestLog">
           <Set name="filename">./eepsite/logs/yyyy_mm_dd.request.log</Set>