From 552ab3155938f3c5e55a0ef50f00bff588d5af37 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 19 Apr 2014 20:46:31 +0000
Subject: [PATCH] Console: Remove the classpath workarounds for SusiMail, since
it isn't using the jetty classes any more
---
.../java/src/net/i2p/router/web/WebAppConfiguration.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
index baa6984593..d03795be00 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
@@ -55,6 +55,7 @@ public class WebAppConfiguration implements Configuration {
return;
String appName = ctxPath.substring(1);
+/****
if (ctxPath.equals("/susimail")) {
// allow certain Jetty classes, restricted as of Jetty 7
// See http://wiki.eclipse.org/Jetty/Reference/Jetty_Classloading
@@ -79,6 +80,7 @@ public class WebAppConfiguration implements Configuration {
//System.err.println("System classes after: " + Arrays.toString(wac.getSystemClasses()));
//System.err.println("Server classes after: " + Arrays.toString(wac.getServerClasses()));
}
+****/
I2PAppContext i2pContext = I2PAppContext.getGlobalContext();
File libDir = new File(i2pContext.getBaseDir(), "lib");
@@ -88,11 +90,12 @@ public class WebAppConfiguration implements Configuration {
File dir = libDir;
String cp;
+/****
if (ctxPath.equals("/susimail")) {
// 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()) {
+ } else ****/ if (pluginDir.exists()) {
File consoleDir = new File(pluginDir, "console");
Properties props = RouterConsoleRunner.webAppProperties(consoleDir.getAbsolutePath());
cp = props.getProperty(RouterConsoleRunner.PREFIX + appName + CLASSPATH);
--
GitLab