Changeset 9a089b7


Ignore:
Timestamp:
Jan 24, 2009 5:20:51 PM (12 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d8298c6
Parents:
e5d76a5
Message:
  • Build files:
    • Don't bundle unneeded XML parser xercesImpl.jar for Jetty (1MB)
    • Don't include unneeded stuff in Copy, Delete, Exec.jar (300KB)
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    re5d76a5 r9a089b7  
    7979                <include name="javax.servlet.jar" />
    8080                <include name="org.mortbay.jetty.jar" />
    81                 <include name="xercesImpl.jar" />
    8281            </fileset>
    8382        </copy>
  • apps/routerconsole/jsp/help.jsp

    re5d76a5 r9a089b7  
    3535instance (trimmed down, as in, we do not include the demo apps or other add-ons, and we simplify configuration),
    3636allowing you to deploy standard JSP/Servlet web applications into your router.  Jetty in turn makes use of
    37 Apache's javax.servlet (javax.servlet.jar) implementation, as well as their xerces-j XML parser (xerces.jar).
    38 Their XML parser requires the Sun XML APIs (JAXP) which is included in binary form (xml-apis.jar) as required
    39 by their binary code license.  This product includes software developed by the Apache Software Foundation
     37Apache's javax.servlet (javax.servlet.jar) implementation.
     38This product includes software developed by the Apache Software Foundation
    4039(http://www.apache.org/). </p>
    4140
  • build.xml

    re5d76a5 r9a089b7  
    6161        <copy file="apps/jetty/jettylib/commons-logging.jar" todir="build/" />
    6262        <copy file="apps/jetty/jettylib/commons-el.jar" todir="build/" />
    63         <copy file="apps/jetty/jettylib/xercesImpl.jar" todir="build/" />
    6463        <copy file="apps/jetty/jettylib/javax.servlet.jar" todir="build/" />
    6564    </target>
     
    8887            <manifest>
    8988             <attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
    90              <attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-compiler.jar lib/jasper-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/ant.jar lib/xercesImpl.jar lib/wrapper.jar lib/systray.jar lib/systray4j.jar" />
     89             <attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-compiler.jar lib/jasper-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/ant.jar lib/wrapper.jar lib/systray.jar lib/systray4j.jar" />
    9190            </manifest>
    9291        </jar>
     
    220219        <copy file="apps/systray/java/resources/iggy.ico" todir="pkg-temp/icons" />
    221220        <copy file="apps/systray/java/resources/iggy.xpm" todir="pkg-temp/icons" />
    222         <copy file="build/xercesImpl.jar" todir="pkg-temp/lib/" />
    223221        <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
    224222        <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
     
    369367        <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
    370368        <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    371         <copy file="build/xercesImpl.jar" todir="pkg-temp/lib/" />
    372369    </target>
    373370    <target name="installer" depends="preppkg">
    374371        <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
    375         <jar destfile="./pkg-temp/lib/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/*.class">
     372        <jar destfile="./pkg-temp/lib/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
    376373            <manifest><attribute name="Main-Class" value="net.i2p.util.Copy" /></manifest>
    377374        </jar>
    378         <jar destfile="./pkg-temp/lib/delete.jar" basedir="./core/java/build/obj" includes="net/i2p/util/*.class">
     375        <jar destfile="./pkg-temp/lib/delete.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Delete.class net/i2p/util/FileUtil.class">
    379376            <manifest><attribute name="Main-Class" value="net.i2p.util.Delete" /></manifest>
    380377        </jar>
    381         <jar destfile="./pkg-temp/lib/exec.jar" basedir="./core/java/build/obj" includes="net/i2p/util/*.class">
     378        <jar destfile="./pkg-temp/lib/exec.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Exec.class">
    382379            <manifest><attribute name="Main-Class" value="net.i2p.util.Exec" /></manifest>
    383380        </jar>
     
    450447            <arg value="findbugs.xml"/>
    451448            <arg value="-auxclasspath"/>
    452             <arg value="build/ant.jar:build/commons-el.jar:build/commons-logging.jar:build/jasper-compiler.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.4.0.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/linux/wrapper.jar:build/xercesImpl.jar"/>
     449            <arg value="build/ant.jar:build/commons-el.jar:build/commons-logging.jar:build/jasper-compiler.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.4.0.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/linux/wrapper.jar"/>
    453450            <arg value="-sourcepath"/>
    454451            <arg value="apps/BOB/src/:apps/addressbook/java/src/:apps/i2psnark/java/src/:apps/i2ptunnel/java/src/:apps/ministreaming/java/src/:apps/routerconsole/java/src/:apps/sam/java/src/:apps/streaming/java/src/:apps/susidns/src/java/src/:apps/susimail/src/src/:apps/systray/java/src/:core/java/src/:router/java/src/"/>
  • installer/resources/wrapper.config

    re5d76a5 r9a089b7  
    4848wrapper.java.classpath.14=lib/commons-el.jar
    4949wrapper.java.classpath.15=lib/ant.jar
    50 wrapper.java.classpath.16=lib/xercesImpl.jar
    5150# java service wrapper, BSD
    52 wrapper.java.classpath.17=lib/wrapper.jar
     51wrapper.java.classpath.16=lib/wrapper.jar
    5352# systray, LGPL
    54 wrapper.java.classpath.18=lib/systray.jar
    55 wrapper.java.classpath.19=lib/systray4j.jar
     53wrapper.java.classpath.17=lib/systray.jar
     54wrapper.java.classpath.18=lib/systray4j.jar
    5655# BOB
    57 wrapper.java.classpath.20=lib/BOB.jar
     56wrapper.java.classpath.19=lib/BOB.jar
    5857
    5958# Java Library Path (location of Wrapper.DLL or libwrapper.so)
Note: See TracChangeset for help on using the changeset viewer.