Author: julien(a)jboss.com Date: 2007-09-17 16:59:55 -0400 (Mon, 17 Sep 2007) New Revision: 8300 Modified: modules/web/trunk/tools/etc/buildfragments/buildmagic.ent modules/web/trunk/web/build.xml Log: slightly improve the build file Modified: modules/web/trunk/tools/etc/buildfragments/buildmagic.ent =================================================================== --- modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-17 20:32:44 UTC (rev 8299) +++ modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-17 20:59:55 UTC (rev 8300) @@ -102,7 +102,8 @@ </and> </condition> - <!-- Define tomcat home --> + <!-- Define Tomcat homes --> + <condition property="tomcat-6.0.home" value="${env.TOMCAT_6_0_HOME}"> <and> <not> Modified: modules/web/trunk/web/build.xml =================================================================== --- modules/web/trunk/web/build.xml 2007-09-17 20:32:44 UTC (rev 8299) +++ modules/web/trunk/web/build.xml 2007-09-17 20:59:55 UTC (rev 8300) @@ -391,7 +391,6 @@ </target> <target name="tests.jboss-4.2" depends="init"> - <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME"> <condition> <and> @@ -404,35 +403,35 @@ </and> </condition> </fail> - <antcall target="tests.jboss-4.2.container-servlet"> <param name="test.id" value="JBoss-4_2_0-container-servlet"/> <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> <param name="test.jboss-4.2.home" value="${jboss-4.2.0.home}"/> <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.0.home"/> </antcall> - <antcall target="tests.jboss-4.2.container-servlet"> <param name="test.id" value="JBoss-4_2_1-container-servlet"/> <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_1"/> <param name="test.jboss-4.2.home" value="${jboss-4.2.1.home}"/> <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.1.home"/> </antcall> - <antcall target="tests.jboss-4.2.generic"> <param name="test.id" value="JBoss-4_2_0-generic"/> <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> <param name="test.jboss-4.2.home" value="${jboss-4.2.0.home}"/> <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.0.home"/> </antcall> - <antcall target="tests.jboss-4.2.generic"> <param name="test.id" value="JBoss-4_2_1-generic"/> <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_1"/> <param name="test.jboss-4.2.home" value="${jboss-4.2.1.home}"/> <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.1.home"/> </antcall> + </target> + <target name="tests.jboss" depends="init"> + <antcall target="tests.jboss-4.2"> + </antcall> </target> <target name="cargo.tomcat-6.start" depends="cargo.setup"> @@ -472,32 +471,6 @@ </cargo> </target> - <target name="tests.tomcat-6" depends="init"> - - <fail message="Please set the environment variable JBOSS_6_0_HOME"> - <condition> - <and> - <not> - <isset property="tomcat-6.0.home"/> - </not> - </and> - </condition> - </fail> - - <antcall target="tests.tomcat-6.container-servlet"> - <param name="test.id" value="Tomcat-6_0-container-servlet"/> - <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> - <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> - <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> - </antcall> - <antcall target="tests.tomcat-6.generic"> - <param name="test.id" value="Tomcat-6_0-generic"/> - <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> - <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> - <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> - </antcall> - </target> - <target name="tests.tomcat-6.container-servlet" depends="init" if="${test.tomcat-6.home.variable-name}"> <echo message="Starting Tomcat 6 container-servlet tests with ${test.tomcat-6.home}"/> <antcall target="cargo.tomcat-6.start"> @@ -527,6 +500,35 @@ </antcall> </target> + <target name="tests.tomcat-6" depends="init"> + <fail message="Please set the environment variable JBOSS_6_0_HOME"> + <condition> + <and> + <not> + <isset property="tomcat-6.0.home"/> + </not> + </and> + </condition> + </fail> + <antcall target="tests.tomcat-6.container-servlet"> + <param name="test.id" value="Tomcat-6_0-container-servlet"/> + <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> + <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> + <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> + </antcall> + <antcall target="tests.tomcat-6.generic"> + <param name="test.id" value="Tomcat-6_0-generic"/> + <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> + <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> + <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> + </antcall> + </target> + + <target name="tests.tomcat" depends="init"> + <antcall target="tests.tomcat-6.generic"> + </antcall> + </target> + <target name="tests" depends="init"> <antcall target="tests.local"/> <antcall target="tests.jboss-4.2"/>