Changeset 4e236fc for router


Ignore:
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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/startup/MigrateJetty.java

    rb71aafb r4e236fc  
    5757    private static final String BACKUP_SUFFIX = ".jetty6";
    5858    private static final String BACKUP_SUFFIX_8 = ".jetty8";
    59     private static final String JETTY_TEMPLATE_DIR = "eepsite-jetty7";
     59    private static final String JETTY_TEMPLATE_DIR = "eepsite-jetty9";
    6060    private static final String JETTY_TEMPLATE_PKGDIR = "eepsite";
    6161    private static final String BASE_CONTEXT = "contexts/base-context.xml";
     
    8888                client = "client application " + i + " [" + app.clientName +
    8989                         "] from Jetty 5/6 " + app.className +
    90                          " to Jetty 7 " + NEW_CLASS;
     90                         " to Jetty 9 " + NEW_CLASS;
    9191                backupSuffix = BACKUP_SUFFIX;
    9292            } else {
     
    143143            }
    144144
    145             // Below here is migration of 5/6 to 7/8
     145            // Below here is migration of 5/6 to 9
    146146
    147147            File baseEep = new File(ctx.getBaseDir(), JETTY_TEMPLATE_DIR);
     
    200200                System.err.println("WARNING: Migrated clients config file " + cfgFile +
    201201                               " from Jetty 5/6 " + OLD_CLASS + '/' + OLD_CLASS_6 +
    202                                " to Jetty 7 " + NEW_CLASS);
     202                               " to Jetty 9 " + NEW_CLASS);
    203203            }
    204204        }
     
    209209    /**
    210210     *  Migrate a jetty.xml file to Jetty 9.
    211      *  Unlike above, where we just migrate the new install file over for Jetty 7/8,
     211     *  Unlike above, where we just migrate the new install file over for Jetty 9,
    212212     *  here we modify the xml file in-place to preserve settings where possible.
    213213     *
     
    409409
    410410
    411     /** do we have Jetty 7? */
     411    /** do we have Jetty 7/8/9? */
    412412    private static boolean hasLatestJetty() {
    413413        if (!_wasChecked) {
Note: See TracChangeset for help on using the changeset viewer.