Changeset 4e236fc
- Timestamp:
- Mar 8, 2017 1:48:28 PM (4 years ago)
- Branches:
- master
- Children:
- 6b4f665
- Parents:
- b71aafb
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
build.xml
rb71aafb r4e236fc 1598 1598 can't overwrite an existing eepsite dir in a non-split configuration. 1599 1599 --> 1600 <copy todir="pkg-temp/eepsite-jetty 7" >1600 <copy todir="pkg-temp/eepsite-jetty9" > 1601 1601 <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" /> 1602 1602 </copy> … … 1604 1604 1605 1605 <target name="delete-j6-update"> 1606 <delete dir="pkg-temp/eepsite-jetty 7" />1606 <delete dir="pkg-temp/eepsite-jetty9" /> 1607 1607 </target> 1608 1608 -
router/java/src/net/i2p/router/startup/MigrateJetty.java
rb71aafb r4e236fc 57 57 private static final String BACKUP_SUFFIX = ".jetty6"; 58 58 private static final String BACKUP_SUFFIX_8 = ".jetty8"; 59 private static final String JETTY_TEMPLATE_DIR = "eepsite-jetty 7";59 private static final String JETTY_TEMPLATE_DIR = "eepsite-jetty9"; 60 60 private static final String JETTY_TEMPLATE_PKGDIR = "eepsite"; 61 61 private static final String BASE_CONTEXT = "contexts/base-context.xml"; … … 88 88 client = "client application " + i + " [" + app.clientName + 89 89 "] from Jetty 5/6 " + app.className + 90 " to Jetty 7" + NEW_CLASS;90 " to Jetty 9 " + NEW_CLASS; 91 91 backupSuffix = BACKUP_SUFFIX; 92 92 } else { … … 143 143 } 144 144 145 // Below here is migration of 5/6 to 7/8145 // Below here is migration of 5/6 to 9 146 146 147 147 File baseEep = new File(ctx.getBaseDir(), JETTY_TEMPLATE_DIR); … … 200 200 System.err.println("WARNING: Migrated clients config file " + cfgFile + 201 201 " from Jetty 5/6 " + OLD_CLASS + '/' + OLD_CLASS_6 + 202 " to Jetty 7" + NEW_CLASS);202 " to Jetty 9 " + NEW_CLASS); 203 203 } 204 204 } … … 209 209 /** 210 210 * 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, 212 212 * here we modify the xml file in-place to preserve settings where possible. 213 213 * … … 409 409 410 410 411 /** do we have Jetty 7 ? */411 /** do we have Jetty 7/8/9? */ 412 412 private static boolean hasLatestJetty() { 413 413 if (!_wasChecked) {
Note: See TracChangeset
for help on using the changeset viewer.