2005-11-30 jrandom

    * Cleaned up the build process to deal with Jetty 5.1.6 and rename the
      new commons-logging-api.jar to commons-logging.jar, which it replaces.
      Jetty 5.1.6 is pushed with all updates.  Also, no need to push a
      separate jdom or rome, as they're inside syndie.war.

apps/jetty/build.xml

@@ -26,7 +26,6 @@
             <fileset dir="jetty-5.1.6/ext">
                 <include name="ant.jar" />
                 <include name="commons-el.jar" />
-                <include name="commons-logging.jar" />
                 <include name="jasper-compiler.jar" />
                 <include name="jasper-runtime.jar" />
                 <include name="javax.servlet.jar" />
@@ -34,6 +33,8 @@
                 <include name="xercesImpl.jar" />
             </fileset>
         </copy>
+	<!-- note the rename, to keep compat with old rev, since we only used the API anyway -->
+	<copy file="jetty-5.1.6/ext/commons-logging-api.jar" tofile="jettylib/commons-logging.jar" />
         <delete dir="jetty-5.1.6" />
     </target>
     <target name="build" depends="fetchJettylib" />

build.xml

@@ -233,8 +233,6 @@
         <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
         <copy file="build/sam.jar" todir="pkg-temp/lib/" />
         <copy file="build/systray.jar" todir="pkg-temp/lib" />
-        <copy file="build/jdom.jar" todir="pkg-temp/lib" />
-        <copy file="build/rome-0.7.jar" todir="pkg-temp/lib" />
         <copy file="build/sucker.jar" todir="pkg-temp/lib" />
         <copy file="build/i2psnark.jar" todir="pkg-temp/lib/" />
         <copy file="i2p.exe" todir="pkg-temp/" failonerror="false" />
@@ -341,30 +339,14 @@
         <copy file="build/sam.jar" todir="pkg-temp/lib/" />
         <copy file="build/router.jar" todir="pkg-temp/lib/" />
         <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
-        <!-- for the 0.6.1.3 release, push JDOM and ROME.  it can be
-             removed later updates (once people on earlier builds upgrade -->
-        <copy file="build/jdom.jar" todir="pkg-temp/lib" />
-        <copy file="build/rome-0.7.jar" todir="pkg-temp/lib" />
         <copy file="build/sucker.jar" todir="pkg-temp/lib" />
         <copy file="build/i2psnark.jar" todir="pkg-temp/lib" />
         
-        <copy file="i2p.exe" todir="pkg-temp/" failonerror="false" />
         <copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
         
-        <!-- for the i2p 0.5 release, push jetty 5.2.1 -->
-        <!--
-        <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
-        <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
+	<!-- for 0.6.1.7, push jetty 5.1.6 -->
         <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
-        <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
-        <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
-        -->
-        <!-- requires commons-* to be added to the classpath (boo, hiss) -->
-        <!--
-        <copy file="installer/resources/wrapper.config" todir="pkg-temp/" />
-        <touch file="pkg-temp/wrapper.config.updated" />
-        -->
         
         <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
         <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />

history.txt

-$Id: history.txt,v 1.338 2005/11/29 12:56:03 jrandom Exp $
+$Id: history.txt,v 1.339 2005/11/30 15:48:27 jrandom Exp $
+
+2005-11-30  jrandom
+    * Cleaned up the build process to deal with Jetty 5.1.6 and rename the
+      new commons-logging-api.jar to commons-logging.jar, which it replaces.
+      Jetty 5.1.6 is pushed with all updates.  Also, no need to push a
+      separate jdom or rome, as they're inside syndie.war.
 
 2005-11-30  jrandom
     * Don't let the TCP transport alone shitlist a peer, since other