Fix dup ids in jetty.xml, fix DTD

This commit is contained in:
zzz
2025-04-18 13:31:16 -04:00
parent 6073e61ba4
commit b2432833e3

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?> <?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. --> <!-- This file configures the Jetty server. -->
@ -85,7 +85,7 @@
<Call name="addConnector"> <Call name="addConnector">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <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">1</Arg> <!-- number of acceptors -->
<Arg type="int">0</Arg> <!-- default number of selectors --> <Arg type="int">0</Arg> <!-- default number of selectors -->
<Arg> <Arg>
@ -257,7 +257,7 @@
<Arg> <Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager"> <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts"> <Set name="contexts">
<Ref id="Contexts" /> <Ref refid="Contexts" />
</Set> </Set>
<Call name="setContextAttribute"> <Call name="setContextAttribute">
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg> <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
@ -278,7 +278,7 @@
<!-- in the $JETTY_HOME/contexts directory --> <!-- in the $JETTY_HOME/contexts directory -->
<!-- --> <!-- -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Ref id="DeploymentManager"> <Ref refid="DeploymentManager">
<Call name="addAppProvider"> <Call name="addAppProvider">
<Arg> <Arg>
<New class="org.eclipse.jetty.deploy.providers.WebAppProvider"> <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
@ -302,7 +302,7 @@
<!-- Normally only one type of deployer need be used. --> <!-- Normally only one type of deployer need be used. -->
<!-- --> <!-- -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Ref id="DeploymentManager"> <Ref refid="DeploymentManager">
<Call id="webappprovider" name="addAppProvider"> <Call id="webappprovider" name="addAppProvider">
<Arg> <Arg>
<New class="org.eclipse.jetty.deploy.providers.WebAppProvider"> <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
@ -343,7 +343,7 @@
<!-- contexts configuration (see $(jetty.home)/contexts/test.xml --> <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
<!-- for an example). --> <!-- for an example). -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Ref id="RequestLog"> <Ref refid="RequestLog">
<Set name="requestLog"> <Set name="requestLog">
<New id="RequestLogImpl" class="net.i2p.jetty.I2PRequestLog"> <New id="RequestLogImpl" class="net.i2p.jetty.I2PRequestLog">
<Set name="filename">$PLUGIN/eepsite/logs/yyyy_mm_dd.request.log</Set> <Set name="filename">$PLUGIN/eepsite/logs/yyyy_mm_dd.request.log</Set>