* Build:

    - Include old commons logging classes in commons-logging.jar
    - Preserve manifests in Jetty/Tomcat jars
  * Jetty Logger: Promote warns to erros when a Throwable is the second arg

apps/jetty/build.xml

@@ -107,10 +107,12 @@
       <!--
         <delete dir="${jetty.base}" />
       -->
-        <!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over, we need it
-             for org.apache.jasper.JspC compiler
+        <!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over,
+             needed for old plugins and things. We add tomcat-juli below.
           -->
-        <copy preservelastmodified="true" file="../../installer/lib/launch4j/lib/commons-logging.jar" todir="jettylib/" />
+        <jar destfile="jettylib/commons-logging.jar" filesetmanifest="mergewithoutmain" >
+            <zipfileset excludes="META-INF/LICENSE.txt META-INF/NOTICE.txt" src="../../installer/lib/launch4j/lib/commons-logging.jar" />
+        </jar>
         <ant target="copyTomcatLib" />
     </target>
 
@@ -121,26 +123,33 @@
          jasper.jar : jasper-runtime.jar
          jasper-el.jar + el-api.jar : commons-el.jar
          servlet-api.jar + jsp-api.jar : javax.servlet.jar
-         tomcat-juli.jar : commons-logging.jar
+         tomcat-juli.jar : Add to commons-logging.jar
          empty jar : jasper-compiler.jar
          Also, take NOTICE and LICENSE out of each one, we bundle those separately.
      -->
     <target name="copyTomcatLib" >
-        <jar destfile="jettylib/jasper-runtime.jar" >
+        <jar destfile="jettylib/jasper-runtime.jar" filesetmanifest="merge" >
             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar" />
         </jar>
-        <jar destfile="jettylib/commons-el.jar" duplicate="preserve" >
+        <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" >
             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
             <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
         </jar>
-        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" >
+        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/servlet-api.jar" />
             <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/jsp-api.jar" />
         </jar>
-        <jar destfile="jettylib/commons-logging.jar" >
+        <!-- Ant bug, don't set update and filesetmanifest or the update doesn't happen,
+             Their bug tracker claims fixed in 1.8.0 but broken for me in 1.8.1
+          -->
+        <jar destfile="jettylib/commons-logging.jar" update="true" >
             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-juli.jar" />
         </jar>
-        <jar destfile="jettylib/jasper-compiler.jar" />
+        <jar destfile="jettylib/jasper-compiler.jar" >
+            <manifest>
+                <attribute name="Note" value="Intentionally empty" />
+            </manifest>
+        </jar>
     </target>
 
     <target name="build" depends="jar" />

apps/jetty/java/src/net/i2p/jetty/I2PLogger.java

@@ -102,7 +102,7 @@ public class I2PLogger implements Logger
         if (arg0 == null && arg1 == null) {
             _log.warn(msg);
         } else if (arg0 != null && arg1 == null && arg0 instanceof Throwable) {
-            _log.warn(msg, (Throwable) arg0);
+            _log.error(msg, (Throwable) arg0);
         } else if (_log.shouldLog(Log.WARN)) {
             synchronized(_buffer) {
                 format(msg,arg0,arg1);

history.txt

+2012-03-11 zzz
+  * Build:
+    - Include old commons logging classes in commons-logging.jar
+    - Preserve manifests in Jetty/Tomcat jars
+  * Jetty Logger: Promote warns to erros when a Throwable is the second arg
+
 2012-03-11 sponge
   * fix broken comment in jetty.xml
 

router/java/src/net/i2p/router/RouterVersion.java

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