echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SusiDNS: Add addressbook.jar to classpath, don't fail to start

Browse Source 
if it's still not found (ticket #1973)
This fix covers:
1) Old wrapper.config without addressbook in the classpath
2) Java 9 together with 1)
3) Completely missing addressbook.jar
This does not fix addressbook.jar missing from Debian build.
This commit is contained in:
zzz
2017-03-27 14:43:20 +00:00
parent c1991241e4
commit ed590cd6f5
2 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
View File

@ -98,7 +98,11 @@ public class WebAppConfiguration implements Configuration {
// Ticket #957... don't know why...
// Only really required if started manually, but we don't know that from here
cp = "jetty-util.jar";
} else ****/ if (pluginDir.exists()) {
****/
if (ctxPath.equals("/susidns")) {
// Old installs don't have this in their wrapper.config classpath
cp = "addressbook.jar";
} else if (pluginDir.exists()) {
File consoleDir = new File(pluginDir, "console");
Properties props = RouterConsoleRunner.webAppProperties(consoleDir.getAbsolutePath());
cp = props.getProperty(RouterConsoleRunner.PREFIX + appName + CLASSPATH);
@ -174,11 +178,13 @@ public class WebAppConfiguration implements Configuration {
}
} else {
// Java 9 - assume everything in lib/ is in the classpath
// except addressbook.jar
File libDir = new File(ctx.getBaseDir(), "lib");
File[] files = libDir.listFiles();
if (files != null) {
for (int i = 0; i < files.length; i++) {
if (files[i].getName().endsWith(".jar"))
String name = files[i].getName();
if (name.endsWith(".jar") && !name.equals("addressbook.jar"))
rv.add(files[i].toURI());
}
}