1.1 --- a/java/sql-vyuka/nbproject/build-impl.xml Sun May 24 16:58:45 2009 +0200
1.2 +++ b/java/sql-vyuka/nbproject/build-impl.xml Fri May 29 02:04:27 2009 +0200
1.3 @@ -360,8 +360,12 @@
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.SuperDAO}/build.xml" inheritall="false" target="jar"/>
1.11 + </target>
1.12 + <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
1.13 + <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar"/>
1.14 + </target>
1.15 <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
1.16 <target depends="init,deps-jar" name="-pre-pre-compile">
1.17 <mkdir dir="${build.classes.dir}"/>
1.18 @@ -498,10 +502,15 @@
1.19 </target>
1.20 <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
1.21 <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
1.22 + <copyfiles files="${reference.SuperDAO.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.reference.SuperDAO.jar" todir="${dist.ear.dir}"/>
1.23 <mkdir dir="${build.web.dir}/META-INF"/>
1.24 - <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
1.25 + <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
1.26 + <attribute name="Class-Path" value="${manifest.reference.SuperDAO.jar} "/>
1.27 + </manifest>
1.28 </target>
1.29 - <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
1.30 + <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
1.31 + <copyfiles files="${reference.SuperDAO.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
1.32 + </target>
1.33 <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist">
1.34 <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
1.35 <mkdir dir="${dist.jar.dir}"/>
1.36 @@ -777,7 +786,9 @@
1.37
1.38 CLEANUP SECTION
1.39 -->
1.40 - <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
1.41 + <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps">
1.42 + <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="clean"/>
1.43 + </target>
1.44 <target depends="init" name="do-clean">
1.45 <condition property="build.dir.to.clean" value="${build.web.dir}">
1.46 <isset property="dist.ear.dir"/>