Changeset 43ec87e


Ignore:
Timestamp:
Jan 4, 2012 3:22:01 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
69bbb88
Parents:
a14643f
Message:
  • i2ptunnel: Move bean classes from the jar to the war. External usage was deprecated about a year ago. This will break old seedless plugins.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/build.xml

    ra14643f r43ec87e  
    5353
    5454
    55     <!-- TODO: Move the web classes from the jar to the war - they are not part of the API
    56       -  This will require sponge to rewrite some seedless stuff that uses it.
    57      -->
     55    <!-- The web classes are now in the war not the jar - they are not part of the API -->
    5856    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
    5957        <!-- set if unset -->
    6058        <property name="workspace.changes.j.tr" value="" />
    61         <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class">
     59        <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class" excludes="**/EditBean.class **/IndexBean.class" >
    6260            <manifest>
    6361                <attribute name="Main-Class" value="net.i2p.i2ptunnel.I2PTunnel" />
     
    6866            </manifest>
    6967        </jar>
     68        <jar destfile="./build/temp-beans.jar" basedir="./build/obj" includes="**/EditBean.class **/IndexBean.class" />
    7069    </target>
    7170
     
    129128    </target>
    130129
     130    <!-- The web classes are now in the war not the jar - they are not part of the API -->
    131131    <target name="war" depends="precompilejsp, bundle, warUpToDate, listChangedFiles2" unless="war.uptodate" >
    132132        <!-- set if unset -->
    133133        <property name="workspace.changes.w.tr" value="" />
     134        <copy file="build/obj/net/i2p/i2ptunnel/web/EditBean.class" todir="../jsp/WEB-INF/classes/net/i2p/i2ptunnel/web" />
     135        <copy file="build/obj/net/i2p/i2ptunnel/web/IndexBean.class" todir="../jsp/WEB-INF/classes/net/i2p/i2ptunnel/web" />
    134136        <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
    135137             basedir="../jsp/" excludes="web.xml, web-fragment.xml, web-out.xml, **/*.java, *.jsp">
     
    173175                <pathelement location="../../jetty/jettylib/ant.jar" />
    174176                <pathelement location="build/i2ptunnel.jar" />
     177                <pathelement location="build/temp-beans.jar" />
    175178            </classpath>
    176179            <arg value="-d" />
    177180            <arg value="../jsp/WEB-INF/classes" />
     181            <arg value="-v" />
    178182            <arg value="-p" />
    179183            <arg value="net.i2p.i2ptunnel.jsp" />
     
    194198                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    195199                <pathelement location="build/i2ptunnel.jar" />
     200                <pathelement location="build/temp-beans.jar" />
    196201            </classpath>
    197202        </javac>
Note: See TracChangeset for help on using the changeset viewer.