vmassol 2003/09/13 06:06:36 Modified: . build-common.xml build.xml Log: Added the EJB sample as part of the distribution Revision Changes Path 1.32 +9 -1 jakarta-cactus/build-common.xml Index: build-common.xml =================================================================== RCS file: /home/cvs/jakarta-cactus/build-common.xml,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- build-common.xml 14 Jul 2003 20:30:12 -0000 1.31 +++ build-common.xml 13 Sep 2003 13:06:36 -0000 1.32 @@ -216,6 +216,14 @@ <property name="cactus.samples.servlet.bin" location="samples/servlet/dist-${j2ee.api}/bin"/> + <!-- The Sample Jetty dist --> + <property name="cactus.samples.jetty.bin" + location="samples/jetty/dist-${j2ee.api}/bin"/> + + <!-- The Sample EJB dist --> + <property name="cactus.samples.ejb.bin" + location="samples/ejb/dist-${j2ee.api}/bin"/> + </target> <!-- 1.64 +19 -4 jakarta-cactus/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-cactus/build.xml,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- build.xml 13 Jul 2003 22:29:50 -0000 1.63 +++ build.xml 13 Sep 2003 13:06:36 -0000 1.64 @@ -89,6 +89,11 @@ <property name="j2ee.jar" value="${j2ee.13.jar}"/> <property name="clover.enable" value="true"/> </ant> + <ant antfile="samples/ejb/build.xml" inheritAll="false" + target="dist"> + <property name="j2ee.jar" value="${j2ee.13.jar}"/> + <property name="clover.enable" value="true"/> + </ant> <ant antfile="documentation/build.xml" inheritAll="false" target="dist"> <property name="javadoc.include" value="true"/> @@ -155,7 +160,7 @@ prefix="${main.release.name}/lib"/> <zipfileset file="${j2ee.jar}" prefix="${main.release.name}/lib"/> - <zipfileset dir="samples/servlet/target-${j2ee.api}/sample" + <zipfileset dir="${cactus.samples.servlet.bin}" prefix="${main.release.name}/samples/servlet"> <exclude name="lib/**"/> </zipfileset> @@ -184,12 +189,18 @@ <zip destfile="${release.dir}/${main.release.name}.zip"> <zipfileset src="${release.dir}/tmp.zip"/> - <zipfileset dir="samples/jetty/dist-${j2ee.api}/bin" - prefix="${main.release.name}/samples/jetty"/> + <zipfileset dir="${cactus.samples.jetty.bin}" + prefix="${main.release.name}/samples/jetty"> + <exclude name="lib/**"/> + </zipfileset> <zipfileset file="${jstl.jar}" prefix="${main.release.name}/samples/servlet/lib"/> <zipfileset file="${standard.jar}" prefix="${main.release.name}/samples/servlet/lib"/> + <zipfileset dir="${cactus.samples.ejb.bin}" + prefix="${main.release.name}/samples/ejb"> + <exclude name="lib/**"/> + </zipfileset> </zip> <delete file="${release.dir}/tmp.zip"/> @@ -266,6 +277,10 @@ <property name="j2ee.jar" value="${j2ee.13.jar}"/> </ant> <ant antfile="samples/jetty/build.xml" inheritAll="false" + target="clean"> + <property name="j2ee.jar" value="${j2ee.13.jar}"/> + </ant> + <ant antfile="samples/ejb/build.xml" inheritAll="false" target="clean"> <property name="j2ee.jar" value="${j2ee.13.jar}"/> </ant>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]