Changeset b370fe6


Ignore:
Timestamp:
Apr 18, 2013 3:25:33 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
46f8344
Parents:
d6b28a4
Message:
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java

    rd6b28a4 rb370fe6  
    44import java.net.URL;
    55import java.net.URLClassLoader;
     6import java.util.Arrays;
     7import java.util.ArrayList;
    68import java.util.HashSet;
     9import java.util.List;
    710import java.util.Properties;
    811import java.util.Set;
     
    5255            return;
    5356        String appName = ctxPath.substring(1);
     57
     58        if (ctxPath.equals("/susimail")) {
     59            // allow certain Jetty classes, restricted as of Jetty 7
     60            // See http://wiki.eclipse.org/Jetty/Reference/Jetty_Classloading
     61            //System.err.println("Allowing Jetty utils in classpath for " + appName);
     62            //System.err.println("System classes before: " + Arrays.toString(wac.getSystemClasses()));
     63            //System.err.println("Server classes before: " + Arrays.toString(wac.getServerClasses()));
     64            wac.addSystemClass("org.eclipse.jetty.http.");
     65            wac.addSystemClass("org.eclipse.jetty.io.");
     66            wac.addSystemClass("org.eclipse.jetty.util.");
     67            // org.eclipse.jetty.webapp.ClasspathPattern looks in-order, and
     68            // WebAppContext doesn't provide a remove method, so we must
     69            // convert to a list, remove the wildcard entry, add ours, then
     70            // add the wildcard back, then reset.
     71            List<String> classes = new ArrayList(16);
     72            classes.addAll(Arrays.asList(wac.getServerClasses()));
     73            classes.remove("org.eclipse.jetty.");
     74            classes.add("-org.eclipse.jetty.http.");
     75            classes.add("-org.eclipse.jetty.io.");
     76            classes.add("-org.eclipse.jetty.util.");
     77            classes.add("org.eclipse.jetty.");
     78            wac.setServerClasses(classes.toArray(new String[classes.size()]));
     79            //System.err.println("System classes after:  " + Arrays.toString(wac.getSystemClasses()));
     80            //System.err.println("Server classes after:  " + Arrays.toString(wac.getServerClasses()));
     81        }
    5482
    5583        I2PAppContext i2pContext = I2PAppContext.getGlobalContext();
  • history.txt

    rd6b28a4 rb370fe6  
     12013-04-18 zzz
     2 * i2psnark: Fix params after P-R-G
     3 * i2ptunnel: Set target=_top in all external links to break out of console iframe
     4 * SusiMail: Fix loading of Jetty classes
     5
    162013-04-17 zzz
    27 * Console: Better handling of missing font for graphing (ticket #915)
  • router/java/src/net/i2p/router/RouterVersion.java

    rd6b28a4 rb370fe6  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 9;
     21    public final static long BUILD = 10;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.