Author: ptahchiev
Date: Thu Jan 31 06:06:32 2008
New Revision: 617129
URL: http://svn.apache.org/viewvc?rev=617129&view=rev
Log:
Caro now gets the containers from the net and then we execute the tests inside
them - no need for installed container.
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ejb/build.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ejb/src/main/app/application.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/build.xml
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ejb/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ejb/build.xml?rev=617129&r1=617128&r2=617129&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ejb/build.xml
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ejb/build.xml Thu Jan
31 06:06:32 2008
@@ -146,7 +146,7 @@
========================================================================
-->
<target name="test" depends="cactifyear">
-
+ <echo>Please take a deep breath while Cargo gets JBoss for running
the sample ejb tests...</echo>
<cactus earfile="${cactified.ejb.archive.name}"
printsummary="yes">
<classpath>
@@ -155,8 +155,10 @@
<pathelement location="${cactus.build.dir}"/>
</classpath>
<containerset>
- <cargo containerId="${jboss.container.id}"
home="${jboss.container.home}" output="${logs.dir}/output.log"
- log="${logs.dir}/cargo.log">
+ <cargo containerId="${jboss.container.id}"
output="${logs.dir}/output.log" log="${logs.dir}/cargo.log">
+ <zipUrlInstaller
+
installUrl="http://heanet.dl.sourceforge.net/sourceforge/jboss/jboss-4.0.2.zip";
+ installDir="target/${jboss.container.id}"/>
<configuration>
<property
name="cargo.servlet.port" value="${cargo.servlet.port}"/>
<property name="cargo.logging"
value="${cargo.logging}"/>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ejb/src/main/app/application.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ejb/src/main/app/application.xml?rev=617129&r1=617128&r2=617129&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ejb/src/main/app/application.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ejb/src/main/app/application.xml
Thu Jan 31 06:06:32 2008
@@ -12,7 +12,7 @@
<display-name>cactus-sample-ejb</display-name>
<description>Cactus EJB Sample for J2EE 1.3</description>
<module>
- <ejb>samples-servlet-1.8.0-SNAPSHOT.jar</ejb>
+ <ejb>samples-ejb-1.8.0-SNAPSHOT.jar</ejb>
</module>
</application>
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/build.xml?rev=617129&r1=617128&r2=617129&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/build.xml
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/build.xml Thu
Jan 31 06:06:32 2008
@@ -143,6 +143,7 @@
========================================================================
-->
<target name="test" depends="cactifywar">
+ <echo>Please take a deep breath while Cargo gets the Tomcat for
running the sample servlet tests...</echo>
<cactus warfile="${cactified.servlet.archive.name}"
printsummary="yes">
<classpath>
@@ -150,9 +151,11 @@
<pathelement location="${build.dir}"/>
</classpath>
<containerset>
- <cargo containerId="${tomcat.container.id}"
home="${tomcat.container.home}" output="${logs.dir}/output.log"
- log="${logs.dir}/cargo.log">
- <configuration>
+ <cargo containerId="${tomcat.container.id}"
output="${logs.dir}/output.log" log="${logs.dir}/cargo.log">
+ <zipUrlInstaller
+
installUrl="http://apache.speedbone.de/tomcat/tomcat-5/v5.5.25/bin/apache-tomcat-5.5.25.zip";
+ installDir="target/${tomcat.container.id}"/>
+ <configuration>
<property
name="cargo.servlet.port" value="${cargo.servlet.port}"/>
<property name="cargo.logging"
value="${cargo.logging}"/>
<deployable
type="${cactus.sample.archive.type}" file="${cactified.servlet.archive.name}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
