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

Add an i2p.dir.lib property

Browse Source
This commit is contained in:
idk
2021-10-26 16:22:36 +00:00
parent 685a2f1e39
commit 7e1c8c7983
9 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@@ -455,7 +455,7 @@ public class RouterConsoleRunner implements RouterApp {
System.err.println("ERROR: Unable to create Jetty temporary work directory");
// so Jetty can find WebAppConfiguration
System.setProperty("jetty.class.path", _context.getBaseDir() + "/lib/routerconsole.jar");
System.setProperty("jetty.class.path", (new File(_context.getLibDir(), "routerconsole.jar")).getPath());
// FIXME
// http://dev.eclipse.org/mhonarc/lists/jetty-users/msg03487.html
//_server.setGracefulShutdown(1000);

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

@@ -87,7 +87,7 @@ public class WebAppConfiguration implements Configuration {
****/
I2PAppContext i2pContext = I2PAppContext.getGlobalContext();
File libDir = new File(i2pContext.getBaseDir(), "lib");
File libDir = i2pContext.getLibDir();
// FIXME this only works if war is the same name as the plugin
File pluginDir = new File(i2pContext.getConfigDir(),
PluginStarter.PLUGIN_DIR + ctxPath);
@@ -180,7 +180,7 @@ 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 libDir = ctx.getLibDir();
File[] files = libDir.listFiles(new FileSuffixFilter(".jar"));
if (files != null) {
for (int i = 0; i < files.length; i++) {

2
apps/routerconsole/java/src/net/i2p/router/web/helpers/FileDumpHelper.java
View File

@@ -63,7 +63,7 @@ public class FileDumpHelper extends HelperBase {
}
// our jars
File dir = new File(_context.getBaseDir(), "lib");
File dir = _context.getLibDir();
buf.append("<tr><th class=\"subheading routerfiles\" colspan=\"9\"><b>Router Jar Files:</b> <code>");
buf.append(dir.getAbsolutePath());
buf.append("</code></th></tr>\n");

4
apps/routerconsole/java/src/net/i2p/router/web/helpers/LogsHelper.java
View File

@@ -211,8 +211,8 @@ public class LogsHelper extends HelperBase {
* @since 0.9.35
*/
public String getBuiltBy() {
File baseDir = _context.getBaseDir();
File f = new File(new File(baseDir, "lib"), "i2p.jar");
File libDir = _context.getLibDir();
File f = new File(libDir, "i2p.jar");
Attributes att = FileDumpHelper.attributes(f);
if (att != null) {
String s = FileDumpHelper.getAtt(att, "Built-By");