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

Console: Remove the classpath workarounds for SusiMail,

Browse Source 
since it isn't using the jetty classes any more
This commit is contained in:
zzz
2014-04-19 20:46:31 +00:00
parent 4abfde4047
commit 552ab31559
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 {
//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 {
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);