From b2432833e3b76dc513ca21615c5c75e7c4be22cd Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Fri, 18 Apr 2025 13:31:16 -0400
Subject: [PATCH] Fix dup ids in jetty.xml, fix DTD

---
 plugin/templates/jetty.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugin/templates/jetty.xml b/plugin/templates/jetty.xml
index b4bb86a..d97d645 100644
--- a/plugin/templates/jetty.xml
+++ b/plugin/templates/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 file configures the Jetty server.                                    -->
@@ -85,7 +85,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>
@@ -257,7 +257,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>
@@ -278,7 +278,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">
@@ -302,7 +302,7 @@
     <!-- Normally only one type of deployer need be used.            -->
     <!--                                                             -->
     <!-- =========================================================== -->
-    <Ref id="DeploymentManager">
+    <Ref refid="DeploymentManager">
       <Call id="webappprovider" name="addAppProvider">
         <Arg>
           <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
@@ -343,7 +343,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">$PLUGIN/eepsite/logs/yyyy_mm_dd.request.log</Set>