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 fe...@apache.org on 2006/04/15 16:26:38 UTC
svn commit: r394294 - in /jakarta/cactus/trunk: ./
samples/ejb/src/scripts/share/ samples/jetty/src/script/ samples/servlet/
samples/servlet/src/scripts/share/
Author: felipeal
Date: Sat Apr 15 07:26:35 2006
New Revision: 394294
URL: http://svn.apache.org/viewcvs?rev=394294&view=rev
Log:
CACTUS-151: added cargo-ant jar on classpathes
Modified:
jakarta/cactus/trunk/build.properties.default
jakarta/cactus/trunk/build.xml
jakarta/cactus/trunk/dependencies.xml.default
jakarta/cactus/trunk/download.xml
jakarta/cactus/trunk/samples/ejb/src/scripts/share/build.xml
jakarta/cactus/trunk/samples/jetty/src/script/build.xml
jakarta/cactus/trunk/samples/servlet/build.xml
jakarta/cactus/trunk/samples/servlet/src/scripts/share/build.xml
Modified: jakarta/cactus/trunk/build.properties.default
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/build.properties.default?rev=394294&r1=394293&r2=394294&view=diff
==============================================================================
--- jakarta/cactus/trunk/build.properties.default (original)
+++ jakarta/cactus/trunk/build.properties.default Sat Apr 15 07:26:35 2006
@@ -193,8 +193,9 @@
jsp.12.jar = ${servlet.23.jar}
jsp.20.jar = ${lib.repo}/${jsp.20.project}/jars/${jsp.20.artifact}-${jsp.20.version}.jar
-# The location of the Cargo jar
+# The location of the Cargo jars
cargo.jar = ${lib.repo}/${cargo.project}/jars/${cargo.artifact}-${cargo.version}.jar
+cargo.ant.jar = ${lib.repo}/${cargo.ant.project}/jars/${cargo.ant.artifact}-${cargo.ant.version}.jar
# The location of the Commons Logging jar
commons.logging.jar = ${lib.repo}/${commons.logging.project}/jars/${commons.logging.artifact}-${commons.logging.version}.jar
@@ -225,10 +226,6 @@
# The location of the Hmlunit jar
htmlunit.jar = ${lib.repo}/${htmlunit.project}/jars/${htmlunit.artifact}-${htmlunit.version}.jar
-
-# The location of the Cargo jars
-cargo.jar = ${lib.repo}/${cargo.project}/jars/${cargo.artifact}-${cargo.version}.jar
-cargo-ant.jar = ${lib.repo}/${cargo-ant.project}/jars/${cargo-ant.artifact}-${cargo-ant.version}.jar
# Neko HTML (required by HttpUnit)
nekohtml.jar = ${lib.repo}/${nekohtml.project}/jars/${nekohtml.artifact}-${nekohtml.version}.jar
Modified: jakarta/cactus/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/build.xml?rev=394294&r1=394293&r2=394294&view=diff
==============================================================================
--- jakarta/cactus/trunk/build.xml (original)
+++ jakarta/cactus/trunk/build.xml Sat Apr 15 07:26:35 2006
@@ -211,6 +211,8 @@
prefix="${main.release.name}/lib"/>
<zipfileset file="${cargo.jar}"
prefix="${main.release.name}/lib"/>
+ <zipfileset file="${cargo.ant.jar}"
+ prefix="${main.release.name}/lib"/>
<zipfileset file="${commons.logging.jar}"
prefix="${main.release.name}/lib"/>
<zipfileset file="${commons.httpclient.jar}"
Modified: jakarta/cactus/trunk/dependencies.xml.default
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/dependencies.xml.default?rev=394294&r1=394293&r2=394294&view=diff
==============================================================================
--- jakarta/cactus/trunk/dependencies.xml.default (original)
+++ jakarta/cactus/trunk/dependencies.xml.default Sat Apr 15 07:26:35 2006
@@ -13,7 +13,7 @@
<cargo project="cargo"
artifact="cargo-core-uberjar" version="0.8"
url="http://cargo.codehaus.org/dist2/org/codehaus/cargo/cargo-core-uberjar/0.8/cargo-core-uberjar-0.8.jar"/>
- <cargo-ant project="cargo"
+ <cargo.ant project="cargo"
artifact="cargo-ant" version="0.8"
url="http://cargo.codehaus.org/dist2/org/codehaus/cargo/cargo-ant/0.8/cargo-ant-0.8.jar"/>
<checkstyle project="checkstyle"
Modified: jakarta/cactus/trunk/download.xml
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/download.xml?rev=394294&r1=394293&r2=394294&view=diff
==============================================================================
--- jakarta/cactus/trunk/download.xml (original)
+++ jakarta/cactus/trunk/download.xml Sat Apr 15 07:26:35 2006
@@ -131,7 +131,7 @@
<download jar="aspectjrt"/>
<download jar="aspectj-tools"/>
<download jar="cargo"/>
- <download jar="cargo-ant"/>
+ <download jar="cargo.ant"/>
<download jar="checkstyle"/>
<download jar="clover"/>
<download jar="commons.beanutils"/>
Modified: jakarta/cactus/trunk/samples/ejb/src/scripts/share/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/samples/ejb/src/scripts/share/build.xml?rev=394294&r1=394293&r2=394294&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/src/scripts/share/build.xml (original)
+++ jakarta/cactus/trunk/samples/ejb/src/scripts/share/build.xml Sat Apr 15 07:26:35 2006
@@ -99,6 +99,8 @@
location="../../lib/@cactus.ant.jar.name@"/>
<property name="cargo.jar"
location="../../lib/@cargo.jar.name@"/>
+ <property name="cargo.ant.jar"
+ location="../../lib/@cargo.ant.jar.name@"/>
<property name="commons.httpclient.jar"
location="../../lib/@commons.httpclient.jar.name@"/>
<property name="commons.logging.jar"
@@ -111,6 +113,7 @@
<pathelement location="${cactus.jar}"/>
<pathelement location="${cactus.ant.jar}"/>
<pathelement location="${cargo.jar}"/>
+ <pathelement location="${cargo.ant.jar}"/>
<pathelement location="${commons.httpclient.jar}"/>
<pathelement location="${commons.logging.jar}"/>
<pathelement location="${junit.jar}"/>
@@ -364,13 +367,13 @@
<mkdir dir="${target.dir}/@{containerKey}"/>
<mkdir dir="${target.dir}/@{containerKey}/config"/>
<cargo id="@{containerKey}" containerId="@{containerKey}" action="start"
- homeDir="${cactus.home.@{containerKey}}"
+ home="${cactus.home.@{containerKey}}"
log="${target.dir}/@{containerKey}/cargo_start.log"
output="${target.dir}/@{containerKey}/container_start.log">
<configuration dir="${target.dir}/@{containerKey}/config">
<property name="cargo.servlet.port" value="${cactus.port}"/>
<property name="cargo.logging" value="high"/>
- <ear earfile="${target.dir}/${project.name.file}-cactified.ear"/>
+ <deployable type="ear" file="${target.dir}/${project.name.file}-cactified.ear"/>
</configuration>
<!-- Configure Cactus for logging -->
<syspropertyset file="${target.dir.normalized}/logging_server.properties"/>
@@ -409,8 +412,8 @@
<target name="test" depends="test.prepare"
description="Run the tests on the defined containers">
- <!-- Need to add jboss 3.x once it is supported by Cargo: -->
<test-ejb containerKey="jboss3x"/>
+ <test-ejb containerKey="jboss4x"/>
<test-ejb containerKey="orion1x"/>
<test-ejb containerKey="orion2x"/>
<test-ejb containerKey="weblogic8x"/>
Modified: jakarta/cactus/trunk/samples/jetty/src/script/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/samples/jetty/src/script/build.xml?rev=394294&r1=394293&r2=394294&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/src/script/build.xml (original)
+++ jakarta/cactus/trunk/samples/jetty/src/script/build.xml Sat Apr 15 07:26:35 2006
@@ -98,6 +98,8 @@
location="../../lib/@cactus.jar.name@"/>
<property name="cargo.jar"
location="../../lib/@cargo.jar.name@"/>
+ <property name="cargo.ant.jar"
+ location="../../lib/@cargo.ant.jar.name@"/>
<property name="commons.httpclient.jar"
location="../../lib/@commons.httpclient.jar.name@"/>
<property name="commons.logging.jar"
@@ -116,6 +118,7 @@
<pathelement location="${aspectjrt.jar}"/>
<pathelement location="${cactus.jar}"/>
<pathelement location="${cargo.jar}"/>
+ <pathelement location="${cargo.ant.jar}"/>
<pathelement location="${commons.httpclient.jar}"/>
<pathelement location="${commons.logging.jar}"/>
<pathelement location="${jasper-compiler.jar}"/>
Modified: jakarta/cactus/trunk/samples/servlet/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/samples/servlet/build.xml?rev=394294&r1=394293&r2=394294&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/servlet/build.xml (original)
+++ jakarta/cactus/trunk/samples/servlet/build.xml Sat Apr 15 07:26:35 2006
@@ -142,6 +142,7 @@
<filterset id="jar.names">
<filter token="cargo.jar.name" value="${cargo.jar.name}"/>
+ <filter token="cargo.ant.name" value="${cargo.ant.name}"/>
<filter token="jstl.jar.name" value="${jstl.jar.name}"/>
<filter token="standard.jar.name" value="${standard.jar.name}"/>
<filter token="servlet.jar.name" value="${servlet.jar.name}"/>
@@ -174,6 +175,7 @@
<echo> cactus.ant.jar = [${cactus.ant.jar}]</echo>
<echo> cactus.jar = [${cactus.jar}]</echo>
<echo> cargo.jar = [${cargo.jar}]</echo>
+ <echo> cargo.ant.jar = [${cargo.ant.jar}]</echo>
<echo> commons.httpclient.jar = [${commons.httpclient.jar}]</echo>
<echo> commons.logging.jar = [${commons.logging.jar}]</echo>
<echo> htmlunit.jar = [${htmlunit.jar}]</echo>
@@ -198,6 +200,7 @@
<available file="${cactus.jar}"/>
<available file="${cactus.ant.jar}"/>
<available file="${cargo.jar}"/>
+ <available file="${cargo.ant.jar}"/>
<available file="${commons.httpclient.jar}"/>
<available file="${commons.logging.jar}"/>
<available file="${httpunit.jar}"/>
@@ -358,6 +361,8 @@
<property name="cactus.ant.jar" location="${test.cactus.ant.jar}"/>
<property name="servlet.jar" value="${servlet.jar}"/>
<property name="clover.jar" value="${clover.jar}"/>
+ <property name="cargo.jar" location="${cargo.jar}"/>
+ <property name="cargo.ant.jar" location="${cargo.ant.jar}"/>
</ant>
</target>
Modified: jakarta/cactus/trunk/samples/servlet/src/scripts/share/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/samples/servlet/src/scripts/share/build.xml?rev=394294&r1=394293&r2=394294&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/servlet/src/scripts/share/build.xml (original)
+++ jakarta/cactus/trunk/samples/servlet/src/scripts/share/build.xml Sat Apr 15 07:26:35 2006
@@ -118,6 +118,8 @@
location="../../lib/@nekohtml.jar.name@"/>
<property name="cargo.jar"
location="../../lib/@cargo.jar.name@"/>
+ <property name="cargo.ant.jar"
+ location="../../lib/@cargo.ant.jar.name@"/>
<!-- This is optional and only needed if you wish to debug and use
Log4J for logging -->
@@ -130,6 +132,7 @@
<pathelement location="${cactus.jar}"/>
<pathelement location="${cactus.ant.jar}"/>
<pathelement location="${cargo.jar}"/>
+ <pathelement location="${cargo.ant.jar}"/>
<pathelement location="${commons.httpclient.jar}"/>
<pathelement location="${commons.logging.jar}"/>
<pathelement location="${junit.jar}"/>
@@ -327,7 +330,7 @@
<mkdir dir="${target.dir}/@{containerKey}"/>
<mkdir dir="${target.dir}/@{containerKey}/config"/>
<cargo id="@{containerKey}" containerId="@{containerKey}" action="start"
- homeDir="${cactus.home.@{containerKey}}"
+ home="${cactus.home.@{containerKey}}"
log="${target.dir}/@{containerKey}/cargo_start.log"
output="${target.dir}/@{containerKey}/container_start.log">
<configuration dir="${target.dir}/@{containerKey}/config">
@@ -335,7 +338,7 @@
<property name="cargo.servlet.users" value="${cactus.securitytest.users}"/>
<property name="cargo.logging" value="high"/>
- <war warfile="${target.dir}/${project.name.file}-cactified.war"/>
+ <deployable type="war" file="${target.dir}/${project.name.file}-cactified.war"/>
</configuration>
<!-- Configure Cactus for logging -->
<syspropertyset file="${target.dir.normalized}/logging_server.properties"/>
@@ -455,8 +458,8 @@
<target name="test" depends="test.prepare"
description="Run the tests on the defined containers">
- <@j2ee13.begin@test-container containerKey="jboss3x"/@j2ee13.end@>
-
+ <test-container containerKey="jboss3x"/>
+ <test-container containerKey="jboss4x"/>
<test-container containerKey="oc4j9x"/>
<test-container containerKey="orion1x"/>
<test-container containerKey="orion2x"/>
@@ -466,7 +469,6 @@
<test-container containerKey="tomcat4x"/>
<test-container containerKey="tomcat5x"/>
<test-container containerKey="weblogic8x"/>
-
<fail if="tests.failed">At least one test failed!</fail>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org