diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java index 95c894668..94cf36622 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -110,10 +110,6 @@ public class RouterConsoleRunner implements RouterApp { private static final int MAX_IDLE_TIME = 90*1000; private static final String THREAD_NAME = "RouterConsole Jetty"; - static { - System.setProperty("org.mortbay.http.Version.paranoid", "true"); - } - /** *
* 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");
//}
// 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
System.setProperty("jetty.class.path", _context.getBaseDir() + "/lib/routerconsole.jar");
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index 725ca2779..125d2e075 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -128,7 +128,8 @@ public class Router implements RouterClock.ClockShiftListener {
// Fixed in Jetty 5.1.15 but we are running 5.1.12
// 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.
- System.setProperty("org.mortbay.util.FileResource.checkAliases", "true");
+ // Not in Jetty 7
+ //System.setProperty("org.mortbay.util.FileResource.checkAliases", "true");
}
/**