vmassol 2003/01/26 00:37:26
Modified: petals/ant/src/scripts/share build-share.xml
build-tests-tomcat4x.xml build-tests-orion1x.xml
build-tests-weblogic7x.xml build-tests-resin2x.xml
petals/ant/src/scripts/j2ee13 build-tests-jboss3x.xml
build.xml
Log:
Replace tabs by spaces. I hate this Eclipse XML editor! Does anyone know of a good
one that insert spaces and not tabs? :-)
Revision Changes Path
1.5 +104 -104 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-share.xml 25 Jan 2003 21:49:48 -0000 1.4
+++ build-share.xml 26 Jan 2003 08:37:25 -0000 1.5
@@ -1,24 +1,24 @@
- <!-- Global properties -->
-
- <!-- Default port on which to start the containers -->
- <property name="cactus.port" value="8080"/>
+ <!-- Global properties -->
+
+ <!-- Default port on which to start the containers -->
+ <property name="cactus.port" value="8080"/>
- <!-- Tmp dir used by Cactus for its operations -->
+ <!-- Tmp dir used by Cactus for its operations -->
<property name="cactus.target.dir" value="target"/>
- <!-- Default Cactus test files to include in the test -->
- <property name="cactus.src.includes" value="**/*Test*.java"/>
+ <!-- Default Cactus test files to include in the test -->
+ <property name="cactus.src.includes" value="**/*Test*.java"/>
- <!-- Default Cactus test files to exclude from the test -->
- <property name="cactus.src.excludes" value="**/AllTests.java"/>
+ <!-- Default Cactus test files to exclude from the test -->
+ <property name="cactus.src.excludes" value="**/AllTests.java"/>
- <!-- Default Java VM to use for java Ant tasks -->
- <property name="cactus.jvm" value="java"/>
-
- <!-- Default webapp context -->
- <property name="cactus.context" value="cactustest"/>
-
+ <!-- Default Java VM to use for java Ant tasks -->
+ <property name="cactus.jvm" value="java"/>
+
+ <!-- Default webapp context -->
+ <property name="cactus.context" value="cactustest"/>
+
<!--
========================================================================
Set the properties related to the source tree.
@@ -31,27 +31,27 @@
<property name="cactus.lib.common.dir" value="${cactus.lib.dir}/common"/>
<property name="cactus.script.dir" value="scripts"/>
- <property name="cactus.target.classes.dir"
value="${cactus.target.dir}/classes"/>
+ <property name="cactus.target.classes.dir"
value="${cactus.target.dir}/classes"/>
- <!-- Cactus related jar locations -->
- <property name="cactus.petal.ant.jar"
- value="${cactus.lib.client.dir}[EMAIL PROTECTED]@"/>
-
- <property name="cactus.framework.jar"
- value="${cactus.lib.common.dir}[EMAIL PROTECTED]@"/>
- <property name="cactus.log4j.jar"
- value="${cactus.lib.common.dir}[EMAIL PROTECTED]@"/>
- <property name="cactus.aspectjrt.jar"
- value="${cactus.lib.common.dir}[EMAIL PROTECTED]@"/>
- <property name="cactus.commons.logging.jar"
- value="${cactus.lib.common.dir}[EMAIL PROTECTED]@"/>
- <property name="cactus.junit.jar"
- value="${cactus.lib.common.dir}[EMAIL PROTECTED]@"/>
-
- <property name="cactus.commons.httpclient.jar"
- value="${cactus.lib.client.dir}[EMAIL PROTECTED]@"/>
- <property name="cactus.httpunit.jar"
- value="${cactus.lib.client.dir}[EMAIL PROTECTED]@"/>
+ <!-- Cactus related jar locations -->
+ <property name="cactus.petal.ant.jar"
+ value="${cactus.lib.client.dir}[EMAIL PROTECTED]@"/>
+
+ <property name="cactus.framework.jar"
+ value="${cactus.lib.common.dir}[EMAIL PROTECTED]@"/>
+ <property name="cactus.log4j.jar"
+ value="${cactus.lib.common.dir}[EMAIL PROTECTED]@"/>
+ <property name="cactus.aspectjrt.jar"
+ value="${cactus.lib.common.dir}[EMAIL PROTECTED]@"/>
+ <property name="cactus.commons.logging.jar"
+ value="${cactus.lib.common.dir}[EMAIL PROTECTED]@"/>
+ <property name="cactus.junit.jar"
+ value="${cactus.lib.common.dir}[EMAIL PROTECTED]@"/>
+
+ <property name="cactus.commons.httpclient.jar"
+ value="${cactus.lib.client.dir}[EMAIL PROTECTED]@"/>
+ <property name="cactus.httpunit.jar"
+ value="${cactus.lib.client.dir}[EMAIL PROTECTED]@"/>
<!--
========================================================================
@@ -86,69 +86,69 @@
<javac destdir="${cactus.target.classes.dir}" srcdir="${cactus.src.dir}">
<classpath>
- <pathelement location="${cactus.framework.jar}"/>
- <pathelement location="${cactus.log4j.jar}"/>
- <pathelement location="${cactus.aspectjrt.jar}"/>
- <pathelement location="${cactus.commons.logging.jar}"/>
- <pathelement location="${cactus.junit.jar}"/>
- <pathelement
location="${cactus.commons.httpclient.jar}"/>
- <pathelement location="${cactus.httpunit.jar}"/>
+ <pathelement location="${cactus.framework.jar}"/>
+ <pathelement location="${cactus.log4j.jar}"/>
+ <pathelement location="${cactus.aspectjrt.jar}"/>
+ <pathelement location="${cactus.commons.logging.jar}"/>
+ <pathelement location="${cactus.junit.jar}"/>
+ <pathelement location="${cactus.commons.httpclient.jar}"/>
+ <pathelement location="${cactus.httpunit.jar}"/>
<path refid="cactus.classpath"/>
</classpath>
</javac>
- <!-- Copy non-java files -->
- <copy todir="${cactus.target.classes.dir}">
- <fileset dir="${cactus.src.dir}">
- <exclude name="**/*.java"/>
- <exclude name="**/*.html"/>
- </fileset>
- </copy>
-
- </target>
-
+ <!-- Copy non-java files -->
+ <copy todir="${cactus.target.classes.dir}">
+ <fileset dir="${cactus.src.dir}">
+ <exclude name="**/*.java"/>
+ <exclude name="**/*.html"/>
+ </fileset>
+ </copy>
+
+ </target>
+
<!--
========================================================================
Cactifify a plain war (pointed to by the cactus.war property).
========================================================================
-->
<target name="cactus.war" 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 test classes -->
- <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/classes">
- <fileset dir="${cactus.target.classes.dir}"/>
- </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>
-
+ 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 test classes -->
+ <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/classes">
+ <fileset dir="${cactus.target.classes.dir}"/>
+ </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>
<!--
@@ -161,29 +161,29 @@
<junit printsummary="yes" haltonfailure="yes" haltonerror="yes"
fork="yes">
- <jvmarg
value="-Dcactus.contextURL=http://localhost:${cactus.port}/${cactus.context}"/>
-
+ <jvmarg
value="-Dcactus.contextURL=http://localhost:${cactus.port}/${cactus.context}"/>
+
<classpath>
- <pathelement location="${cactus.target.classes.dir}"/>
- <pathelement location="${cactus.framework.jar}"/>
- <pathelement location="${cactus.log4j.jar}"/>
- <pathelement location="${cactus.aspectjrt.jar}"/>
- <pathelement location="${cactus.commons.logging.jar}"/>
- <pathelement location="${cactus.junit.jar}"/>
- <pathelement
location="${cactus.commons.httpclient.jar}"/>
- <pathelement location="${cactus.httpunit.jar}"/>
+ <pathelement location="${cactus.target.classes.dir}"/>
+ <pathelement location="${cactus.framework.jar}"/>
+ <pathelement location="${cactus.log4j.jar}"/>
+ <pathelement location="${cactus.aspectjrt.jar}"/>
+ <pathelement location="${cactus.commons.logging.jar}"/>
+ <pathelement location="${cactus.junit.jar}"/>
+ <pathelement location="${cactus.commons.httpclient.jar}"/>
+ <pathelement location="${cactus.httpunit.jar}"/>
<path refid="cactus.classpath"/>
</classpath>
<formatter type="plain" usefile="false"/>
- <!-- TODO: Automatically discover Cactus tests -->
+ <!-- TODO: Automatically discover Cactus tests -->
- <batchtest>
- <fileset dir="${cactus.src.dir}"
- includes="${cactus.src.includes}"
- excludes="${cactus.src.excludes}"/>
- </batchtest>
+ <batchtest>
+ <fileset dir="${cactus.src.dir}"
+ includes="${cactus.src.includes}"
+ excludes="${cactus.src.excludes}"/>
+ </batchtest>
</junit>
1.4 +8 -8
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-tomcat4x.xml 25 Jan 2003 11:29:39 -0000 1.3
+++ build-tests-tomcat4x.xml 26 Jan 2003 08:37:25 -0000 1.4
@@ -1,5 +1,5 @@
- <!-- Global properties -->
+ <!-- Global properties -->
<property name="cactus.conf.tomcat4x" value="${cactus.conf.dir}/tomcat4x"/>
<property name="cactus.target.tomcat4x" value="${cactus.target.dir}/tomcat4x"/>
@@ -9,7 +9,7 @@
========================================================================
-->
<target name="cactus.run.tomcat4x"
- depends="cactus.init,cactus.setup.tomcat4x,cactus.war,cactus.deploy.tomcat4x"
+
depends="cactus.init,cactus.setup.tomcat4x,cactus.war,cactus.deploy.tomcat4x"
if="cactus.home.tomcat4x" description="Run tests on Tomcat 4.x">
<!-- Start the servlet engine, wait for it to be started, run the
@@ -98,15 +98,15 @@
========================================================================
-->
<target name="cactus.deploy.tomcat4x"
- description="Deploy the webapp on Tomcat 4.x">
+ description="Deploy the webapp on Tomcat 4.x">
<!-- Copy the webapp -->
- <copy todir="${cactus.target.tomcat4x}/webapps/${cactus.context}">
- <fileset dir="${cactus.target.dir}/${cactus.context}"/>
- </copy>
+ <copy todir="${cactus.target.tomcat4x}/webapps/${cactus.context}">
+ <fileset dir="${cactus.target.dir}/${cactus.context}"/>
+ </copy>
- </target>
-
+ </target>
+
<!--
========================================================================
Set up a valid Tomcat 4.x directory structure in the
1.2 +9 -9
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-orion1x.xml 25 Jan 2003 21:49:48 -0000 1.1
+++ build-tests-orion1x.xml 26 Jan 2003 08:37:25 -0000 1.2
@@ -1,5 +1,5 @@
- <!-- Global properties -->
+ <!-- Global properties -->
<property name="cactus.conf.orion1x" value="${cactus.conf.dir}/orion1x"/>
<property name="cactus.target.orion1x" value="${cactus.target.dir}/orion1x"/>
@@ -9,7 +9,7 @@
========================================================================
-->
<target name="cactus.run.orion1x"
- depends="cactus.init,cactus.setup.orion1x,cactus.war,cactus.deploy.orion1x"
+ depends="cactus.init,cactus.setup.orion1x,cactus.war,cactus.deploy.orion1x"
if="cactus.home.orion1x" description="Run tests on Orion 1.x">
<!-- Start the servlet engine, wait for it to be started, run the
@@ -33,8 +33,8 @@
depends="cactus.check.orion1x" if="cactus.home.orion1x">
<java jvm="${cactus.jvm}" classname="com.evermind.server.ApplicationServer"
- fork="yes">
-
+ fork="yes">
+
<arg value="-config"/>
<arg value="${cactus.target.orion1x}/conf/server.xml"/>
<classpath>
@@ -93,13 +93,13 @@
========================================================================
-->
<target name="cactus.deploy.orion1x"
- description="Deploy the webapp on Orion 1.x">
+ description="Deploy the webapp on Orion 1.x">
- <jar destfile="${cactus.target.orion1x}/${cactus.context}.war">
- <fileset dir="${cactus.target.dir}/${cactus.context}"/>
- </jar>
+ <jar destfile="${cactus.target.orion1x}/${cactus.context}.war">
+ <fileset dir="${cactus.target.dir}/${cactus.context}"/>
+ </jar>
- </target>
+ </target>
<!--
========================================================================
1.2 +15 -15
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-weblogic7x.xml 26 Jan 2003 08:26:39 -0000 1.1
+++ build-tests-weblogic7x.xml 26 Jan 2003 08:37:25 -0000 1.2
@@ -1,11 +1,11 @@
- <!-- Global properties -->
+ <!-- Global properties -->
<property name="cactus.conf.weblogic7x" value="${cactus.conf.dir}/weblogic7x"/>
<property name="cactus.target.weblogic7x"
value="${cactus.target.dir}/weblogic7x"/>
- <!-- Location of WebLogic server directory. Can be overriden by calling
- scripts -->
- <property name="cactus.weblogic7x.server"
+ <!-- Location of WebLogic server directory. Can be overriden by calling
+ scripts -->
+ <property name="cactus.weblogic7x.server"
value="${cactus.home.weblogic7x}/weblogic700/server"/>
<!--
@@ -14,7 +14,7 @@
========================================================================
-->
<target name="cactus.run.weblogic7x"
-
depends="cactus.init,cactus.setup.weblogic7x,cactus.war,cactus.deploy.weblogic7x"
+
depends="cactus.init,cactus.setup.weblogic7x,cactus.war,cactus.deploy.weblogic7x"
if="cactus.home.weblogic7x" description="Run tests on WebLogic 7.x">
<!-- Start the servlet engine, wait for it to be started, run the
@@ -106,26 +106,26 @@
========================================================================
-->
<target name="cactus.deploy.weblogic7x"
- description="Deploy the webapp on WebLogic 7.x">
+ description="Deploy the webapp on WebLogic 7.x">
<!-- Copy the webapp -->
- <mkdir dir="${cactus.target.weblogic7x}/tmp/${cactus.context}"/>
- <copy todir="${cactus.target.weblogic7x}/tmp/${cactus.context}">
- <fileset dir="${cactus.target.dir}/${cactus.context}"/>
- </copy>
+ <mkdir dir="${cactus.target.weblogic7x}/tmp/${cactus.context}"/>
+ <copy todir="${cactus.target.weblogic7x}/tmp/${cactus.context}">
+ <fileset dir="${cactus.target.dir}/${cactus.context}"/>
+ </copy>
<!-- Add the WebLogic specific descriptors -->
- <copy
todir="${cactus.target.weblogic7x}/tmp/${cactus.context}/WEB-INF">
+ <copy todir="${cactus.target.weblogic7x}/tmp/${cactus.context}/WEB-INF">
<fileset dir="${cactus.conf.weblogic7x}">
<include name="weblogic.xml"/>
</fileset>
</copy>
- <jar
destfile="${cactus.target.weblogic7x}/testdomain/applications/${cactus.context}.war">
- <fileset
dir="${cactus.target.weblogic7x}/tmp/${cactus.context}"/>
- </jar>
+ <jar
destfile="${cactus.target.weblogic7x}/testdomain/applications/${cactus.context}.war">
+ <fileset dir="${cactus.target.weblogic7x}/tmp/${cactus.context}"/>
+ </jar>
- </target>
+ </target>
<!--
========================================================================
1.2 +8 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-resin2x.xml 25 Jan 2003 20:57:43 -0000 1.1
+++ build-tests-resin2x.xml 26 Jan 2003 08:37:25 -0000 1.2
@@ -1,5 +1,5 @@
- <!-- Global properties -->
+ <!-- Global properties -->
<property name="cactus.conf.resin2x" value="${cactus.conf.dir}/resin2x"/>
<property name="cactus.target.resin2x" value="${cactus.target.dir}/resin2x"/>
@@ -9,7 +9,7 @@
========================================================================
-->
<target name="cactus.run.resin2x"
- depends="cactus.init,cactus.setup.resin2x,cactus.war,cactus.deploy.resin2x"
+ depends="cactus.init,cactus.setup.resin2x,cactus.war,cactus.deploy.resin2x"
if="cactus.home.resin2x" description="Run tests on Resin 2.x">
<!-- Start the servlet engine, wait for it to be started, run the
@@ -33,7 +33,7 @@
depends="cactus.check.resin2x" if="cactus.home.resin2x">
<java jvm="${cactus.jvm}" classname="org.apache.cactus.petal.ant.ResinRun"
- fork="yes">
+ fork="yes">
<arg value="-start"/>
@@ -102,13 +102,13 @@
========================================================================
-->
<target name="cactus.deploy.resin2x"
- description="Deploy the webapp on Resin 2.x">
+ description="Deploy the webapp on Resin 2.x">
- <jar destfile="${cactus.target.resin2x}/${cactus.context}.war">
- <fileset dir="${cactus.target.dir}/${cactus.context}"/>
- </jar>
+ <jar destfile="${cactus.target.resin2x}/${cactus.context}.war">
+ <fileset dir="${cactus.target.dir}/${cactus.context}"/>
+ </jar>
- </target>
+ </target>
<!--
========================================================================
1.3 +21 -21
jakarta-cactus/petals/ant/src/scripts/j2ee13/build-tests-jboss3x.xml
Index: build-tests-jboss3x.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/petals/ant/src/scripts/j2ee13/build-tests-jboss3x.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-jboss3x.xml 25 Jan 2003 11:29:18 -0000 1.2
+++ build-tests-jboss3x.xml 26 Jan 2003 08:37:26 -0000 1.3
@@ -1,5 +1,5 @@
- <!-- Global properties -->
+ <!-- Global properties -->
<property name="cactus.conf.jboss3x" value="${cactus.conf.dir}/jboss3x"/>
<property name="cactus.target.jboss3x" value="${cactus.target.dir}/jboss3x"/>
@@ -9,7 +9,7 @@
========================================================================
-->
<target name="cactus.run.jboss3x"
- depends="cactus.init,cactus.setup.jboss3x,cactus.war,cactus.deploy.jboss3x"
+ depends="cactus.init,cactus.setup.jboss3x,cactus.war,cactus.deploy.jboss3x"
if="cactus.home.jboss3x" description="Run tests on JBoss 3.x">
<!-- Start the container, wait for it to be started, run the
@@ -32,7 +32,7 @@
<target name="cactus.start.jboss3x" description="Start JBoss 3.x"
depends="cactus.check.jboss3x" if="cactus.home.jboss3x">
- <dirname property="antfile.dir" file="${ant.file}"/>
+ <dirname property="antfile.dir" file="${ant.file}"/>
<java jvm="${cactus.jvm}" classname="org.jboss.Main" fork="yes">
@@ -44,7 +44,7 @@
<classpath>
<pathelement location="${cactus.home.jboss3x}/bin/run.jar"/>
- <pathelement path="${java.home}/../lib/tools.jar"/>
+ <pathelement path="${java.home}/../lib/tools.jar"/>
</classpath>
</java>
@@ -95,30 +95,30 @@
========================================================================
-->
<target name="cactus.deploy.jboss3x"
- description="Deploy the webapp on JBoss 3.x">
+ description="Deploy the webapp on JBoss 3.x">
- <!-- Note: It seems JBoss requires a war file in its deploy directory.
- It fails to deploy an expanded webapp (something may need to be
- configured to allow this?). -->
-
+ <!-- Note: It seems JBoss requires a war file in its deploy directory.
+ It fails to deploy an expanded webapp (something may need to be
+ configured to allow this?). -->
+
<!-- Copy the webapp -->
- <mkdir dir="${cactus.target.jboss3x}/tmp/${cactus.context}"/>
- <copy todir="${cactus.target.jboss3x}/tmp/${cactus.context}">
- <fileset dir="${cactus.target.dir}/${cactus.context}"/>
- </copy>
+ <mkdir dir="${cactus.target.jboss3x}/tmp/${cactus.context}"/>
+ <copy todir="${cactus.target.jboss3x}/tmp/${cactus.context}">
+ <fileset dir="${cactus.target.dir}/${cactus.context}"/>
+ </copy>
<!-- Add the JBoss specific configuration files -->
- <copy
todir="${cactus.target.jboss3x}/tmp/${cactus.context}/WEB-INF/classes">
+ <copy
todir="${cactus.target.jboss3x}/tmp/${cactus.context}/WEB-INF/classes">
<fileset dir="${cactus.conf.jboss3x}">
<include name="*.properties"/>
</fileset>
</copy>
- <jar
destfile="${cactus.home.jboss3x}/server/default/deploy/${cactus.context}.war">
- <fileset dir="${cactus.target.jboss3x}/tmp/${cactus.context}"/>
- </jar>
+ <jar
destfile="${cactus.home.jboss3x}/server/default/deploy/${cactus.context}.war">
+ <fileset dir="${cactus.target.jboss3x}/tmp/${cactus.context}"/>
+ </jar>
- </target>
+ </target>
<!--
========================================================================
@@ -130,7 +130,7 @@
depends="cactus.check.jboss3x" if="cactus.home.jboss3x"
description="Set up a JBoss 3.x directory structure">
- <!-- TODO: Find how to create a valid default server configuration.
- Copying the server/ directory does not seem to be enough -->
-
+ <!-- TODO: Find how to create a valid default server configuration.
+ Copying the server/ directory does not seem to be enough -->
+
</target>
1.7 +6 -6 jakarta-cactus/petals/ant/src/scripts/j2ee13/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/src/scripts/j2ee13/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 26 Jan 2003 08:26:39 -0000 1.6
+++ build.xml 26 Jan 2003 08:37:26 -0000 1.7
@@ -24,9 +24,9 @@
cactus.port [OPTIONAL] Port on which to start the
containers (Default is 8080)
- cactus.target.dir [OPTIONAL] Tmp directory for Cactus
- operations
-
+ cactus.target.dir [OPTIONAL] Tmp directory for Cactus
+ operations
+
cactus.war Location of the war to cactify
cactus.src.dir Location of Cactus java source files
@@ -47,9 +47,9 @@
is called from a java application that has
no shell.
- cactus.context [OPTIONAL] Webapp context to use for the
- cactified war. Defaults to "cactustest".
-
+ cactus.context [OPTIONAL] Webapp context to use for the
+ cactified war. Defaults to "cactustest".
+
The following Ant references need to be passed to this script:
cactus.classpath [OPTIONAL] The classpath reference for
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
