Author: bdaw Date: 2011-06-22 16:22:21 -0400 (Wed, 22 Jun 2011) New Revision: 6716 Modified: components/wci/trunk/test/servers/jetty6/pom.xml Log: -uncomment jetty tests Modified: components/wci/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/pom.xml 2011-06-22 17:30:12 UTC (rev 6715) +++ components/wci/trunk/test/servers/jetty6/pom.xml 2011-06-22 20:22:21 UTC (rev 6716) @@ -278,134 +278,134 @@ </execution> </executions> </plugin> - <!--<plugin>--> - <!--<artifactId>maven-antrun-plugin</artifactId>--> - <!--<dependencies>--> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> - <!--<dependency>--> - <!--<groupId>org.jboss.unit</groupId>--> - <!--<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.jboss.unit</groupId> + <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.jdom</groupId>--> - <!--<artifactId>jdom</artifactId>--> - <!--<version>1.1</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>dom4j</groupId>--> - <!--<artifactId>dom4j</artifactId>--> - <!--<version>1.6.1</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jaxen</groupId>--> - <!--<artifactId>jaxen</artifactId>--> - <!--<version>1.1.1</version>--> - <!--</dependency>--> - <!--</dependencies>--> - <!--<version>1.3</version>--> - <!--<executions>--> - <!--<execution>--> - <!--<id>integration-testing</id>--> - <!--<phase>integration-test</phase>--> - <!--<configuration>--> - <!--<tasks>--> + <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.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> + <version>1.3</version> + <executions> + <execution> + <id>integration-testing</id> + <phase>integration-test</phase> + <configuration> + <tasks> - <!--&lt;!&ndash; properties to pass to the build.xml &ndash;&gt;--> - <!--<property name="project.build.directory" value="${project.build.directory}" />--> - <!--<property name="plugin_classpath" refid="maven.plugin.classpath" />--> - <!--<property name="test_classpath" refid="maven.test.classpath" />--> + <!-- properties to pass to the build.xml --> + <property name="project.build.directory" value="${project.build.directory}" /> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <property name="test_classpath" refid="maven.test.classpath" /> - <!--&lt;!&ndash; hack here allows for profiles to effect tasks in the build.xml &ndash;&gt;--> - <!--&lt;!&ndash; this should be removed when the antrun plugin properly handles properties &ndash;&gt;--> - <!--<condition property="test.generic.enable">--> - <!--<istrue value="${test.generic}" />--> - <!--</condition>--> - <!--<condition property="test.native.enable">--> - <!--<istrue value="${test.native}" />--> - <!--</condition>--> - <!--<condition property="test.exo.enable">--> - <!--<istrue value="${test.exo}" />--> - <!--</condition>--> - <!--<condition property="test.endpoint.enable">--> - <!--<istrue value="${test.endpoint}" />--> - <!--</condition>--> - <!--<condition property="cargo.debug" value="${test.cargo.debug}">--> - <!--<isset property="test.cargo.debug" />--> - <!--</condition>--> - <!--<condition property="cargo.debug" value="">--> - <!--<not>--> - <!--<isset property="test.cargo.debug" />--> - <!--</not>--> - <!--</condition>--> - <!--&lt;!&ndash; end profiles hack &ndash;&gt;--> + <!-- hack here allows for profiles to effect tasks in the build.xml --> + <!-- this should be removed when the antrun plugin properly handles properties --> + <condition property="test.generic.enable"> + <istrue value="${test.generic}" /> + </condition> + <condition property="test.native.enable"> + <istrue value="${test.native}" /> + </condition> + <condition property="test.exo.enable"> + <istrue value="${test.exo}" /> + </condition> + <condition property="test.endpoint.enable"> + <istrue value="${test.endpoint}" /> + </condition> + <condition property="cargo.debug" value="${test.cargo.debug}"> + <isset property="test.cargo.debug" /> + </condition> + <condition property="cargo.debug" value=""> + <not> + <isset property="test.cargo.debug" /> + </not> + </condition> + <!-- end profiles hack --> - <!--&lt;!&ndash; server dependencies &ndash;&gt;--> - <!--<property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}" />--> - <!--<property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" />--> - <!--<property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" />--> - <!--<property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" />--> - <!--<property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" />--> - <!--<property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" />--> - <!--<property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" />--> - <!--<property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" />--> - <!--<property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" />--> - <!--<property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" />--> - <!--<property name="dependency.gatein-wci-jetty.jar" value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}" />--> - <!--<property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" />--> - <!--<property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" />--> - <!--<property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}" />--> + <!-- server dependencies --> + <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}" /> + <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" /> + <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" /> + <property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" /> + <property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" /> + <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" /> + <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" /> + <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" /> + <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" /> + <property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> + <property name="dependency.gatein-wci-jetty.jar" value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}" /> + <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" /> + <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" /> + <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}" /> - <!--&lt;!&ndash; locations of archives to use &ndash;&gt;--> - <!--<property name="test.archives.directory" value="${project.build.directory}/test-archives" />--> - <!--<property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war" />--> - <!--<property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war" />--> - <!--<property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war" />--> + <!-- locations of archives to use --> + <property name="test.archives.directory" value="${project.build.directory}/test-archives" /> + <property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war" /> + <property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war" /> + <property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war" /> - <!--<property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war" />--> - <!--<property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war" />--> - <!--<property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war" />--> + <property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war" /> + <property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war" /> + <property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war" /> - <!--<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />--> - <!--<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />--> - <!--<property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />--> + <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> + <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> + <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> - <!--&lt;!&ndash; location of common.xml shared between the different server's build.xml &ndash;&gt;--> - <!--<property name="common.xml.file" value="${test.common.xml}" />--> - <!--&lt;!&ndash; &ndash;&gt;--> + <!-- location of common.xml shared between the different server's build.xml --> + <property name="common.xml.file" value="${test.common.xml}" /> + <!-- --> - <!--&lt;!&ndash; Cargo Jetty deployer &ndash;&gt;--> - <!--<property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-6-and-earlier-deployer.war.path}" />--> + <!-- Cargo Jetty deployer --> + <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-6-and-earlier-deployer.war.path}" /> - <!--<ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true">--> - <!--<target name="tests" />--> - <!--</ant>--> - <!--</tasks>--> - <!--</configuration>--> - <!--<goals>--> - <!--<goal>run</goal>--> - <!--</goals>--> - <!--</execution>--> - <!--</executions>--> - <!--</plugin>--> + <ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true"> + <target name="tests" /> + </ant> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <properties>