I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 552ab315 authored by zzz's avatar zzz
Browse files

Console: Remove the classpath workarounds for SusiMail,

since it isn't using the jetty classes any more
parent 4abfde40
No related branches found
No related tags found
No related merge requests found
...@@ -55,6 +55,7 @@ public class WebAppConfiguration implements Configuration { ...@@ -55,6 +55,7 @@ public class WebAppConfiguration implements Configuration {
return; return;
String appName = ctxPath.substring(1); String appName = ctxPath.substring(1);
/****
if (ctxPath.equals("/susimail")) { if (ctxPath.equals("/susimail")) {
// allow certain Jetty classes, restricted as of Jetty 7 // allow certain Jetty classes, restricted as of Jetty 7
// See http://wiki.eclipse.org/Jetty/Reference/Jetty_Classloading // See http://wiki.eclipse.org/Jetty/Reference/Jetty_Classloading
...@@ -79,6 +80,7 @@ public class WebAppConfiguration implements Configuration { ...@@ -79,6 +80,7 @@ public class WebAppConfiguration implements Configuration {
//System.err.println("System classes after: " + Arrays.toString(wac.getSystemClasses())); //System.err.println("System classes after: " + Arrays.toString(wac.getSystemClasses()));
//System.err.println("Server classes after: " + Arrays.toString(wac.getServerClasses())); //System.err.println("Server classes after: " + Arrays.toString(wac.getServerClasses()));
} }
****/
I2PAppContext i2pContext = I2PAppContext.getGlobalContext(); I2PAppContext i2pContext = I2PAppContext.getGlobalContext();
File libDir = new File(i2pContext.getBaseDir(), "lib"); File libDir = new File(i2pContext.getBaseDir(), "lib");
...@@ -88,11 +90,12 @@ public class WebAppConfiguration implements Configuration { ...@@ -88,11 +90,12 @@ public class WebAppConfiguration implements Configuration {
File dir = libDir; File dir = libDir;
String cp; String cp;
/****
if (ctxPath.equals("/susimail")) { if (ctxPath.equals("/susimail")) {
// Ticket #957... don't know why... // Ticket #957... don't know why...
// Only really required if started manually, but we don't know that from here // Only really required if started manually, but we don't know that from here
cp = "jetty-util.jar"; cp = "jetty-util.jar";
} else if (pluginDir.exists()) { } else ****/ if (pluginDir.exists()) {
File consoleDir = new File(pluginDir, "console"); File consoleDir = new File(pluginDir, "console");
Properties props = RouterConsoleRunner.webAppProperties(consoleDir.getAbsolutePath()); Properties props = RouterConsoleRunner.webAppProperties(consoleDir.getAbsolutePath());
cp = props.getProperty(RouterConsoleRunner.PREFIX + appName + CLASSPATH); cp = props.getProperty(RouterConsoleRunner.PREFIX + appName + CLASSPATH);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment