Author: alain_defrance Date: 2010-12-21 10:07:49 -0500 (Tue, 21 Dec 2010) New Revision: 5616 Added: components/pc/branches/adf/test/servers/tomcat7/src/test/resources/config/tomcat-users.xml Modified: components/pc/branches/adf/pom.xml components/pc/branches/adf/test/servers/jboss51/pom.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/tomcat7/pom.xml components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml Log: Tomcat 7 integration tests ok Modified: components/pc/branches/adf/pom.xml =================================================================== --- components/pc/branches/adf/pom.xml 2010-12-20 16:09:27 UTC (rev 5615) +++ components/pc/branches/adf/pom.xml 2010-12-21 15:07:49 UTC (rev 5616) @@ -50,11 +50,13 @@ <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> + <version.discovery>0.4</version.discovery> <!-- used in test module by maven-antrun-extended-plugin --> <version.jboss.unit>1.2.3</version.jboss.unit> - <version.cargo>1.0.4</version.cargo> + <version.cargo>1.0.3</version.cargo> <version.cargo.jetty.deployer>1.0.1</version.cargo.jetty.deployer> + <version.cargo.jboss5.deployer>5.1.0.SP1</version.cargo.jboss5.deployer> <preparationGoals>clean install</preparationGoals> </properties> @@ -162,7 +164,18 @@ <type>war</type> <version>${version.cargo.jetty.deployer}</version> </dependency> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <version>${version.cargo.jboss5.deployer}</version> + </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>${version.discovery}</version> + </dependency> + </dependencies> </dependencyManagement> Modified: components/pc/branches/adf/test/servers/jboss51/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-20 16:09:27 UTC (rev 5615) +++ components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-21 15:07:49 UTC (rev 5616) @@ -183,7 +183,6 @@ <dependency> <groupId>org.jboss.integration</groupId> <artifactId>jboss-profileservice-spi</artifactId> - <version>5.1.0.SP1</version> <scope>test</scope> </dependency> </dependencies> 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 16:09:27 UTC (rev 5615) +++ components/pc/branches/adf/test/servers/src/common/resources/common.xml 2010-12-21 15:07:49 UTC (rev 5616) @@ -12,8 +12,7 @@ <echo message="test classpath: ${test_classpath}"/> <echo message="plugin classpath: ${plugin_classpath}"/> - <echo message="You can run small subset of tests using -Dtests=local, -Dtests=jboss, or -Dtests=tomcat"/> - <echo message="-Dtests=local will only run the tests on your locally installed servlet containers"/> + <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/> <antcall target="package-tests"/> Modified: components/pc/branches/adf/test/servers/tomcat6/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-20 16:09:27 UTC (rev 5615) +++ components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-21 15:07:49 UTC (rev 5616) @@ -444,9 +444,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/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-20 16:09:27 UTC (rev 5615) +++ components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-21 15:07:49 UTC (rev 5616) @@ -47,41 +47,54 @@ <artifactId>log4j</artifactId> </dependency> + <!-- JBOSS UNIT DEPENDENCIES --> <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit</artifactId> - <exclusions> - <exclusion> - <groupId>cargo</groupId> - <artifactId>core</artifactId> - </exclusion> - </exclusions> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-remote</artifactId> + <scope>test</scope> <exclusions> <exclusion> - <groupId>cargo</groupId> - <artifactId>core</artifactId> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-mc</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-tooling-ant</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -138,16 +151,16 @@ <type>war</type> <scope>test</scope> </dependency> - <dependency> + <!--<dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> <scope>test</scope> - </dependency> - <dependency> + </dependency>--> + <!--<dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-ant</artifactId> <scope>test</scope> - </dependency> + </dependency>--> <dependency> <groupId>javax.ccpp</groupId> @@ -179,6 +192,18 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat7</artifactId> </dependency> + + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> </dependencies> <profiles> @@ -332,30 +357,6 @@ <build> <plugins> - <!--<plugin> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-maven2</artifactId> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>execute</goal> - </goals> - </execution> - </executions> - <configuration> - <failOnError>true</failOnError> - <testsuites> - <testsuite> - <config>test/local-jboss-unit.xml</config> - </testsuite> - </testsuites> - <reports> - <xml>target/tests/reports/xml/local</xml> - <html>target/tests/reports/html/local</html> - </reports> - </configuration> - </plugin>--> <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> @@ -380,32 +381,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/tomcat7/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-20 16:09:27 UTC (rev 5615) +++ components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-21 15:07:49 UTC (rev 5616) @@ -40,8 +40,9 @@ <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}/manager.war"/>--> + <!--<file file="${test.temp.lib}/manager" todir="webapps/manager"/>--> + <file file="${target}/test-classes/config/tomcat-users.xml" tofile="conf/tomcat-users.xml" overwrite="true"/> <deployable type="war" file="${test.temp.lib}/Tomcat-7.0/portlet-test.war"/> </configuration> </cargo> @@ -53,7 +54,7 @@ home="${test.cargo.home}" log="${cargo.log.dir}/cargo.${test.server.name}-${test.server.version}.shutdown.log" action="stop"> - <configuration/> + <configuration home="${test.cargo.dir}"/> </cargo> </target> </project> Added: components/pc/branches/adf/test/servers/tomcat7/src/test/resources/config/tomcat-users.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat7/src/test/resources/config/tomcat-users.xml (rev 0) +++ components/pc/branches/adf/test/servers/tomcat7/src/test/resources/config/tomcat-users.xml 2010-12-21 15:07:49 UTC (rev 5616) @@ -0,0 +1,3 @@ +<tomcat-users> + <user name="admin" password="admin" roles="manager-script"/> +</tomcat-users>