Changeset 6b4f665


Ignore:
Timestamp:
Mar 10, 2017 6:48:48 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
db5ab0b
Parents:
4e236fc
Message:

Add more markers and protection for xml file migration
Add error message for jetty-jmx.xml migration, don't migrate
Update non-default files jetty-rewrite.xml and jetty-jmx.xml

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    r4e236fc r6b4f665  
    263263        </jar>
    264264
    265         <!-- Ant bug, don't set update and filesetmanifest or the update doesn't happen,
    266              Their bug tracker claims fixed in 1.8.0 but broken for me in 1.8.1
    267           -->
    268265        <jar destfile="jettylib/commons-logging.jar" update="true" >
    269266            <manifest>
  • installer/resources/eepsite/jetty-jmx.xml

    r4e236fc r6b4f665  
    11<?xml version="1.0"?>
    2 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
     2<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
    33
    4 <!-- ============================================================================ -->
    5 <!-- To correctly start Jetty with JMX module enabled, this configuration         -->
    6 <!-- file must appear first in the list of the configuration files.               -->
    7 <!-- The simplest way to achieve this is to add etc/jetty-jmx.xml as the          -->
    8 <!-- first file in configuration file list at the end of start.ini file.          -->
    9 <!-- ============================================================================ -->
    104<Configure id="Server" class="org.eclipse.jetty.server.Server">
    115
     
    148  <!-- got a misconfigured /etc/hosts entry or the like.           -->
    159  <!-- =========================================================== -->
    16   <!-- 
     10  <!--
    1711  <Call class="java.lang.System" name="setProperty">
    1812    <Arg>java.rmi.server.hostname</Arg>
     
    2014  </Call>
    2115  -->
    22  
     16
    2317  <!-- =========================================================== -->
    24   <!-- Initialize an mbean server                                  -->
     18  <!-- Get the platform mbean server                               -->
    2519  <!-- =========================================================== -->
    2620  <Call id="MBeanServer" class="java.lang.management.ManagementFactory"
     
    2822
    2923  <!-- =========================================================== -->
    30   <!-- Initialize the Jetty MBean container                        -->
     24  <!-- Initialize the Jetty MBean container -->
    3125  <!-- =========================================================== -->
    32   <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
    33     <Arg><Ref id="MBeanServer" /></Arg>
    34     <Call name="start"/>
    35   </New>
    36 
    37   <!-- Add to the Server to listen for object events -->
    38   <Get id="Container" name="container">
    39     <Call name="addEventListener">
    40       <Arg><Ref id="MBeanContainer" /></Arg>
    41     </Call>
    42   </Get>
    43 
    44   <!-- Add to the Server as a managed lifecycle -->
    4526  <Call name="addBean">
    46     <Arg><Ref id="MBeanContainer"/></Arg>
    47     <Arg type="boolean">true</Arg>
     27    <Arg>
     28      <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
     29        <Arg>
     30          <Ref refid="MBeanServer" />
     31        </Arg>
     32      </New>
     33    </Arg>
    4834  </Call>
    4935
    5036  <!-- Add the static log -->
    51   <Ref id="MBeanContainer">
    52     <Call name="addBean">
    53       <Arg>
    54         <New class="org.eclipse.jetty.util.log.Log"/>
    55       </Arg>
    56     </Call>
    57   </Ref>
    58  
    59   <!-- In order to connect to the JMX server remotely from a different
    60        process, possibly running on a different host, Jetty JMX module
    61        can create a remote JMX connector. It requires RMI registry to
    62        be started prior to creating the connector server because the
    63        JMX specification uses RMI to facilitate connections.       
    64    -->
    65 
    66   <!-- Optionally start the RMI registry. Normally RMI registry runs on
    67        port 1099. The argument below can be changed in order to comply
    68        with the firewall requirements.
    69   -->
    70   <!--
    71   <Call name="createRegistry" class="java.rmi.registry.LocateRegistry">
    72     <Arg type="java.lang.Integer"><SystemProperty name="jetty.jmxrmiport" default="1099"/></Arg>
    73     <Call name="sleep" class="java.lang.Thread">
    74        <Arg type="java.lang.Integer">1000</Arg>
    75     </Call>
     37  <Call name="addBean">
     38    <Arg>
     39      <New class="org.eclipse.jetty.util.log.Log" />
     40    </Arg>
    7641  </Call>
    77   -->
    78  
    79   <!-- Optionally add a remote JMX connector. The parameters of the constructor
    80        below specify the JMX service URL, and the object name string for the
    81        connector server bean. The parameters of the JMXServiceURL constructor
    82        specify the protocol that clients will use to connect to the remote JMX
    83        connector (RMI), the hostname of the server (local hostname), port number
    84        (automatically assigned), and the URL path. Note that URL path contains
    85        the RMI registry hostname and port number, that may need to be modified
    86        in order to comply with the firewall requirements.
    87   -->
    88   <!--
    89   <New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer">
    90     <Arg>
    91       <New class="javax.management.remote.JMXServiceURL">
    92         <Arg type="java.lang.String">rmi</Arg>
    93         <Arg type="java.lang.String" />
    94         <Arg type="java.lang.Integer"><SystemProperty name="jetty.jmxrmiport" default="1099"/></Arg>
    95         <Arg type="java.lang.String">/jndi/rmi://<SystemProperty name="jetty.jmxrmihost" default="localhost"/>:<SystemProperty name="jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg>
    96       </New>
    97     </Arg>
    98     <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg>
    99     <Call name="start" />
    100   </New>
    101   -->
    10242</Configure>
    10343
  • installer/resources/eepsite/jetty-rewrite.xml

    r4e236fc r6b4f665  
    11<?xml version="1.0"?>
    2 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
     2<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
    33
    44<!-- =============================================================== -->
     
    1010
    1111    <!-- =========================================================== -->
    12     <!-- configure rewrite handler                                   --> 
     12    <!-- configure rewrite handler                                   -->
    1313    <!-- =========================================================== -->
    1414    <Get id="oldhandler" name="handler"/>
     
    1616    <Set name="handler">
    1717     <New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
    18       <Set name="handler"><Ref id="oldhandler"/></Set>
     18      <Set name="handler"><Ref refid="oldhandler"/></Set>
    1919      <Set name="rewriteRequestURI">true</Set>
    2020      <Set name="rewritePathInfo">false</Set>
     
    6969        </Arg>
    7070      </Call>
    71      
     71
    7272      <!-- reverse the order of the path sections -->
    7373      <Call name="addRule">
     
    9090        </Arg>
    9191      </Call>
    92      
     92
    9393      <!--  actual redirect, instead of internal rewrite -->
    9494      <Call name="addRule">
     
    114114     </New>
    115115    </Set>
    116    
     116
    117117</Configure>
  • installer/resources/eepsite/jetty-ssl.xml

    r4e236fc r6b4f665  
    11<?xml version="1.0"?>
    22<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
     3
     4<!-- This configuration supports Jetty 9. Do not remove this line. -->
    35
    46<!-- ========================================================================= -->
  • installer/resources/eepsite/jetty.xml

    r4e236fc r6b4f665  
    11<?xml version="1.0" encoding="UTF-8" ?>
    22<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
     3
     4<!-- This configuration supports Jetty 9. Do not remove this line. -->
    35
    46<!-- ========================================================================= -->
  • router/java/src/net/i2p/router/startup/MigrateJetty.java

    r4e236fc r6b4f665  
    216216     */
    217217    private static boolean migrateToJetty9(File xmlFile) {
     218        if (xmlFile.getName().equals("jetty-jmx.xml")) {
     219            // This is lazy but nobody's using jmx, not worth the trouble
     220            System.err.println("ERROR: Migration  of " + xmlFile +
     221                               " file is not supported. Copy new file from $I2P/eepsite-jetty9/jetty-jmx.xml");
     222            return false;
     223        }
    218224        // we don't re-migrate from the template, we just add the
    219225        // necessary args for the QueuedThreadPool constructor in-place
     
    238244                if (s.endsWith("\r"))
    239245                    s = s.substring(0, s.length() - 1);
    240                 if (s.contains("org.eclipse.jetty.util.thread.QueuedThreadPool")) {
     246                if (s.contains("Modified by I2P migration script for Jetty 9.") ||
     247                    s.contains("This configuration supports Jetty 9.") ||
     248                    s.contains("http://www.eclipse.org/jetty/configure_9_0.dtd")) {
     249                    if (!modified)
     250                        break;
     251                    // else we've modified it twice?
     252                } else if (s.contains("org.eclipse.jetty.util.thread.QueuedThreadPool")) {
    241253                    foundQTP = true;
    242254                } else if (foundQTP) {
Note: See TracChangeset for help on using the changeset viewer.