Author: alain_defrance Date: 2010-12-22 10:25:50 -0500 (Wed, 22 Dec 2010) New Revision: 5629 Modified: components/pc/branches/adf/test/servers/jboss42/pom.xml components/pc/branches/adf/test/servers/jboss42/src/test/build.xml components/pc/branches/adf/test/servers/jboss51/pom.xml components/pc/branches/adf/test/servers/jboss51/src/test/build.xml components/pc/branches/adf/test/servers/jetty6/pom.xml components/pc/branches/adf/test/servers/jetty6/src/test/build.xml components/pc/branches/adf/test/servers/src/common/resources/common.xml components/pc/branches/adf/test/servers/tomcat6/pom.xml components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml components/pc/branches/adf/test/servers/tomcat7/pom.xml components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml Log: Some details Modified: components/pc/branches/adf/test/servers/jboss42/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss42/pom.xml 2010-12-22 14:43:41 UTC (rev 5628) +++ components/pc/branches/adf/test/servers/jboss42/pom.xml 2010-12-22 15:25:50 UTC (rev 5629) @@ -268,56 +268,6 @@ </build> </profile> <profile> - <id>all</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <test.ext>true</test.ext> - <test.tck>true</test.tck> - <test.api>true</test.api> - <test.jsr286-ext>true</test.jsr286-ext> - <test.jsr286-tck>true</test.jsr286-tck> - <test.jsr286-api>true</test.jsr286-api> - </properties> - </profile> - <profile> - <id>ext</id> - <properties> - <test.ext>ext</test.ext> - </properties> - </profile> - <profile> - <id>tck</id> - <properties> - <test.tck>tck</test.tck> - </properties> - </profile> - <profile> - <id>api</id> - <properties> - <test.api>api</test.api> - </properties> - </profile> - <profile> - <id>jsr286-ext</id> - <properties> - <test.jsr286-ext>jsr286-ext</test.jsr286-ext> - </properties> - </profile> - <profile> - <id>jsr286-tck</id> - <properties> - <test.jsr286-tck>jsr286-tck</test.jsr286-tck> - </properties> - </profile> - <profile> - <id>jsr286-api</id> - <properties> - <test.jsr286-api>jsr286-api</test.jsr286-api> - </properties> - </profile> - <profile> <id>cargo.debug</id> <properties> <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug> @@ -397,24 +347,6 @@ <property name="project.version" value="${project.version}"/> <property name="basedir" value="${basedir}"/> - <condition property="test.ext.enable"> - <istrue value="${test.ext}" /> - </condition> - <condition property="test.tck.enable"> - <istrue value="${test.tck}" /> - </condition> - <condition property="test.api.enable"> - <istrue value="${test.api}" /> - </condition> - <condition property="test.jsr286-ext.enable"> - <istrue value="${test.jsr286-ext}" /> - </condition> - <condition property="test.jsr286-tck.enable"> - <istrue value="${test.jsr286-tck}" /> - </condition> - <condition property="test.jsr286-api.enable"> - <istrue value="${test.jsr286-api}" /> - </condition> <condition property="cargo.debug" value="${test.cargo.debug}"> <isset property="test.cargo.debug"/> </condition> Modified: components/pc/branches/adf/test/servers/jboss42/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss42/src/test/build.xml 2010-12-22 14:43:41 UTC (rev 5628) +++ components/pc/branches/adf/test/servers/jboss42/src/test/build.xml 2010-12-22 15:25:50 UTC (rev 5629) @@ -18,7 +18,7 @@ <antcall target="tests.common"/> </target> - <target name="cargo.start" depends="__cargo.setup"> + <target name="cargo.start" depends="cargo.setup"> <taskdef resource="cargo.tasks"> <classpath> @@ -46,7 +46,7 @@ </cargo> </target> - <target name="cargo.stop" depends="__cargo.setup"> + <target name="cargo.stop" depends="cargo.setup"> <cargo containerId="jboss42x" home="${test.cargo.home}" Modified: components/pc/branches/adf/test/servers/jboss51/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-22 14:43:41 UTC (rev 5628) +++ components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-22 15:25:50 UTC (rev 5629) @@ -275,56 +275,6 @@ </build> </profile> <profile> - <id>all</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <test.ext>true</test.ext> - <test.tck>true</test.tck> - <test.api>true</test.api> - <test.jsr286-ext>true</test.jsr286-ext> - <test.jsr286-tck>true</test.jsr286-tck> - <test.jsr286-api>true</test.jsr286-api> - </properties> - </profile> - <profile> - <id>ext</id> - <properties> - <test.ext>ext</test.ext> - </properties> - </profile> - <profile> - <id>tck</id> - <properties> - <test.tck>tck</test.tck> - </properties> - </profile> - <profile> - <id>api</id> - <properties> - <test.api>api</test.api> - </properties> - </profile> - <profile> - <id>jsr286-ext</id> - <properties> - <test.jsr286-ext>jsr286-ext</test.jsr286-ext> - </properties> - </profile> - <profile> - <id>jsr286-tck</id> - <properties> - <test.jsr286-tck>jsr286-tck</test.jsr286-tck> - </properties> - </profile> - <profile> - <id>jsr286-api</id> - <properties> - <test.jsr286-api>jsr286-api</test.jsr286-api> - </properties> - </profile> - <profile> <id>cargo.debug</id> <properties> <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug> @@ -404,24 +354,6 @@ <property name="project.version" value="${project.version}"/> <property name="basedir" value="${basedir}"/> - <condition property="test.ext.enable"> - <istrue value="${test.ext}" /> - </condition> - <condition property="test.tck.enable"> - <istrue value="${test.tck}" /> - </condition> - <condition property="test.api.enable"> - <istrue value="${test.api}" /> - </condition> - <condition property="test.jsr286-ext.enable"> - <istrue value="${test.jsr286-ext}" /> - </condition> - <condition property="test.jsr286-tck.enable"> - <istrue value="${test.jsr286-tck}" /> - </condition> - <condition property="test.jsr286-api.enable"> - <istrue value="${test.jsr286-api}" /> - </condition> <condition property="cargo.debug" value="${test.cargo.debug}"> <isset property="test.cargo.debug"/> </condition> Modified: components/pc/branches/adf/test/servers/jboss51/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss51/src/test/build.xml 2010-12-22 14:43:41 UTC (rev 5628) +++ components/pc/branches/adf/test/servers/jboss51/src/test/build.xml 2010-12-22 15:25:50 UTC (rev 5629) @@ -18,7 +18,7 @@ <antcall target="tests.common"/> </target> - <target name="cargo.start" depends="__cargo.setup"> + <target name="cargo.start" depends="cargo.setup"> <taskdef resource="cargo.tasks"> <classpath> @@ -47,7 +47,7 @@ </cargo> </target> - <target name="cargo.stop" depends="__cargo.setup"> + <target name="cargo.stop" depends="cargo.setup"> <cargo containerId="jboss51x" home="${test.cargo.home}" Modified: components/pc/branches/adf/test/servers/jetty6/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/jetty6/pom.xml 2010-12-22 14:43:41 UTC (rev 5628) +++ components/pc/branches/adf/test/servers/jetty6/pom.xml 2010-12-22 15:25:50 UTC (rev 5629) @@ -276,56 +276,6 @@ </build> </profile> <profile> - <id>all</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <test.ext>true</test.ext> - <test.tck>true</test.tck> - <test.api>true</test.api> - <test.jsr286-ext>true</test.jsr286-ext> - <test.jsr286-tck>true</test.jsr286-tck> - <test.jsr286-api>true</test.jsr286-api> - </properties> - </profile> - <profile> - <id>ext</id> - <properties> - <test.ext>ext</test.ext> - </properties> - </profile> - <profile> - <id>tck</id> - <properties> - <test.tck>tck</test.tck> - </properties> - </profile> - <profile> - <id>api</id> - <properties> - <test.api>api</test.api> - </properties> - </profile> - <profile> - <id>jsr286-ext</id> - <properties> - <test.jsr286-ext>jsr286-ext</test.jsr286-ext> - </properties> - </profile> - <profile> - <id>jsr286-tck</id> - <properties> - <test.jsr286-tck>jsr286-tck</test.jsr286-tck> - </properties> - </profile> - <profile> - <id>jsr286-api</id> - <properties> - <test.jsr286-api>jsr286-api</test.jsr286-api> - </properties> - </profile> - <profile> <id>cargo.debug</id> <properties> <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug> @@ -405,24 +355,6 @@ <property name="project.version" value="${project.version}"/> <property name="basedir" value="${basedir}"/> - <condition property="test.ext.enable"> - <istrue value="${test.ext}" /> - </condition> - <condition property="test.tck.enable"> - <istrue value="${test.tck}" /> - </condition> - <condition property="test.api.enable"> - <istrue value="${test.api}" /> - </condition> - <condition property="test.jsr286-ext.enable"> - <istrue value="${test.jsr286-ext}" /> - </condition> - <condition property="test.jsr286-tck.enable"> - <istrue value="${test.jsr286-tck}" /> - </condition> - <condition property="test.jsr286-api.enable"> - <istrue value="${test.jsr286-api}" /> - </condition> <condition property="cargo.debug" value="${test.cargo.debug}"> <isset property="test.cargo.debug"/> </condition> Modified: components/pc/branches/adf/test/servers/jetty6/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/jetty6/src/test/build.xml 2010-12-22 14:43:41 UTC (rev 5628) +++ components/pc/branches/adf/test/servers/jetty6/src/test/build.xml 2010-12-22 15:25:50 UTC (rev 5629) @@ -18,7 +18,7 @@ <antcall target="tests.common"/> </target> - <target name="cargo.start" depends="__cargo.setup"> + <target name="cargo.start" depends="cargo.setup"> <taskdef resource="cargo.tasks"> <classpath> @@ -50,7 +50,7 @@ </cargo> </target> - <target name="cargo.stop" depends="__cargo.setup"> + <target name="cargo.stop" depends="cargo.setup"> <cargo containerId="jetty6x" home="${test.cargo.home}" Modified: components/pc/branches/adf/test/servers/src/common/resources/common.xml =================================================================== --- components/pc/branches/adf/test/servers/src/common/resources/common.xml 2010-12-22 14:43:41 UTC (rev 5628) +++ components/pc/branches/adf/test/servers/src/common/resources/common.xml 2010-12-22 15:25:50 UTC (rev 5629) @@ -5,18 +5,19 @@ <property name="test.dir" value="${target.dir}/integration-tests"/> <property name="test.cargo.dir" value="${test.dir}/cargo/"/> - <target name="tests.common" depends="prepare_env, __evaluate_properties.init" > + <target name="tests.common" depends="prepare_env, evaluate_properties.init" > <echo message="compile classpath: ${compile_classpath}"/> <echo message="runtime classpath: ${runtime_classpath}"/> <echo message="test classpath: ${test_classpath}"/> <echo message="plugin classpath: ${plugin_classpath}"/> + <echo message="base directory: ${basedir}"/> <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/> <antcall target="package-tests"/> - <!--<antcall target="__evaluate_properties.all"/>--> + <antcall target="evaluate_properties.all"/> <antcall target="test.container-servlet"/> </target> @@ -220,7 +221,7 @@ </target> <!-- Check which servlet containers are known --> - <target name="__evaluate_properties.init"> + <target name="evaluate_properties.init"> <property environment="env"/> @@ -273,7 +274,7 @@ <echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/> </target> - <target name="__evaluate_properties.tomcat"> + <target name="evaluate_properties.tomcat"> <fail message="Please set the environment variable TOMCAT_6_0_HOME"> <condition> <and> @@ -285,7 +286,7 @@ </fail> </target> - <target name="__evaluate_properties.jetty"> + <target name="evaluate_properties.jetty"> <fail message="Please set the environment variable JETTY_6_1_HOME"> <condition> <and> @@ -297,7 +298,7 @@ </fail> </target> - <target name="__evaluate_properties.jboss"> + <target name="evaluate_properties.jboss"> <fail message="Please set the environment variables JBOSS_4_2_HOME"> <condition> <and> @@ -318,16 +319,12 @@ </fail> </target> - <target name="__evaluate_properties.local"> - <!-- empty on purpose! --> + <target name="evaluate_properties.all"> + <antcall target="evaluate_properties.jboss"/> + <antcall target="evaluate_properties.jetty"/> + <antcall target="evaluate_properties.tomcat"/> </target> - <target name="__evaluate_properties.all"> - <antcall target="__evaluate_properties.jboss"/> - <antcall target="__evaluate_properties.jetty"/> - <antcall target="__evaluate_properties.tomcat"/> - </target> - <macrodef name="package-ext-test"> <attribute name="test"/> <sequential> @@ -513,7 +510,7 @@ </target> - <target name="__cargo.setup"> + <target name="cargo.setup"> <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/> <mkdir dir="${cargo.log.dir}"/> <taskdef resource="cargo.tasks"> @@ -528,13 +525,13 @@ <antcall target="cargo.start"> <param name="cargo.wait" value="false"/> </antcall> - <antcall target="__tests.remote"> + <antcall target="tests.remote"> <param name="test.server.name" value="${test.remote.server.name}"/> </antcall> <antcall target="cargo.stop"/> </target> - <target name="__tests.remote"> + <target name="tests.remote"> <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/> Modified: components/pc/branches/adf/test/servers/tomcat6/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-22 14:43:41 UTC (rev 5628) +++ components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-22 15:25:50 UTC (rev 5629) @@ -270,56 +270,6 @@ </build> </profile> <profile> - <id>all</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <test.ext>true</test.ext> - <test.tck>true</test.tck> - <test.api>true</test.api> - <test.jsr286-ext>true</test.jsr286-ext> - <test.jsr286-tck>true</test.jsr286-tck> - <test.jsr286-api>true</test.jsr286-api> - </properties> - </profile> - <profile> - <id>ext</id> - <properties> - <test.ext>ext</test.ext> - </properties> - </profile> - <profile> - <id>tck</id> - <properties> - <test.tck>tck</test.tck> - </properties> - </profile> - <profile> - <id>api</id> - <properties> - <test.api>api</test.api> - </properties> - </profile> - <profile> - <id>jsr286-ext</id> - <properties> - <test.jsr286-ext>jsr286-ext</test.jsr286-ext> - </properties> - </profile> - <profile> - <id>jsr286-tck</id> - <properties> - <test.jsr286-tck>jsr286-tck</test.jsr286-tck> - </properties> - </profile> - <profile> - <id>jsr286-api</id> - <properties> - <test.jsr286-api>jsr286-api</test.jsr286-api> - </properties> - </profile> - <profile> <id>cargo.debug</id> <properties> <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug> @@ -399,24 +349,6 @@ <property name="project.version" value="${project.version}"/> <property name="basedir" value="${basedir}"/> - <condition property="test.ext.enable"> - <istrue value="${test.ext}" /> - </condition> - <condition property="test.tck.enable"> - <istrue value="${test.tck}" /> - </condition> - <condition property="test.api.enable"> - <istrue value="${test.api}" /> - </condition> - <condition property="test.jsr286-ext.enable"> - <istrue value="${test.jsr286-ext}" /> - </condition> - <condition property="test.jsr286-tck.enable"> - <istrue value="${test.jsr286-tck}" /> - </condition> - <condition property="test.jsr286-api.enable"> - <istrue value="${test.jsr286-api}" /> - </condition> <condition property="cargo.debug" value="${test.cargo.debug}"> <isset property="test.cargo.debug"/> </condition> Modified: components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml 2010-12-22 14:43:41 UTC (rev 5628) +++ components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml 2010-12-22 15:25:50 UTC (rev 5629) @@ -18,7 +18,7 @@ <antcall target="tests.common"/> </target> - <target name="cargo.start" depends="__cargo.setup"> + <target name="cargo.start" depends="cargo.setup"> <taskdef resource="cargo.tasks"> <classpath> @@ -46,7 +46,7 @@ </cargo> </target> - <target name="cargo.stop" depends="__cargo.setup"> + <target name="cargo.stop" depends="cargo.setup"> <cargo containerId="tomcat6x" home="${test.cargo.home}" Modified: components/pc/branches/adf/test/servers/tomcat7/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-22 14:43:41 UTC (rev 5628) +++ components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-22 15:25:50 UTC (rev 5629) @@ -282,56 +282,6 @@ </build> </profile> <profile> - <id>all</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <test.ext>true</test.ext> - <test.tck>true</test.tck> - <test.api>true</test.api> - <test.jsr286-ext>true</test.jsr286-ext> - <test.jsr286-tck>true</test.jsr286-tck> - <test.jsr286-api>true</test.jsr286-api> - </properties> - </profile> - <profile> - <id>ext</id> - <properties> - <test.ext>ext</test.ext> - </properties> - </profile> - <profile> - <id>tck</id> - <properties> - <test.tck>tck</test.tck> - </properties> - </profile> - <profile> - <id>api</id> - <properties> - <test.api>api</test.api> - </properties> - </profile> - <profile> - <id>jsr286-ext</id> - <properties> - <test.jsr286-ext>jsr286-ext</test.jsr286-ext> - </properties> - </profile> - <profile> - <id>jsr286-tck</id> - <properties> - <test.jsr286-tck>jsr286-tck</test.jsr286-tck> - </properties> - </profile> - <profile> - <id>jsr286-api</id> - <properties> - <test.jsr286-api>jsr286-api</test.jsr286-api> - </properties> - </profile> - <profile> <id>cargo.debug</id> <properties> <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug> @@ -411,24 +361,6 @@ <property name="project.version" value="${project.version}"/> <property name="basedir" value="${basedir}"/> - <condition property="test.ext.enable"> - <istrue value="${test.ext}" /> - </condition> - <condition property="test.tck.enable"> - <istrue value="${test.tck}" /> - </condition> - <condition property="test.api.enable"> - <istrue value="${test.api}" /> - </condition> - <condition property="test.jsr286-ext.enable"> - <istrue value="${test.jsr286-ext}" /> - </condition> - <condition property="test.jsr286-tck.enable"> - <istrue value="${test.jsr286-tck}" /> - </condition> - <condition property="test.jsr286-api.enable"> - <istrue value="${test.jsr286-api}" /> - </condition> <condition property="cargo.debug" value="${test.cargo.debug}"> <isset property="test.cargo.debug"/> </condition> Modified: components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-22 14:43:41 UTC (rev 5628) +++ components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-22 15:25:50 UTC (rev 5629) @@ -18,7 +18,7 @@ <antcall target="tests.common"/> </target> - <target name="cargo.start" depends="__cargo.setup"> + <target name="cargo.start" depends="cargo.setup"> <taskdef resource="cargo.tasks"> <classpath> @@ -46,7 +46,7 @@ </cargo> </target> - <target name="cargo.stop" depends="__cargo.setup"> + <target name="cargo.stop" depends="cargo.setup"> <cargo containerId="tomcat7x" home="${test.cargo.home}"