java/nekurak.net-rest/nbproject/build-impl.xml
changeset 106 6209f3d550c5
parent 86 eb6fce71e85c
child 142 44ef544460ca
     1.1 --- a/java/nekurak.net-rest/nbproject/build-impl.xml	Mon Apr 05 15:21:14 2010 +0200
     1.2 +++ b/java/nekurak.net-rest/nbproject/build-impl.xml	Tue Apr 27 13:14:23 2010 +0200
     1.3 @@ -391,8 +391,16 @@
     1.4      <!--
     1.5                  COMPILATION SECTION
     1.6              -->
     1.7 -    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
     1.8 -    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
     1.9 +    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps">
    1.10 +        <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="jar">
    1.11 +            <property name="deploy.on.save" value="false"/>
    1.12 +        </ant>
    1.13 +    </target>
    1.14 +    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
    1.15 +        <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="jar">
    1.16 +            <property name="deploy.on.save" value="false"/>
    1.17 +        </ant>
    1.18 +    </target>
    1.19      <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
    1.20      <target depends="init,deps-jar,generate-rest-config" name="-pre-pre-compile">
    1.21          <mkdir dir="${build.classes.dir}"/>
    1.22 @@ -528,10 +536,13 @@
    1.23      </target>
    1.24      <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
    1.25      <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
    1.26 +        <copyfiles files="${reference.nekurak_net-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
    1.27          <mkdir dir="${build.web.dir}/META-INF"/>
    1.28          <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
    1.29      </target>
    1.30 -    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
    1.31 +    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
    1.32 +        <copyfiles files="${reference.nekurak_net-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
    1.33 +    </target>
    1.34      <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
    1.35          <delete dir="${build.web.dir}/WEB-INF/lib"/>
    1.36      </target>
    1.37 @@ -827,7 +838,9 @@
    1.38                  
    1.39                  CLEANUP SECTION
    1.40              -->
    1.41 -    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
    1.42 +    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps">
    1.43 +        <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="clean"/>
    1.44 +    </target>
    1.45      <target depends="init" name="do-clean">
    1.46          <condition property="build.dir.to.clean" value="${build.web.dir}">
    1.47              <isset property="dist.ear.dir"/>