Changeset 4e236fc

Timestamp:

Mar 8, 2017 1:48:28 PM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

6b4f665

Parents:

b71aafb

Message:

Put Jetty 9 files in eepsite-jetty9/ directory in updater

Files:

• build.xml (modified) (2 diffs)
• router/java/src/net/i2p/router/startup/MigrateJetty.java (modified) (6 diffs)

build.xml

@@ -1598 +1598 @@
               can't overwrite an existing eepsite dir in a non-split configuration.
           -->
-        <copy todir="pkg-temp/eepsite-jetty7" >
+        <copy todir="pkg-temp/eepsite-jetty9" >
             <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" />
         </copy>
@@ -1604 +1604 @@
 
     <target name="delete-j6-update">
-        <delete dir="pkg-temp/eepsite-jetty7" />
+        <delete dir="pkg-temp/eepsite-jetty9" />
     </target>
 

router/java/src/net/i2p/router/startup/MigrateJetty.java

@@ -57 +57 @@
     private static final String BACKUP_SUFFIX = ".jetty6";
     private static final String BACKUP_SUFFIX_8 = ".jetty8";
-    private static final String JETTY_TEMPLATE_DIR = "eepsite-jetty7";
+    private static final String JETTY_TEMPLATE_DIR = "eepsite-jetty9";
     private static final String JETTY_TEMPLATE_PKGDIR = "eepsite";
     private static final String BASE_CONTEXT = "contexts/base-context.xml";
@@ -88 +88 @@
                 client = "client application " + i + " [" + app.clientName +
                          "] from Jetty 5/6 " + app.className +
-                         " to Jetty 7 " + NEW_CLASS;
+                         " to Jetty 9 " + NEW_CLASS;
                 backupSuffix = BACKUP_SUFFIX;
             } else {
@@ -143 +143 @@
             }
 
-            // Below here is migration of 5/6 to 7/8
+            // Below here is migration of 5/6 to 9
 
             File baseEep = new File(ctx.getBaseDir(), JETTY_TEMPLATE_DIR);
@@ -200 +200 @@
                 System.err.println("WARNING: Migrated clients config file " + cfgFile +
                                " from Jetty 5/6 " + OLD_CLASS + '/' + OLD_CLASS_6 +
-                               " to Jetty 7 " + NEW_CLASS);
+                               " to Jetty 9 " + NEW_CLASS);
             }
         }
@@ -209 +209 @@
     /**
      *  Migrate a jetty.xml file to Jetty 9.
-     *  Unlike above, where we just migrate the new install file over for Jetty 7/8,
+     *  Unlike above, where we just migrate the new install file over for Jetty 9,
      *  here we modify the xml file in-place to preserve settings where possible.
      *
@@ -409 +409 @@
 
 
-    /** do we have Jetty 7? */
+    /** do we have Jetty 7/8/9? */
     private static boolean hasLatestJetty() {
         if (!_wasChecked) {