Changeset 03e86fcb

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:

• apps/jetty/build.xml (modified) (1 diff)
• apps/jetty/java/src/net/i2p/jetty/I2PLogger.java (added)
• apps/routerconsole/java/build.xml (modified) (4 diffs)
• apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java (modified) (3 diffs)
• build.xml (modified) (1 diff)

apps/jetty/build.xml

@@ -115 +115 @@
             destdir="./build/obj" 
             includeAntRuntime="false"
-            classpath="./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-util.jar" >
+            classpath="../../core/java/build/i2p.jar:./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-util.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>

apps/routerconsole/java/build.xml

@@ -27 +27 @@
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
+                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
                 <pathelement location="../../systray/java/build/obj" />
                 <pathelement location="../../systray/java/lib/systray4j.jar" />
@@ -63 +64 @@
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
+                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
                 <pathelement location="../../systray/java/build/systray.jar" />
                 <pathelement location="../../systray/java/lib/systray4j.jar" />
@@ -244 +246 @@
                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
                 <pathelement location="../../jetty/jettylib/ant.jar" />
+                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
                 <pathelement location="../../systray/java/build/obj" />
                 <pathelement location="../../systray/java/lib/systray4j.jar" />
@@ -280 +283 @@
                 <pathelement location="../../jetty/jettylib/jetty-threadpool.jar" />
                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
+                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
                 <pathelement location="../../systray/java/build/obj" />
                 <pathelement location="../../systray/java/lib/systray4j.jar" />

apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

@@ -21 +21 @@
 import net.i2p.data.DataHelper;
 import net.i2p.desktopgui.Main;
+import net.i2p.jetty.I2PLogger;
 import net.i2p.router.RouterContext;
 import net.i2p.util.FileUtil;
@@ -50 +51 @@
 import org.mortbay.jetty.servlet.SessionHandler;
 import org.mortbay.jetty.webapp.WebAppContext;
+import org.mortbay.log.Log;
 import org.mortbay.thread.QueuedThreadPool;
 import org.mortbay.thread.concurrent.ThreadPool;
@@ -220 +222 @@
             System.err.println("ERROR: Unable to create Jetty temporary work directory");
         
+        Log.setLog(new I2PLogger(I2PAppContext.getGlobalContext()));
         // so Jetty can find WebAppConfiguration
         System.setProperty("jetty.class.path", I2PAppContext.getGlobalContext().getBaseDir() + "/lib/routerconsole.jar");

build.xml

@@ -133 +133 @@
     </target>
 
-    <target name="buildJetty" depends="buildProperties" >
+    <target name="buildJetty" depends="buildCore" >
         <ant dir="apps/jetty" target="build" />
     </target>