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

* SusiMail: Fix loading of Jetty classes

Browse Source
This commit is contained in:
zzz
2013-04-18 15:25:33 +00:00
parent d6b28a4eb1
commit b370fe6838
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,10 @@ package net.i2p.router.web;
import java.io.File; import java.io.File;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.StringTokenizer; import java.util.StringTokenizer;
@ -52,6 +55,31 @@ public class WebAppConfiguration implements Configuration {
return; return;
String appName = ctxPath.substring(1); 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
//System.err.println("Allowing Jetty utils in classpath for " + appName);
//System.err.println("System classes before: " + Arrays.toString(wac.getSystemClasses()));
//System.err.println("Server classes before: " + Arrays.toString(wac.getServerClasses()));
wac.addSystemClass("org.eclipse.jetty.http.");
wac.addSystemClass("org.eclipse.jetty.io.");
wac.addSystemClass("org.eclipse.jetty.util.");
// org.eclipse.jetty.webapp.ClasspathPattern looks in-order, and
// WebAppContext doesn't provide a remove method, so we must
// convert to a list, remove the wildcard entry, add ours, then
// add the wildcard back, then reset.
List<String> classes = new ArrayList(16);
classes.addAll(Arrays.asList(wac.getServerClasses()));
classes.remove("org.eclipse.jetty.");
classes.add("-org.eclipse.jetty.http.");
classes.add("-org.eclipse.jetty.io.");
classes.add("-org.eclipse.jetty.util.");
classes.add("org.eclipse.jetty.");
wac.setServerClasses(classes.toArray(new String[classes.size()]));
//System.err.println("System classes after: " + Arrays.toString(wac.getSystemClasses()));
//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");
// FIXME this only works if war is the same name as the plugin // FIXME this only works if war is the same name as the plugin

5
history.txt
View File

@ -1,3 +1,8 @@
2013-04-18 zzz
* i2psnark: Fix params after P-R-G
* i2ptunnel: Set target=_top in all external links to break out of console iframe
* SusiMail: Fix loading of Jetty classes
2013-04-17 zzz 2013-04-17 zzz
* Console: Better handling of missing font for graphing (ticket #915) * Console: Better handling of missing font for graphing (ticket #915)
* Eepsite: Fix jetty.xml configuration of ThreadPool * Eepsite: Fix jetty.xml configuration of ThreadPool

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 9; public final static long BUILD = 10;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";