From 9fc7258537738ccfcae8217eb7cc2c89ab0453e2 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 22 Nov 2012 21:42:15 +0000
Subject: [PATCH] - Update non-default xml files - Update DTD

---
 .../eepsite/contexts/base-context.xml         |   2 +-
 .../eepsite/contexts/cgi-context.xml          |   2 +-
 installer/resources/eepsite/jetty-jmx.xml     | 168 +++++++-------
 installer/resources/eepsite/jetty-rewrite.xml | 210 ++++++++----------
 installer/resources/eepsite/jetty-ssl.xml     |  36 +--
 installer/resources/eepsite/jetty.xml         |   2 +-
 6 files changed, 201 insertions(+), 219 deletions(-)

diff --git a/installer/resources/eepsite/contexts/base-context.xml b/installer/resources/eepsite/contexts/base-context.xml
index 015056ede..36ca36784 100644
--- a/installer/resources/eepsite/contexts/base-context.xml
+++ b/installer/resources/eepsite/contexts/base-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"  encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 <!--
 Configure a custom context for the eepsite.
diff --git a/installer/resources/eepsite/contexts/cgi-context.xml b/installer/resources/eepsite/contexts/cgi-context.xml
index b1920220a..3ae8f390d 100644
--- a/installer/resources/eepsite/contexts/cgi-context.xml
+++ b/installer/resources/eepsite/contexts/cgi-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"  encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 <!--
 Configure a custom context for the eepsite.
diff --git a/installer/resources/eepsite/jetty-jmx.xml b/installer/resources/eepsite/jetty-jmx.xml
index dbf076858..4db0dbb47 100644
--- a/installer/resources/eepsite/jetty-jmx.xml
+++ b/installer/resources/eepsite/jetty-jmx.xml
@@ -1,89 +1,103 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
+<!-- ============================================================================ -->
+<!-- To correctly start Jetty with JMX module enabled, this configuration         -->
+<!-- file must appear first in the list of the configuration files.               -->
+<!-- The simplest way to achieve this is to add etc/jetty-jmx.xml as the          -->
+<!-- first file in configuration file list at the end of start.ini file.          -->
+<!-- ============================================================================ -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-<!-- =============================================================== -->
-<!-- Configure the JVM JMX Server                                    -->
-<!-- this configuration file should be used in combination with      -->
-<!-- other configuration files.  e.g.                                -->
-<!--    java -jar start.jar etc/jetty-jmx.xml etc/jetty.xml          -->
-<!-- See jetty-jmx-mx4j.xml for a non JVM server solution            -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.mortbay.jetty.Server">
+  <!-- =========================================================== -->
+  <!-- Set the java.rmi.server.hostname property in case you've    -->
+  <!-- got a misconfigured /etc/hosts entry or the like.           -->
+  <!-- =========================================================== -->
+  <!-- 
+  <Call class="java.lang.System" name="setProperty">
+    <Arg>java.rmi.server.hostname</Arg>
+    <Arg>127.0.0.1</Arg>
+  </Call>
+  -->
+  
+  <!-- =========================================================== -->
+  <!-- Initialize an mbean server                                  -->
+  <!-- =========================================================== -->
+  <Call id="MBeanServer" class="java.lang.management.ManagementFactory"
+    name="getPlatformMBeanServer" />
 
-    <!-- =========================================================== -->
-    <!-- Initialize an mbean server                                  -->
-    <!-- =========================================================== -->
-    <!-- Use the jdk 1.5 platformMBeanServer -->
-    <Call id="MBeanServer" class="java.lang.management.ManagementFactory" name="getPlatformMBeanServer"/>
+  <!-- =========================================================== -->
+  <!-- Initialize the Jetty MBean container                        -->
+  <!-- =========================================================== -->
+  <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
+    <Arg><Ref id="MBeanServer" /></Arg>
+    <Call name="start"/>
+  </New>
 
-    <!-- =========================================================== -->
-    <!-- Initialize the Jetty MBean container                        -->
-    <!-- =========================================================== -->
-    <Get id="Container" name="container">
-      <Call name="addEventListener">
-        <Arg>
-          <New class="org.mortbay.management.MBeanContainer">
-            <Arg><Ref id="MBeanServer"/></Arg>
-            <Call name="start" />
-          </New>
-        </Arg>
-      </Call>
-    </Get>
-
-    <!-- =========================================================== -->
-    <!-- Enable stats (why else are you using JMX?                                -->
-    <!-- Sneakily replace the top-level handler with a StatisticsHandler          -->
-    <!-- Note we could use AtomicStatisticsHandler in jetty-java5-stats.jar (4KB) -->
-    <!-- but it really isn't worth bundling it.                                   -->
-    <!-- http://blog.markfeeney.com/2010/10/jmx-statistics-in-jetty-6-6122.html   -->
-    <!-- =========================================================== -->
-    <Get id="oldhandler" name="handler"/>
-    <Set name="handler">
-      <New id="StatsHandler" class="org.mortbay.jetty.handler.StatisticsHandler">
-        <Set name="handler"><Ref id="oldhandler"/></Set>
-      </New>
-    </Set>
-
-
-    <!--
-    When setting up the JMXConnectorServer via RMI, two TCP ports are used to communicate with
-    the remote server:
-    * the rmiregistry port (by default 1099) from where the RMI stub is downloaded
-    * the rmi server port (by default randomly chosen) where the actual RMI communication happens
-    The JMXServiceURL for the default configuration is therefore:
-
-    service:jmx:rmi:///jndi/rmi://<remotehost>:1099/jmxrmi
-
-    In case a firewall is restricting port access, you need to make sure that the rmi server port
-    is not chosen randomly, and this can be specified with the following JMXServiceURL:
-
-    service:jmx:rmi://<host>:2100/jndi/rmi://<host>:2099/jmxrmi
-
-    where 2099 is the rmiregistry port and 2100 is the rmi server port.
-    Make sure the firewall allow access to those ports.
-
-    When using the XML configuration below, you don't need to specify any of the JMX system properties
-    on the command line (see http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html).
-    -->
-
-    <!-- Setup the RMIRegistry on a specific port
-    <Call id="rmiRegistry" class="java.rmi.registry.LocateRegistry" name="createRegistry">
-      <Arg type="int">2099</Arg>
+  <!-- Add to the Server to listen for object events -->
+  <Get id="Container" name="container">
+    <Call name="addEventListener">
+      <Arg><Ref id="MBeanContainer" /></Arg>
     </Call>
-    -->
-    <!-- Setup the JMXConnectorServer on a specific rmi server port
-    <Call id="jmxConnectorServer" class="javax.management.remote.JMXConnectorServerFactory" name="newJMXConnectorServer">
+  </Get>
+
+  <!-- Add to the Server as a managed lifecycle -->
+  <Call name="addBean">
+    <Arg><Ref id="MBeanContainer"/></Arg>
+    <Arg type="boolean">true</Arg>
+  </Call>
+
+  <!-- Add the static log -->
+  <Ref id="MBeanContainer">
+    <Call name="addBean">
       <Arg>
-        <New  class="javax.management.remote.JMXServiceURL">
-          <Arg>service:jmx:rmi://localhost:2100/jndi/rmi://localhost:2099/jmxrmi</Arg>
-        </New>
+        <New class="org.eclipse.jetty.util.log.Log"/>
       </Arg>
-      <Arg/>
-      <Arg><Ref id="MBeanServer"/></Arg>
-      <Call name="start"/>
     </Call>
-    -->
+  </Ref>
+  
+  <!-- In order to connect to the JMX server remotely from a different
+       process, possibly running on a different host, Jetty JMX module
+       can create a remote JMX connector. It requires RMI registry to
+       be started prior to creating the connector server because the
+       JMX specification uses RMI to facilitate connections.        
+   -->
 
+  <!-- Optionally start the RMI registry. Normally RMI registry runs on
+       port 1099. The argument below can be changed in order to comply
+       with the firewall requirements.
+  -->
+  <!--
+  <Call name="createRegistry" class="java.rmi.registry.LocateRegistry">
+    <Arg type="java.lang.Integer"><SystemProperty name="jetty.jmxrmiport" default="1099"/></Arg>
+    <Call name="sleep" class="java.lang.Thread">
+       <Arg type="java.lang.Integer">1000</Arg>
+    </Call>
+  </Call>
+  -->
+ 
+  <!-- Optionally add a remote JMX connector. The parameters of the constructor
+       below specify the JMX service URL, and the object name string for the
+       connector server bean. The parameters of the JMXServiceURL constructor 
+       specify the protocol that clients will use to connect to the remote JMX
+       connector (RMI), the hostname of the server (local hostname), port number
+       (automatically assigned), and the URL path. Note that URL path contains
+       the RMI registry hostname and port number, that may need to be modified
+       in order to comply with the firewall requirements. 
+  -->
+  <!--
+  <New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer">
+    <Arg>
+      <New class="javax.management.remote.JMXServiceURL">
+        <Arg type="java.lang.String">rmi</Arg>
+        <Arg type="java.lang.String" />
+        <Arg type="java.lang.Integer"><SystemProperty name="jetty.jmxrmiport" default="1099"/></Arg>
+        <Arg type="java.lang.String">/jndi/rmi://<SystemProperty name="jetty.jmxrmihost" default="localhost"/>:<SystemProperty name="jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg>
+      </New>
+    </Arg>
+    <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg>
+    <Call name="start" />
+  </New>
+  -->
 </Configure>
 
diff --git a/installer/resources/eepsite/jetty-rewrite.xml b/installer/resources/eepsite/jetty-rewrite.xml
index ef5043aac..1d208f8bf 100644
--- a/installer/resources/eepsite/jetty-rewrite.xml
+++ b/installer/resources/eepsite/jetty-rewrite.xml
@@ -1,149 +1,117 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 <!-- =============================================================== -->
 <!-- Mixin the RewriteHandler                                        -->
 <!-- =============================================================== -->
 
 
-<Configure id="Server" class="org.mortbay.jetty.Server">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
 
     <!-- =========================================================== -->
-    <!-- Configure Rewrite Handler                                   --> 
+    <!-- configure rewrite handler                                   --> 
     <!-- =========================================================== -->
     <Get id="oldhandler" name="handler"/>
 
     <Set name="handler">
-     <New id="Rewrite" class="org.mortbay.jetty.handler.rewrite.RewriteHandler">
-     
+     <New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
       <Set name="handler"><Ref id="oldhandler"/></Set>
       <Set name="rewriteRequestURI">true</Set>
       <Set name="rewritePathInfo">false</Set>
       <Set name="originalPathAttribute">requestedPath</Set>
 
-      <Set name="rules">
-          <Array type="org.mortbay.jetty.handler.rewrite.Rule">
+      <!-- Add rule to protect against IE ssl bug -->
+      <Call name="addRule">
+        <Arg>
+          <New class="org.eclipse.jetty.rewrite.handler.MsieSslRule"/>
+        </Arg>
+      </Call>
 
-           <!-- return an error message if low on threads; put this at the top so it will be processed first -->
-           <Item>
-             <New id="lowThreads" class="org.mortbay.jetty.handler.rewrite.LowThreadsRuleContainer">                
-                <!-- set the trigger for low threads ridiculously low 
-                uncomment the block below to see it in action -->
-                <!--Ref id="Server">
-                  <Get id="serverThreadPool" name="threadPool">
-                    <Set name="minThreads">3</Set>
-                    <Set name="maxThreads">4</Set>
-                    <Set name="lowThreads">0</Set>
-                  </Get>
-                </Ref>
+      <!-- protect favicon handling -->
+      <Call name="addRule">
+        <Arg>
+          <New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
+            <Set name="pattern">/favicon.ico</Set>
+            <Set name="name">Cache-Control</Set>
+            <Set name="value">Max-Age=3600,public</Set>
+            <Set name="terminating">true</Set>
+          </New>
+        </Arg>
+      </Call>
 
-                <Set name="threadPool"><Ref id="serverThreadPool"/></Set-->
-                
-                <Call name="addRule">
-                  <Arg>
-                    <New id="busyresponse" class="org.mortbay.jetty.handler.rewrite.ResponsePatternRule">
-                        <Set name="pattern">/*</Set>
-                        <Set name="code">500</Set>
-                        <Set name="reason">Server busy</Set>
-                   </New>
-                  </Arg>
-                </Call>
-             </New>
-           </Item>
+      <!-- redirect from the welcome page to a specific page -->
+      <Call name="addRule">
+        <Arg>
+          <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
+            <Set name="pattern">/rewrite/</Set>
+            <Set name="replacement">/rewrite/info.html</Set>
+          </New>
+        </Arg>
+      </Call>
 
-            <!-- Add rule to protect against IE ssl bug -->
-            <Item>
-              <New class="org.mortbay.jetty.handler.rewrite.MsieSslRule"/>
-            </Item>
+      <!-- replace the entire request URI -->
+      <Call name="addRule">
+        <Arg>
+          <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
+            <Set name="pattern">/some/old/context</Set>
+            <Set name="replacement">/rewritten/newcontext</Set>
+          </New>
+        </Arg>
+      </Call>
 
-            <!-- protect favicon handling -->
-            <Item>
-              <New class="org.mortbay.jetty.handler.rewrite.HeaderPatternRule">
-                <Set name="pattern">/favicon.ico</Set>
-                <Set name="name">Cache-Control</Set>
-                <Set name="value">Max-Age=3600,public</Set>
-                <Set name="terminating">true</Set>
-              </New>
-            </Item>
+      <!-- replace the beginning of the request URI -->
+      <Call name="addRule">
+        <Arg>
+          <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
+            <Set name="pattern">/rewrite/for/*</Set>
+            <Set name="replacement">/rewritten/</Set>
+          </New>
+        </Arg>
+      </Call>
+      
+      <!-- reverse the order of the path sections -->
+      <Call name="addRule">
+        <Arg>
+          <New class="org.eclipse.jetty.rewrite.handler.RewriteRegexRule">
+            <Set name="regex">(.*?)/reverse/([^/]*)/(.*)</Set>
+            <Set name="replacement">$1/reverse/$3/$2</Set>
+          </New>
+        </Arg>
+      </Call>
 
+      <!-- add a cookie to each path visited -->
+      <Call name="addRule">
+        <Arg>
+          <New class="org.eclipse.jetty.rewrite.handler.CookiePatternRule">
+            <Set name="pattern">/*</Set>
+            <Set name="name">visited</Set>
+            <Set name="value">yes</Set>
+          </New>
+        </Arg>
+      </Call>
+      
+      <!--  actual redirect, instead of internal rewrite -->
+      <Call name="addRule">
+        <Arg>
+          <New class="org.eclipse.jetty.rewrite.handler.RedirectPatternRule">
+            <Set name="pattern">/redirect/*</Set>
+            <Set name="location">/redirected</Set>
+          </New>
+        </Arg>
+      </Call>
 
-            <!-- add a regex rule -->
-            <Item>
-              <New class="org.mortbay.jetty.handler.rewrite.RewriteRegexRule">
-                <Set name="regex">/rewrite/dump/regex/([^/]*)/(.*)</Set>
-                <Set name="replacement">/test/dump/$2/$1</Set>
-              </New>
-            </Item>
+      <!-- add a response rule -->
+      <Call name="addRule">
+        <Arg>
+           <New class="org.eclipse.jetty.rewrite.handler.ResponsePatternRule">
+             <Set name="pattern">/400Error</Set>
+             <Set name="code">400</Set>
+             <Set name="reason">ResponsePatternRule Demo</Set>
+          </New>
+        </Arg>
+      </Call>
 
-            <!-- add a rewrite rule -->
-            <Item>
-              <New id="" class="org.mortbay.jetty.handler.rewrite.RewritePatternRule">
-                <Set name="pattern">/rewrite</Set>
-                <Set name="replacement">/rewrittento</Set>
-              </New>
-            </Item>
-            
-            <!-- add a response rule -->
-            <Item>
-              <New id="response" class="org.mortbay.jetty.handler.rewrite.ResponsePatternRule">
-                <Set name="pattern">/rewrite/session/</Set>
-                <Set name="code">401</Set>
-                <Set name="reason">Setting error code 401</Set>
-              </New>
-            </Item>
-
-            <!-- add a header pattern rule -->
-            <Item>
-              <New id="header" class="org.mortbay.jetty.handler.rewrite.HeaderPatternRule">
-                <Set name="pattern">*.jsp</Set>
-                <Set name="name">Server</Set>
-                <Set name="value">Server for JSP</Set>
-              </New>
-            </Item>
-
-            <!-- add a redirect -->
-            <Item>
-              <New id="redirect" class="org.mortbay.jetty.handler.rewrite.RedirectPatternRule">
-                <Set name="pattern">/rewrite/dispatch</Set>
-                <Set name="location">http://jetty.mortbay.org</Set>
-              </New>
-            </Item>
-
-            <Item>
-              <New id="forwardedHttps" class="org.mortbay.jetty.handler.rewrite.ForwardedSchemeHeaderRule">
-                <Set name="header">X-Forwarded-Scheme</Set>
-                <Set name="headerValue">https</Set>
-                <Set name="scheme">https</Set>
-              </New>
-            </Item>
-
-            <Item>
-              <New id="virtualHost" class="org.mortbay.jetty.handler.rewrite.VirtualHostRuleContainer">
-
-                <Set name="virtualHosts">
-                  <Array type="java.lang.String">
-                    <Item>mortbay.com</Item>
-                    <Item>www.mortbay.com</Item>
-                    <Item>mortbay.org</Item>
-                    <Item>www.mortbay.org</Item>
-                  </Array>
-                </Set>
-
-                <Call name="addRule">
-                  <Arg>
-                    <New class="org.mortbay.jetty.handler.rewrite.CookiePatternRule">
-                      <Set name="pattern">/*</Set>
-                      <Set name="name">CookiePatternRule</Set>
-                      <Set name="value">1</Set>
-                    </New>
-                  </Arg>
-                </Call>
-     
-             </New>
-           </Item>           
-          </Array>
-        </Set>
-      </New>
+     </New>
     </Set>
     
 </Configure>
diff --git a/installer/resources/eepsite/jetty-ssl.xml b/installer/resources/eepsite/jetty-ssl.xml
index 787635f56..f86c02507 100644
--- a/installer/resources/eepsite/jetty-ssl.xml
+++ b/installer/resources/eepsite/jetty-ssl.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure SSL for the Jetty Server                              -->
 <!-- this configuration file should be used in combination with      -->
 <!-- other configuration files.  e.g.                                -->
-<!--    java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml          -->
+<!--    java -jar start.jar etc/jetty-ssl.xml                        -->
+<!--                                                                 -->
+<!--  alternately, add to the start.ini for easier usage             -->
 <!-- =============================================================== -->
-<Configure id="Server" class="org.mortbay.jetty.Server">
-
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
 
+  <!-- if NIO is not available, use org.eclipse.jetty.server.ssl.SslSocketConnector -->
+  
+  <New id="sslContextFactory" class="org.eclipse.jetty.http.ssl.SslContextFactory">
+    <Set name="KeyStore">./eepsite/etc/keystore</Set>
+    <Set name="KeyStorePassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
+    <Set name="KeyManagerPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
+    <Set name="TrustStore">./eepsite/etc/keystore</Set>
+    <Set name="TrustStorePassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
+  </New>
 
   <Call name="addConnector">
     <Arg>
-      <New class="org.mortbay.jetty.security.SslSocketConnector">
+      <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
+        <Arg><Ref id="sslContextFactory" /></Arg>
         <Set name="Port">8443</Set>
         <Set name="maxIdleTime">30000</Set>
         <Set name="useDirectBuffers">false</Set>
-        <Set name="handshakeTimeout">2000</Set>
-        <Set name="keystore">./eepsite/etc/keystore.ks</Set>
-        <Set name="password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
-        <Set name="keyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
-        <Set name="truststore">./eepsite/etc/keystore.ks</Set>
-        <Set name="trustPassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
-        <Set name="handshakeTimeout">2000</Set>
-        <!-- Set name="ThreadPool">
-          <New class="org.mortbay.thread.QueuedThreadPool">
-            <Set name="minThreads">0</Set>
-            <Set name="maxThreads">16</Set>
-         </New>
-        </Set -->
+        <Set name="Acceptors">2</Set>
+        <Set name="AcceptQueueSize">100</Set>
       </New>
     </Arg>
   </Call>
diff --git a/installer/resources/eepsite/jetty.xml b/installer/resources/eepsite/jetty.xml
index f50ba371a..0d4ef27cb 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 "-//Mort Bay Consulting//DTD Configure 1.2//EN" "http://jetty.mortbay.org/configure_1_2.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 <!-- ========================================================================= -->
 <!-- This file configures the Jetty server.                                    -->