Changeset f9f1391


Ignore:
Timestamp:
Jun 17, 2013 7:39:21 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
fa0b52fc
Parents:
36e898d
Message:
  • SusiMail?: Fix classpath problem when started manually (ticket #957)
    • Remove a couple of dependencies
    • Add jetty-util.jar to console classpath just in case
Location:
apps
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/build.xml

    r36e898d rf9f1391  
    107107                <!-- very old installs don't have i2psnark,jstl,standard in the classpath... not added in WebAppConfiguration any more -->
    108108                <!-- All new jetty 7 jars should have been in 0.9.6, added in 0.9.7 -->
    109                 <attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar i2psnark.jar jstl.jar standard.jar jetty-continuation.jar jetty-http.jar jetty-io.jar jetty-security.jar jetty-servlet.jar jetty-servlets.jar jetty-webapp.jar" />
     109                <attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar i2psnark.jar jstl.jar standard.jar jetty-continuation.jar jetty-http.jar jetty-io.jar jetty-security.jar jetty-servlet.jar jetty-servlets.jar jetty-util.jar jetty-webapp.jar" />
    110110                <attribute name="Implementation-Version" value="${full.version}" />
    111111                <attribute name="Built-By" value="${build.built-by}" />
  • apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java

    r36e898d rf9f1391  
    8989        File dir = libDir;
    9090        String cp;
    91         if (pluginDir.exists()) {
     91        if (ctxPath.equals("/susimail")) {
     92            // Ticket #957... don't know why...
     93            // Only really required if started manually, but we don't know that from here
     94            cp = "jetty-util.jar";
     95        } else if (pluginDir.exists()) {
    9296            File consoleDir = new File(pluginDir, "console");
    9397            Properties props = RouterConsoleRunner.webAppProperties(consoleDir.getAbsolutePath());
     
    124128                (jdir != null && systemCP.contains(jdir.toURI().toURL()))) {
    125129                //System.err.println("Not adding " + path + " to classpath for " + appName + ", already in system classpath");
    126                 continue;
     130                // Ticket #957... don't know why...
     131                if (!ctxPath.equals("/susimail"))
     132                    continue;
    127133            }
    128134            System.err.println("Adding " + path + " to classpath for " + appName);
  • apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java

    r36e898d rf9f1391  
    3030//import org.apache.commons.logging.Log;
    3131//import org.mortbay.log.LogFactory;
    32 import org.eclipse.jetty.http.HttpHeaders;
    3332import org.eclipse.jetty.util.MultiMap;
    34 import org.eclipse.jetty.util.StringUtil;
    3533import org.mortbay.util.LineInput;
    3634
     
    7977    {
    8078        _request=request;
    81         String content_type = request.getHeader(HttpHeaders.CONTENT_TYPE);
     79        String content_type = request.getHeader("Content-Type");
    8280        if (!content_type.startsWith("multipart/form-data"))
    8381            throw new IOException("Not multipart/form-data request");
     
    9593       
    9694        //if(log.isDebugEnabled())log.debug("Boundary="+_boundary);
    97         _byteBoundary= (_boundary+"--").getBytes(StringUtil.__ISO_8859_1);
     95        _byteBoundary= (_boundary+"--").getBytes("ISO-8859-1");
    9896       
    9997        loadAllParts();
Note: See TracChangeset for help on using the changeset viewer.