Author: alain_defrance Date: 2010-12-20 11:09:27 -0500 (Mon, 20 Dec 2010) New Revision: 5615 Modified: components/pc/branches/adf/pom.xml components/pc/branches/adf/test/servers/jboss42/src/test/build.xml components/pc/branches/adf/test/servers/jboss42/src/test/resources/test/servers.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/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-web.xml components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-web.xml components/pc/branches/adf/test/servers/src/common/resources/common.xml components/pc/branches/adf/test/servers/tomcat7/pom.xml components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml Log: JBoss as 5.1 integration tests ok + test-apps location changed. Modified: components/pc/branches/adf/pom.xml =================================================================== --- components/pc/branches/adf/pom.xml 2010-12-20 12:48:44 UTC (rev 5614) +++ components/pc/branches/adf/pom.xml 2010-12-20 16:09:27 UTC (rev 5615) @@ -47,13 +47,13 @@ <properties> <version.gatein.common>2.0.3-GA</version.gatein.common> <version.gatein.wci>2.1.0-Alpha01-SNAPSHOT</version.gatein.wci> - <version.apache.portals.bridges>1.0.3</version.apache.portals.bridges> + <version.apache.portals.bridges>1.0.4</version.apache.portals.bridges> <version.apache.taglibs>1.1.2</version.apache.taglibs> <version.apache.log4j>1.2.14</version.apache.log4j> <!-- used in test module by maven-antrun-extended-plugin --> <version.jboss.unit>1.2.3</version.jboss.unit> - <version.cargo>1.0.3</version.cargo> + <version.cargo>1.0.4</version.cargo> <version.cargo.jetty.deployer>1.0.1</version.cargo.jetty.deployer> <preparationGoals>clean install</preparationGoals> 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-20 12:48:44 UTC (rev 5614) +++ components/pc/branches/adf/test/servers/jboss42/src/test/build.xml 2010-12-20 16:09:27 UTC (rev 5615) @@ -5,13 +5,13 @@ <!-- SYSTEM PROPERTIES --> <property environment="env"/> - <property name="test.cargo.home" value="${env.JBOSS_4_2_0_HOME}"/> + <property name="test.cargo.home" value="${env.JBOSS_4_2_HOME}"/> <!-- properties unique per app server --> <property name="test.server.name" value="JBoss"/> <property name="test.server.version" value="4.2"/> - <property name="test.remote.server.name" value="RemoteJBoss_4_2_0"/> + <property name="test.remote.server.name" value="RemoteJBoss_4_2"/> <property name="cargo.container.id" value="jboss42x"/> <target name="tests" unless="maven.test.skip"> Modified: components/pc/branches/adf/test/servers/jboss42/src/test/resources/test/servers.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss42/src/test/resources/test/servers.xml 2010-12-20 12:48:44 UTC (rev 5614) +++ components/pc/branches/adf/test/servers/jboss42/src/test/resources/test/servers.xml 2010-12-20 16:09:27 UTC (rev 5615) @@ -1,6 +1,6 @@ <servers> <server> - <server-name>RemoteJBoss_4_2_0</server-name> + <server-name>RemoteJBoss_4_2</server-name> <node> <node-id>default</node-id> <service> Modified: components/pc/branches/adf/test/servers/jboss51/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-20 12:48:44 UTC (rev 5614) +++ components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-20 16:09:27 UTC (rev 5615) @@ -387,32 +387,38 @@ <artifactId>jboss-unit-tooling-ant</artifactId> <version>${version.jboss.unit}</version> </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit</artifactId> + <version>${version.jboss.unit}</version> + </dependency> <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-ant</artifactId> <version>${version.cargo}</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>${version.cargo}</version> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> </dependency> <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> </dependency> <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> </dependencies> <executions> <execution> 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-20 12:48:44 UTC (rev 5614) +++ components/pc/branches/adf/test/servers/jboss51/src/test/build.xml 2010-12-20 16:09:27 UTC (rev 5615) @@ -5,7 +5,7 @@ <!-- SYSTEM PROPERTIES --> <property environment="env"/> - <property name="test.cargo.home" value="${env.JBOSS_5_1_0_HOME}"/> + <property name="test.cargo.home" value="${env.JBOSS_5_1_HOME}"/> <!-- properties unique per app server --> Modified: components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-web.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-web.xml 2010-12-20 12:48:44 UTC (rev 5614) +++ components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-web.xml 2010-12-20 16:09:27 UTC (rev 5615) @@ -25,7 +25,7 @@ "-//JBoss//DTD Web Application 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> <jboss-web> - <class-loading java2ClassLoadingCompliance="false"> + <class-loading java2ClassLoadingCompliance="true"> <loader-repository>test:loader=portlet</loader-repository> </class-loading> </jboss-web> \ No newline at end of file Modified: components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-web.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-web.xml 2010-12-20 12:48:44 UTC (rev 5614) +++ components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-web.xml 2010-12-20 16:09:27 UTC (rev 5615) @@ -25,7 +25,7 @@ "-//JBoss//DTD Web Application 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> <jboss-web> - <class-loading java2ClassLoadingCompliance="false"> + <class-loading java2ClassLoadingCompliance="true"> <loader-repository>test:loader=portlet</loader-repository> </class-loading> </jboss-web> \ No newline at end of file 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-20 12:48:44 UTC (rev 5614) +++ components/pc/branches/adf/test/servers/src/common/resources/common.xml 2010-12-20 16:09:27 UTC (rev 5615) @@ -17,30 +17,16 @@ <antcall target="package-tests"/> - <!--<antcall target="tests.call.single"/>--> <!--<antcall target="__evaluate_properties.all"/>--> <antcall target="test.container-servlet"/> - <!--<antcall target="tests.call.all"/>--> </target> - <target name="tests.call.all" unless="tests"> - <antcall target="__evaluate_properties.all"/> - <!--<antcall target="tests.jboss"/>--> - <antcall target="tests.tomcat"/> - <!--<antcall target="tests.jetty"/>--> - </target> - - <target name="tests.call.single" if="tests"> - <antcall target="__evaluate_properties.${tests}"/> - <antcall target="tests.${tests}"/> - </target> - <target name="prepare_env"> <!--Relative path to target dir--> <property name="target" value="${basedir}/target"/> - <property name="test.temp.dir" value="${target}/test/tmp"/> + <property name="test.temp.dir" value="${target}/integration-tests/test-apps"/> <property name="test.temp.portlet" value="${test.temp.dir}/portlet-test"/> <property name="test.temp.lib" value="${test.temp.dir}/lib"/> @@ -140,9 +126,9 @@ <path location="${dependency.portal-wci-tomcat.jar}"/> <!-- paths needed for remote jboss deployment --> - <path path="${dependency.cargo-jboss-deployer.jar}"/> - <path path="${dependency.jboss-profile-service.jar}"/> - <path path="${dependency.cargo-core-container-jboss.jar}"/> + <path location="${dependency.cargo-jboss-deployer.jar}"/> + <path location="${dependency.jboss-profile-service.jar}"/> + <path location="${dependency.cargo-core-container-jboss.jar}"/> </path> <path id="Tomcat-6.0"> @@ -240,46 +226,22 @@ <property environment="env"/> <!--If properties are not in command line check if they are set in env--> - <condition property="JBOSS_4_2_1_HOME" value="${env.JBOSS_4_2_1_HOME}"> + <condition property="JBOSS_4_2_HOME" value="${env.JBOSS_4_2_HOME}"> <and> - <isset property="env.JBOSS_4_2_1_HOME"/> + <isset property="env.JBOSS_4_2_HOME"/> <not> - <isset property="JBOSS_4_2_1_HOME"/> + <isset property="JBOSS_4_2_HOME"/> </not> </and> </condition> - <condition property="JBOSS_4_2_2_HOME" value="${env.JBOSS_4_2_2_HOME}"> + <condition property="JBOSS_5_1_HOME" value="${env.JBOSS_5_1_HOME}"> <and> - <isset property="env.JBOSS_4_2_2_HOME"/> + <isset property="env.JBOSS_5_1_HOME"/> <not> - <isset property="JBOSS_4_2_2_HOME"/> + <isset property="JBOSS_5_1_HOME"/> </not> </and> </condition> - <condition property="JBOSS_4_2_0_HOME" value="${env.JBOSS_4_2_0_HOME}"> - <and> - <isset property="env.JBOSS_4_2_0_HOME"/> - <not> - <isset property="JBOSS_4_2_0_HOME"/> - </not> - </and> - </condition> - <condition property="JBOSS_4_2_3_HOME" value="${env.JBOSS_4_2_3_HOME}"> - <and> - <isset property="env.JBOSS_4_2_3_HOME"/> - <not> - <isset property="JBOSS_4_2_3_HOME"/> - </not> - </and> - </condition> - <condition property="JBOSS_5_1_0_HOME" value="${env.JBOSS_5_1_0_HOME}"> - <and> - <isset property="env.JBOSS_5_1_0_HOME"/> - <not> - <isset property="JBOSS_5_1_0_HOME"/> - </not> - </and> - </condition> <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}"> <and> <isset property="env.TOMCAT_6_0_HOME"/> @@ -305,11 +267,8 @@ </and> </condition> - <echo message="JBOSS_4_2_0_HOME: ${JBOSS_4_2_0_HOME}"/> - <echo message="JBOSS_4_2_1_HOME: ${JBOSS_4_2_1_HOME}"/> - <echo message="JBOSS_4_2_2_HOME: ${JBOSS_4_2_2_HOME}"/> - <echo message="JBOSS_4_2_3_HOME: ${JBOSS_4_2_3_HOME}"/> - <echo message="JBOSS_5_1_0_HOME: ${JBOSS_5_1_0_HOME}"/> + <echo message="JBOSS_4_2_HOME: ${JBOSS_4_2_HOME}"/> + <echo message="JBOSS_5_1_HOME: ${JBOSS_5_1_HOME}"/> <echo message="TOMCAT_6_0_HOME: ${TOMCAT_6_0_HOME}"/> <echo message="TOMCAT_7_0_HOME: ${TOMCAT_7_0_HOME}"/> <echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/> @@ -340,29 +299,20 @@ </target> <target name="__evaluate_properties.jboss"> - <fail message="Please set the environment variables JBOSS_4_2_0_HOME, JBOSS_4_2_1_HOME, JBOSS_4_2_2_HOME and JBOSS_4_2_3_HOME"> + <fail message="Please set the environment variables JBOSS_4_2_HOME"> <condition> <and> <not> - <isset property="JBOSS_4_2_0_HOME"/> + <isset property="JBOSS_4_2_HOME"/> </not> - <not> - <isset property="JBOSS_4_2_1_HOME"/> - </not> - <not> - <isset property="JBOSS_4_2_2_HOME"/> - </not> - <not> - <isset property="JBOSS_4_2_3_HOME"/> - </not> </and> </condition> </fail> - <fail message="Please set the environment variable JBOSS_5_1_0_HOME"> + <fail message="Please set the environment variable JBOSS_5_1_HOME"> <condition> <and> <not> - <isset property="JBOSS_5_1_0_HOME"/> + <isset property="JBOSS_5_1_HOME"/> </not> </and> </condition> @@ -570,7 +520,7 @@ </target> <target name="__cargo.setup"> - <property name="cargo.log.dir" value="${target}/test/cargo"/> + <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/> <mkdir dir="${cargo.log.dir}"/> <taskdef resource="cargo.tasks"> <classpath> Modified: components/pc/branches/adf/test/servers/tomcat7/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-20 12:48:44 UTC (rev 5614) +++ components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-20 16:09:27 UTC (rev 5615) @@ -443,9 +443,9 @@ <isset property="test.cargo.debug"/> </condition> <condition property="cargo.debug" value=""> - <not> - <isset property="test.cargo.debug"/> - </not> + <not> + <isset property="test.cargo.debug"/> + </not> </condition> <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/> 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-20 12:48:44 UTC (rev 5614) +++ components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-20 16:09:27 UTC (rev 5615) @@ -40,6 +40,8 @@ <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/> + <deployable type="war" file="${test.temp.lib}/manager.war"/> + <file file="${test.temp.lib}/manager" todir="webapps/manager"/> <deployable type="war" file="${test.temp.lib}/Tomcat-7.0/portlet-test.war"/> </configuration> </cargo>