Changeset 03e86fcb


Ignore:
Timestamp:
Dec 30, 2011 7:44:57 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
4d1736ea
Parents:
be7623a4
Message:

make jetty use I2P logging

Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    rbe7623a4 r03e86fcb  
    115115            destdir="./build/obj"
    116116            includeAntRuntime="false"
    117             classpath="./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-util.jar" >
     117            classpath="../../core/java/build/i2p.jar:./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-util.jar" >
    118118            <compilerarg line="${javac.compilerargs}" />
    119119        </javac>
  • apps/routerconsole/java/build.xml

    rbe7623a4 r03e86fcb  
    2727                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
    2828                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
     29                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
    2930                <pathelement location="../../systray/java/build/obj" />
    3031                <pathelement location="../../systray/java/lib/systray4j.jar" />
     
    6364                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
    6465                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
     66                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
    6567                <pathelement location="../../systray/java/build/systray.jar" />
    6668                <pathelement location="../../systray/java/lib/systray4j.jar" />
     
    244246                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    245247                <pathelement location="../../jetty/jettylib/ant.jar" />
     248                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
    246249                <pathelement location="../../systray/java/build/obj" />
    247250                <pathelement location="../../systray/java/lib/systray4j.jar" />
     
    280283                <pathelement location="../../jetty/jettylib/jetty-threadpool.jar" />
    281284                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
     285                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
    282286                <pathelement location="../../systray/java/build/obj" />
    283287                <pathelement location="../../systray/java/lib/systray4j.jar" />
  • apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

    rbe7623a4 r03e86fcb  
    2121import net.i2p.data.DataHelper;
    2222import net.i2p.desktopgui.Main;
     23import net.i2p.jetty.I2PLogger;
    2324import net.i2p.router.RouterContext;
    2425import net.i2p.util.FileUtil;
     
    5051import org.mortbay.jetty.servlet.SessionHandler;
    5152import org.mortbay.jetty.webapp.WebAppContext;
     53import org.mortbay.log.Log;
    5254import org.mortbay.thread.QueuedThreadPool;
    5355import org.mortbay.thread.concurrent.ThreadPool;
     
    220222            System.err.println("ERROR: Unable to create Jetty temporary work directory");
    221223       
     224        Log.setLog(new I2PLogger(I2PAppContext.getGlobalContext()));
    222225        // so Jetty can find WebAppConfiguration
    223226        System.setProperty("jetty.class.path", I2PAppContext.getGlobalContext().getBaseDir() + "/lib/routerconsole.jar");
  • build.xml

    rbe7623a4 r03e86fcb  
    133133    </target>
    134134
    135     <target name="buildJetty" depends="buildProperties" >
     135    <target name="buildJetty" depends="buildCore" >
    136136        <ant dir="apps/jetty" target="build" />
    137137    </target>
Note: See TracChangeset for help on using the changeset viewer.