You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by jr...@apache.org on 2003/01/30 11:40:33 UTC
cvs commit: jakarta-cactus/petals/ant/src/scripts/share build-tests-weblogic7x.xml build-tests-weblogic6x.xml build-tests-orion1x.xml build-share.xml build-tests-resin2x.xml build-tests-tomcat4x.xml
jruaux 2003/01/30 02:40:33
Modified: petals/ant/src/scripts/share build-tests-weblogic7x.xml
build-tests-weblogic6x.xml build-tests-orion1x.xml
build-share.xml build-tests-resin2x.xml
build-tests-tomcat4x.xml
Log:
Added :
- cactus.init for cactus.setup.container targets
- clean target for container
Revision Changes Path
1.5 +12 -1 jakarta-cactus/petals/ant/src/scripts/share/build-tests-weblogic7x.xml
Index: build-tests-weblogic7x.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-weblogic7x.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-weblogic7x.xml 26 Jan 2003 14:15:54 -0000 1.4
+++ build-tests-weblogic7x.xml 30 Jan 2003 10:40:32 -0000 1.5
@@ -140,7 +140,7 @@
========================================================================
-->
<target name="cactus.setup.weblogic7x"
- depends="cactus.check.weblogic7x" if="cactus.home.weblogic7x"
+ depends="cactus.init, cactus.check.weblogic7x" if="cactus.home.weblogic7x"
description="Set up a WebLogic 7.x directory structure">
<mkdir dir="${cactus.target.weblogic7x}/testdomain/applications"/>
@@ -162,3 +162,14 @@
</copy>
</target>
+
+ <!--
+ ========================================================================
+ Clean generated files (including distributables)
+ ========================================================================
+ -->
+ <target name="cactus.clean.weblogic7x" depends="cactus.init, cactus.clean" description="Clean target directory">
+ <delete includeEmptyDirs="true">
+ <fileset dir="${cactus.target.weblogic7x}"/>
+ </delete>
+ </target>
\ No newline at end of file
1.3 +12 -1 jakarta-cactus/petals/ant/src/scripts/share/build-tests-weblogic6x.xml
Index: build-tests-weblogic6x.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-weblogic6x.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-weblogic6x.xml 26 Jan 2003 14:15:54 -0000 1.2
+++ build-tests-weblogic6x.xml 30 Jan 2003 10:40:32 -0000 1.3
@@ -141,7 +141,7 @@
========================================================================
-->
<target name="cactus.setup.weblogic6x"
- depends="cactus.check.weblogic6x" if="cactus.home.weblogic6x"
+ depends="cactus.init, cactus.check.weblogic6x" if="cactus.home.weblogic6x"
description="Set up a WebLogic 6.x directory structure">
<mkdir dir="${cactus.target.weblogic6x}/config/testdomain/applications"/>
@@ -154,4 +154,15 @@
<copy file="${cactus.conf.weblogic6x}/SerializedSystemIni.dat"
todir="${cactus.target.weblogic6x}/config/testdomain"/>
+ </target>
+
+ <!--
+ ========================================================================
+ Clean generated files (including distributables)
+ ========================================================================
+ -->
+ <target name="cactus.clean.weblogic6x" depends="cactus.init, cactus.clean" description="Clean target directory">
+ <delete includeEmptyDirs="true">
+ <fileset dir="${cactus.target.weblogic6x}"/>
+ </delete>
</target>
1.3 +12 -1 jakarta-cactus/petals/ant/src/scripts/share/build-tests-orion1x.xml
Index: build-tests-orion1x.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-orion1x.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-orion1x.xml 26 Jan 2003 08:37:25 -0000 1.2
+++ build-tests-orion1x.xml 30 Jan 2003 10:40:32 -0000 1.3
@@ -108,7 +108,7 @@
========================================================================
-->
<target name="cactus.setup.orion1x"
- depends="cactus.check.orion1x" if="cactus.home.orion1x"
+ depends="cactus.init, cactus.check.orion1x" if="cactus.home.orion1x"
description="Set up a Orion 1.x directory structure">
<!-- Create work and conf directories and copy configuration files -->
@@ -124,3 +124,14 @@
</copy>
</target>
+
+ <!--
+ ========================================================================
+ Clean generated files (including distributables)
+ ========================================================================
+ -->
+ <target name="cactus.clean.orion1x" depends="cactus.init, cactus.clean" description="Clean target directory">
+ <delete includeEmptyDirs="true">
+ <fileset dir="${cactus.target.orion1x}"/>
+ </delete>
+ </target>
\ No newline at end of file
1.6 +51 -1 jakarta-cactus/petals/ant/src/scripts/share/build-share.xml
Index: build-share.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-share.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-share.xml 26 Jan 2003 08:37:25 -0000 1.5
+++ build-share.xml 30 Jan 2003 10:40:32 -0000 1.6
@@ -153,6 +153,46 @@
<!--
========================================================================
+ Framework-cactifify a plain war (pointed to by the cactus.war property).
+ Difference with cactus.war : does not include Cactus test classes.
+ ========================================================================
+ -->
+ <target name="cactus.war.framework" depends="cactus.compile"
+ description="Cactify the war">
+
+ <unwar src="${cactus.war}"
+ dest="${cactus.target.dir}/${cactus.context}"/>
+
+ <!-- TODO: Perform a web.xml merge -->
+
+ <!-- Copy the Cactus web.xml -->
+ <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF">
+ <fileset dir="${cactus.conf.dir}">
+ <include name="web.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the Cactus jars -->
+ <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib">
+ <fileset dir="${cactus.lib.server.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${cactus.lib.common.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the JSP Redirector -->
+ <copy todir="${cactus.target.dir}/${cactus.context}">
+ <fileset dir="${cactus.conf.dir}">
+ <include name="jspRedirector.jsp"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <!--
+ ========================================================================
Trigger the Cactus test by running a JUnit Test Runner
========================================================================
-->
@@ -188,4 +228,14 @@
</junit>
</target>
-
\ No newline at end of file
+
+ <!--
+ ========================================================================
+ Clean generated files (including distributables)
+ ========================================================================
+ -->
+ <target name="cactus.clean" depends="cactus.init" description="Clean target directory">
+ <delete includeEmptyDirs="true">
+ <fileset dir="${cactus.target.dir}/${cactus.context}"/>
+ </delete>
+ </target>
\ No newline at end of file
1.3 +12 -1 jakarta-cactus/petals/ant/src/scripts/share/build-tests-resin2x.xml
Index: build-tests-resin2x.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-resin2x.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-resin2x.xml 26 Jan 2003 08:37:25 -0000 1.2
+++ build-tests-resin2x.xml 30 Jan 2003 10:40:32 -0000 1.3
@@ -117,7 +117,7 @@
========================================================================
-->
<target name="cactus.setup.resin2x"
- depends="cactus.check.resin2x" if="cactus.home.resin2x"
+ depends="cactus.init, cactus.check.resin2x" if="cactus.home.resin2x"
description="Set up a Resin 2.x directory structure">
<mkdir dir="${cactus.target.resin2x}"/>
@@ -127,3 +127,14 @@
tofile="${cactus.target.resin2x}/resin.conf" filtering="on"/>
</target>
+
+ <!--
+ ========================================================================
+ Clean generated files (including distributables)
+ ========================================================================
+ -->
+ <target name="cactus.clean.resin2x" depends="cactus.init, cactus.clean" description="Clean target directory">
+ <delete includeEmptyDirs="true">
+ <fileset dir="${cactus.target.resin2x}"/>
+ </delete>
+ </target>
\ No newline at end of file
1.5 +12 -1 jakarta-cactus/petals/ant/src/scripts/share/build-tests-tomcat4x.xml
Index: build-tests-tomcat4x.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-tomcat4x.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-tomcat4x.xml 26 Jan 2003 08:37:25 -0000 1.4
+++ build-tests-tomcat4x.xml 30 Jan 2003 10:40:32 -0000 1.5
@@ -114,7 +114,7 @@
========================================================================
-->
<target name="cactus.setup.tomcat4x"
- depends="cactus.check.tomcat4x" if="cactus.home.tomcat4x"
+ depends="cactus.init, cactus.check.tomcat4x" if="cactus.home.tomcat4x"
description="Set up a Tomcat 4.x directory structure">
<!-- Create work and conf directories and copy configuration files -->
@@ -140,3 +140,14 @@
todir="${cactus.target.tomcat4x}/conf"/>
</target>
+
+ <!--
+ ========================================================================
+ Clean generated files (including distributables)
+ ========================================================================
+ -->
+ <target name="cactus.clean.tomcat4x" depends="cactus.init, cactus.clean" description="Clean target directory">
+ <delete includeEmptyDirs="true">
+ <fileset dir="${cactus.target.tomcat4x}"/>
+ </delete>
+ </target>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org