Author: julien(a)jboss.com Date: 2007-09-14 19:07:18 -0400 (Fri, 14 Sep 2007) New Revision: 8281 Modified: modules/web/trunk/build/build-thirdparty.xml modules/web/trunk/tools/etc/buildfragments/buildmagic.ent modules/web/trunk/web/build.xml Log: finished the configuration of web spi tests in tomcat and jboss Modified: modules/web/trunk/build/build-thirdparty.xml =================================================================== --- modules/web/trunk/build/build-thirdparty.xml 2007-09-14 21:39:10 UTC (rev 8280) +++ modules/web/trunk/build/build-thirdparty.xml 2007-09-14 23:07:18 UTC (rev 8281) @@ -66,7 +66,7 @@ <componentref name="jboss/jbossxb" version="1.0.0.GA-brew"/> <componentref name="junit" version="3.8.1"/> - <componentref name="codehaus/cargo" version="0.9"/> + <componentref name="codehaus/cargo" version="0.9-portal"/> <!-- Based on http://anonsvn.jboss.org/repos/jbossas/tags/EMBEDDED_JBOSS_BETA_2/build/b... --> <!-- Modified: modules/web/trunk/tools/etc/buildfragments/buildmagic.ent =================================================================== --- modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-14 21:39:10 UTC (rev 8280) +++ modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-14 23:07:18 UTC (rev 8281) @@ -84,12 +84,25 @@ <property environment="env"/> <!-- Define jboss home --> - <condition property="jboss.home" value="${env.JBOSS_HOME}"> - <not> - <isset property="jboss.home"/> - </not> + <condition property="jboss-4.2.home" value="${env.JBOSS_4_2_HOME}"> + <and> + <not> + <isset property="jboss-4.2.home"/> + </not> + <isset property="env.JBOSS_4_2_HOME"/> + </and> </condition> + <!-- Define jboss home --> + <condition property="tomcat-6.0.home" value="${env.TOMCAT_6_0_HOME}"> + <and> + <not> + <isset property="tomcat-6.0.home"/> + </not> + <isset property="env.TOMCAT_6_0_HOME"/> + </and> + </condition> + <!-- Setup the build.log --> <call target="_buildmagic:init:buildlog" unless="init-buildlog.disable"/> Modified: modules/web/trunk/web/build.xml =================================================================== --- modules/web/trunk/web/build.xml 2007-09-14 21:39:10 UTC (rev 8280) +++ modules/web/trunk/web/build.xml 2007-09-14 23:07:18 UTC (rev 8281) @@ -243,6 +243,8 @@ </target> <target name="cargo.setup" depends="init"> + <property name="cargo.log.dir" value="${build.output}/cargo"/> + <mkdir dir="${cargo.log.dir}"/> <taskdef resource="cargo.tasks"> <classpath> <path refid="codehaus.cargo.classpath"/> @@ -251,12 +253,11 @@ </target> <target name="cargo.jboss.start" depends="cargo.setup"> - <property name="cargo.jboss.home" value="/Users/julien/java/jboss-4.2.0.GA"/> <cargo containerId="jboss42x" - home="${cargo.jboss.home}" - output="jboss.log" - log="cargo.log" + home="${jboss-4.2.home}" + output="${cargo.log.dir}/cargo.jboss.server.log" + log="${cargo.log.dir}/cargo.jboss.log" action="start" wait="${cargo.wait}"> <sharedClasspath> @@ -274,10 +275,10 @@ </target> <target name="cargo.jboss.stop" depends="cargo.setup"> - <property name="cargo.jboss.home" value="/Users/julien/java/jboss-4.2.0.GA"/> <cargo containerId="jboss42x" - home="${cargo.jboss.home}" + home="${jboss-4.2.home}" + log="${cargo.log.dir}/cargo.jboss.log" action="stop"> <configuration> <property name="cargo.rmi.port" value="1099"/> @@ -286,12 +287,11 @@ </target> <target name="cargo.tomcat.start" depends="cargo.setup"> - <property name="tomcat.home" value="/Users/julien/java/apache-tomcat-6.0.14"/> <cargo containerId="tomcat5x" - home="${tomcat.home}" - output="tomcat.log" - log="cargo.log" + home="${tomcat-6.0.home}" + output="${cargo.log.dir}/cargo.tomcat.server.log" + log="${cargo.log.dir}/cargo.tomcat.log" action="start" wait="${cargo.wait}"> <sharedClasspath> @@ -306,17 +306,17 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> - <deployable type="war" file="manager.war"/> + <deployable type="war" file="${codehaus.cargo.lib}/manager.war"/> <deployable type="war" file="${build.lib}/tomcat-container-servlet-6.0/test-spi-server.war"/> </configuration> </cargo> </target> <target name="cargo.tomcat.stop" depends="cargo.setup"> - <property name="tomcat.home" value="/Users/julien/java/apache-tomcat-6.0.14"/> <cargo containerId="tomcat5x" - home="${cargo.jboss.home}" + home="${tomcat-6.0.home}" + log="${cargo.log.dir}/cargo.tomcat.log" action="stop"> <configuration> </configuration> @@ -324,10 +324,12 @@ </target> <target name="tests.jboss" depends="init"> + <fail unless="jboss-4.2.home" message="Please set the environment variable JBOSS_4_2_HOME"/> + <echo message="Starting JBoss 4.2 tests with ${jboss-4.2.home}"/> <antcall target="cargo.jboss.start"> <param name="wait" value="false"/> </antcall> - <antcall target="blah"> + <antcall target="tests.remote"> <param name="server.name" value="RemoteJBoss-4.2"/> </antcall> <antcall target="cargo.jboss.stop"> @@ -335,6 +337,8 @@ </target> <target name="tests.tomcat" depends="init"> + <fail unless="tomcat-6.0.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> + <echo message="Starting Tomcat 6.0 tests with ${tomcat-6.0.home}"/> <antcall target="cargo.tomcat.start"> <param name="wait" value="false"/> </antcall>