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

fix jetty system properties

Browse Source
This commit is contained in:
zzz
2012-11-24 19:56:58 +00:00
parent 009b0bfdde
commit 8d2eff76f2
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,10 +110,6 @@ public class RouterConsoleRunner implements RouterApp {
private static final int MAX_IDLE_TIME = 90*1000; private static final int MAX_IDLE_TIME = 90*1000;
private static final String THREAD_NAME = "RouterConsole Jetty"; private static final String THREAD_NAME = "RouterConsole Jetty";
static {
System.setProperty("org.mortbay.http.Version.paranoid", "true");
}
/** /**
* <pre> * <pre>
* non-SSL: * non-SSL:
@@ -300,7 +296,7 @@ public class RouterConsoleRunner implements RouterApp {
// System.err.println("INFO: I2P Jetty logging class not found, logging to wrapper log"); // System.err.println("INFO: I2P Jetty logging class not found, logging to wrapper log");
//} //}
// This way it doesn't try to load Slf4jLog first // This way it doesn't try to load Slf4jLog first
System.setProperty("org.mortbay.log.class", "net.i2p.jetty.I2PLogger"); System.setProperty("org.eclipse.jetty.util.log.class", "net.i2p.jetty.I2PLogger");
// so Jetty can find WebAppConfiguration // so Jetty can find WebAppConfiguration
System.setProperty("jetty.class.path", _context.getBaseDir() + "/lib/routerconsole.jar"); System.setProperty("jetty.class.path", _context.getBaseDir() + "/lib/routerconsole.jar");

3
router/java/src/net/i2p/router/Router.java
View File

@@ -128,7 +128,8 @@ public class Router implements RouterClock.ClockShiftListener {
// Fixed in Jetty 5.1.15 but we are running 5.1.12 // Fixed in Jetty 5.1.15 but we are running 5.1.12
// The default is true, unfortunately it was previously // The default is true, unfortunately it was previously
// set to false in wrapper.config thru 0.7.10 so we must set it back here. // set to false in wrapper.config thru 0.7.10 so we must set it back here.
System.setProperty("org.mortbay.util.FileResource.checkAliases", "true"); // Not in Jetty 7
//System.setProperty("org.mortbay.util.FileResource.checkAliases", "true");
} }
/** /**