Author: xiaming
Date: Thu May 20 07:25:53 2010
New Revision: 946547
URL: http://svn.apache.org/viewvc?rev=946547&view=rev
Log:
GERONIMO-5313 Correct some configuration issues in testsuite, update all to use failsafe plugin, and use tomcat assembly as the default
Modified:
geronimo/server/branches/2.2/pom.xml
geronimo/server/branches/2.2/testsuite/commands-testsuite/pom.xml
geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml
geronimo/server/branches/2.2/testsuite/concurrent-testsuite/pom.xml
geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml
geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml
geronimo/server/branches/2.2/testsuite/console-testsuite/pom.xml
geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
geronimo/server/branches/2.2/testsuite/corba-testsuite/pom.xml
geronimo/server/branches/2.2/testsuite/deployment-testsuite/deployment-tests/pom.xml
geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
geronimo/server/branches/2.2/testsuite/deployment-testsuite/pom.xml
geronimo/server/branches/2.2/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
geronimo/server/branches/2.2/testsuite/enterprise-testsuite/pom.xml
geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-client-tests/pom.xml
geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
geronimo/server/branches/2.2/testsuite/pom.xml
geronimo/server/branches/2.2/testsuite/security-testsuite/pom.xml
geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml
geronimo/server/branches/2.2/testsuite/web-testsuite/pom.xml
geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml
geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml
geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml
geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml
geronimo/server/branches/2.2/testsuite/web-testsuite/test-tomcat/pom.xml
geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml
Modified: geronimo/server/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Thu May 20 07:25:53 2010
@@ -2015,7 +2015,7 @@
</assembly>
</assemblies>
- <defaultAssemblyId>jetty</defaultAssemblyId>
+ <defaultAssemblyId>tomcat</defaultAssemblyId>
<optionSets>
<optionSet>
Modified: geronimo/server/branches/2.2/testsuite/commands-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/commands-testsuite/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/commands-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/commands-testsuite/pom.xml Thu May 20 07:25:53 2010
@@ -42,16 +42,13 @@
<artifactId>testsupport-commands</artifactId>
<version>${project.version}</version>
</dependency>
- </dependencies>
-
-
+ </dependencies>
<profiles>
<profile>
<id>it</id>
<build>
- <plugins>
-
+ <plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
@@ -69,7 +66,6 @@
<id>it-manual</id>
<build>
<plugins>
-
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>maven-maven-plugin</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml Thu May 20 07:25:53 2010
@@ -76,7 +76,6 @@
<id>child</id>
<build>
<plugins>
-
<plugin>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
Modified: geronimo/server/branches/2.2/testsuite/concurrent-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/concurrent-testsuite/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/concurrent-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/concurrent-testsuite/pom.xml Thu May 20 07:25:53 2010
@@ -32,8 +32,8 @@
<build>
<plugins>
- <plugin>
- <!-- This plugin is needed for all suite poms. -->
+ <!-- TODO: testsuite-maven-plugin needs update to generate report from failsafe execution results -->
+ <!--<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>testsuite-maven-plugin</artifactId>
<executions>
@@ -45,62 +45,8 @@
</goals>
</execution>
</executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <skip>true</skip>
- <testFailureIgnore>true</testFailureIgnore>
- <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
- <reportFormat>plain</reportFormat>
- <useFile>true</useFile>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkMode>once</forkMode>
- <workingDirectory>${project.build.directory}</workingDirectory>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- <executions>
- <execution>
- <id>test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <aggregate>true</aggregate>
- <outputDirectory>${project.build.outputDirectory}/surefire-reports</outputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ </plugin>-->
+ </plugins>
</build>
<profiles>
<profile>
@@ -145,7 +91,6 @@
</profile>
<profile>
<id>it-manual</id>
-
<!--
TODO: Hook up m-m-p to allow child modules to be built early during
this modules compile (or something) phase.
Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml Thu May 20 07:25:53 2010
@@ -40,10 +40,7 @@
<profile>
<id>child</id>
<build>
- <plugins>
- <!--
- Called by m-m-p from the parent project, do not call it separately
- -->
+ <plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
@@ -51,8 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
-
+ <artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml Thu May 20 07:25:53 2010
@@ -37,8 +37,7 @@
Basic test for the Geronimo console.
</description>
<profiles>
- <profile>
- <!-- Called by m-m-p from the parent project, do not call it separately -->
+ <profile>
<id>child</id>
<build>
<plugins>
@@ -46,16 +45,13 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
-
+ <artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins>
</build>
- </profile>
-
-
+ </profile>
</profiles>
</project>
Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/pom.xml Thu May 20 07:25:53 2010
@@ -36,89 +36,13 @@
<description>
Geronimo console testsuite.
- </description>
-
- <build>
- <!-- What if console testsuite use surefire plugin instead of failsafe plugin -->
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <skip>true</skip>
- <testFailureIgnore>true</testFailureIgnore>
- <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
- <reportFormat>plain</reportFormat>
- <useFile>true</useFile>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkMode>once</forkMode>
- <workingDirectory>${project.build.directory}</workingDirectory>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- <executions>
- <execution>
- <id>test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <aggregate>true</aggregate>
- <outputDirectory>${project.build.outputDirectory}/surefire-reports</outputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>testsuite-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-surefire-xml</id>
- <phase>install</phase>
- <goals>
- <goal>generate-surefire-xml</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </description>
<profiles>
<profile>
<id>it</id>
<build>
<plugins>
- <!-- Console testsuite needs s-m-p to run test cases -->
-
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>maven-maven-plugin</artifactId>
@@ -136,8 +60,6 @@
<id>it-manual</id>
<build>
<plugins>
- <!-- Console testsuite needs s-m-p to run test cases -->
-
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>maven-maven-plugin</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml Thu May 20 07:25:53 2010
@@ -123,8 +123,7 @@
<!-- Setup the client log file location for access by the CORBA app client -->
<!-- ===================================================================== -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <!--<artifactId>maven-surefire-plugin</artifactId>-->
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemProperties>
Modified: geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml Thu May 20 07:25:53 2010
@@ -74,6 +74,10 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
@@ -128,8 +132,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <!--<artifactId>maven-surefire-plugin</artifactId>-->
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<suiteXmlFiles>
Modified: geronimo/server/branches/2.2/testsuite/corba-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/corba-testsuite/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/corba-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/corba-testsuite/pom.xml Thu May 20 07:25:53 2010
@@ -95,8 +95,7 @@
</build>
</profile>
<profile>
- <id>it-manual</id>
-
+ <id>it-manual</id>
<!--
TODO: Hook up m-m-p to allow child modules to be built early during
this modules compile (or something) phase.
@@ -147,65 +146,6 @@
<module>corba-mytime</module>
</modules>
</profile>
- </profiles>
- <!--
- Comment out following if using surefire plugin to run integration test
- -->
- <!--<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <skip>true</skip>
- <testFailureIgnore>true</testFailureIgnore>
- <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
- <reportFormat>plain</reportFormat>
- <useFile>true</useFile>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkMode>once</forkMode>
- <workingDirectory>${project.build.directory}</workingDirectory>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- <executions>
- <execution>
- <id>test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <aggregate>true</aggregate>
- <outputDirectory>${project.build.outputDirectory}/surefire-reports</outputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>-->
+ </profiles>
</project>
Modified: geronimo/server/branches/2.2/testsuite/deployment-testsuite/deployment-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/deployment-testsuite/deployment-tests/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/deployment-tests/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/deployment-tests/pom.xml Thu May 20 07:25:53 2010
@@ -41,21 +41,20 @@
<profile>
<id>child</id>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
@@ -72,16 +71,13 @@
Deploy only 1 module until
https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed.
-->
-
<!--<module>
<groupId>org.apache.geronimo.testsupport</groupId>
<artifactId>test-ear-j2ee_1.3</artifactId>
<version>${version}</version>
<type>ear</type>
- </module>
-
-
- --><module>
+ </module>-->
+ <module>
<groupId>org.apache.geronimo.testsupport</groupId>
<artifactId>test-ear-j2ee_1.4</artifactId>
<version>${version}</version>
@@ -112,10 +108,8 @@
</module>
</modules>
</configuration>
- </execution>
-
-
- --><execution>
+ </execution>-->
+ <execution>
<id>undeploy-ear-as-moduleId</id>
<phase>post-integration-test</phase>
<goals>
Modified: geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml Thu May 20 07:25:53 2010
@@ -69,22 +69,21 @@
<profile>
<id>child</id>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
Modified: geronimo/server/branches/2.2/testsuite/deployment-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/deployment-testsuite/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/pom.xml Thu May 20 07:25:53 2010
@@ -38,32 +38,9 @@
Geronimo deployment testsuite.
</description>
- <build>
- <plugins>
- <plugin>
- <!-- This plugin is needed for all suite poms. -->
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>testsuite-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-surefire-xml</id>
- <phase>install</phase>
- <goals>
- <goal>generate-surefire-xml</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>it</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
<build>
<plugins>
<plugin>
@@ -84,11 +61,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -105,8 +77,6 @@
<profile>
<id>it-manual</id>
-
-
<build>
<plugins>
<plugin>
@@ -129,11 +99,6 @@
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>maven-maven-plugin</artifactId>
</plugin>
Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml Thu May 20 07:25:53 2010
@@ -96,6 +96,11 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml Thu May 20 07:25:53 2010
@@ -105,6 +105,11 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml Thu May 20 07:25:53 2010
@@ -32,6 +32,7 @@
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>jms-ejb</artifactId>
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: JMS EJB</name>
<packaging>ejb</packaging>
<dependencies>
Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml Thu May 20 07:25:53 2010
@@ -82,6 +82,11 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/pom.xml Thu May 20 07:25:53 2010
@@ -67,10 +67,7 @@
<profiles>
<profile>
- <id>it</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
+ <id>it</id>
<!--
TODO: Hook up m-m-p to allow child modules to be built early during this modules
compile (or something) phase.
@@ -97,11 +94,6 @@
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
</plugin>
@@ -121,8 +113,7 @@
</profile>
<profile>
- <id>it-manual</id>
-
+ <id>it-manual</id>
<!--
TODO: Hook up m-m-p to allow child modules to be built early during this modules
compile (or something) phase.
@@ -147,11 +138,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-client-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-client-tests/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-client-tests/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-client-tests/pom.xml Thu May 20 07:25:53 2010
@@ -71,6 +71,11 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml Thu May 20 07:25:53 2010
@@ -130,6 +130,10 @@
<id>child</id>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: geronimo/server/branches/2.2/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/pom.xml Thu May 20 07:25:53 2010
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>testsuite</artifactId>
- <name>Geronimo TestSuite</name>
- <packaging>pom</packaging>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
+
+ <!--
+ $Rev$ $Date$
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <description>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>testsuite</artifactId>
+ <name>Geronimo TestSuite</name>
+ <packaging>pom</packaging>
+
+ <description>
Geronimo integration testsuite.
</description>
@@ -72,403 +72,399 @@
mvn clean install -Pchild
-->
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>testsupport-selenium</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.groovy.maven.support</groupId>
- <artifactId>slf4j-gossip</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <modules>
- <module>commands-testsuite</module>
- <module>concurrent-testsuite</module>
- <module>console-testsuite</module>
- <module>corba-testsuite</module>
- <module>deployment-testsuite</module>
- <module>enterprise-testsuite</module>
- <module>security-testsuite</module>
- <module>web-testsuite</module>
- <module>webservices-testsuite</module>
- </modules>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>src/main/filtered-resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>testsuite-maven-plugin</artifactId>
- <version>${version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <resourcesDir>${project.build.outputDirectory}</resourcesDir>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
- <webResources>
- <resource>
- <directory>${pom.basedir}/src/main/webapp</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>${project.build.outputDirectory}</directory>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <!-- Disable surefire plugin and make it not run in the testsuites -->
- <skip>true</skip>
- </configuration>
- <!-- By default, use failsafe plugin -->
- <!--<executions>
- <execution>
- <id>test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>-->
- </plugin>
-
- <!-- m-m-p is used to launch all of tests in one testsuite, while just start/stop server only one time, it saves time -->
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>maven-maven-plugin</artifactId>
- <version>1.5</version>
- <configuration>
- <fileset>
- <basedir>${pom.basedir}</basedir>
- <includes>
- <include>*/pom.xml</include>
- </includes>
- </fileset>
- <profiles>
- <profile>child</profile>
- </profiles>
- </configuration>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <goals>
- <goal>invoke</goal>
- </goals>
- </execution>
- <execution>
- <id>site-deploy</id>
- <phase>site-deploy</phase>
- <goals>
- <goal>invoke</goal>
- </goals>
- <configuration>
- <goals>
- <goal>site-deploy</goal>
- </goals>
- <parameters>
- <buildNumber>${buildNumber}</buildNumber>
- </parameters>
- </configuration>
- </execution>
- <execution>
- <id>clean</id>
- <phase>clean</phase>
- <goals>
- <goal>invoke</goal>
- </goals>
- <configuration>
- <goals>
- <goal>clean</goal>
- </goals>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <configuration>
- <!-- this reporter is used to generate server start/stop information when using surefire plugin -->
- <reporters>
- <reporter implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
- <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
- </reporter>
- </reporters>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>start</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <logOutput>true</logOutput>
- <background>true</background>
- </configuration>
- </execution>
- <execution>
- <id>stop</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop-server</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkMode>once</forkMode>
- <argLine>-enableassertions</argLine>
- <failIfNoTests>false</failIfNoTests>
- <testFailureIgnore>true</testFailureIgnore>
- <workingDirectory>${project.build.directory}</workingDirectory>
- <includes>
- <include>**/Test*.java</include>
- <include>**/*Test.java</include>
- </includes>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- <systemPropertyVariables>
- <property>
- <name>geronimoVersion</name>
- <value>${project.version}</value>
- </property>
- </systemPropertyVariables>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <phase>verify</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <configuration>
- <!-- Don't bother checking legal muck here, we never publish them. -->
- <skip>true</skip>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <!-- We never release testsuite artifacts -->
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <distributionManagement>
- <site>
- <id>website</id>
- <url>scp://people.apache.org/www/people.apache.org/builds/geronimo/server/testsuite/${buildNumber}</url>
- </site>
- </distributionManagement>
-
- <reporting>
- <plugins>
- <!-- Use t-m-p to generate human readable report -->
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>testsuite-maven-plugin</artifactId>
- </plugin>
-
- </plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>it</id>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>start</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <logOutput>true</logOutput>
- <background>true</background>
- <verifyTimeout>300</verifyTimeout>
- <refresh>true</refresh>
- <optionSets>
- <optionSet>
- <id>default</id>
- <options>
- <option>-XX:MaxPermSize=160m</option>
- </options>
- </optionSet>
- </optionSets>
- </configuration>
- </execution>
- <execution>
- <id>stop</id>
- <phase>install</phase>
- <goals>
- <goal>stop-server</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>testsuite-maven-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>summarize</id>
- <phase>post-site</phase>
- <goals>
- <goal>summarize</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>it-manual</id>
- </profile>
-
- <profile>
- <id>headless</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>xvfb</id>
- <phase>process-test-sources</phase>
- <goals>
- <goal>xvfb</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
-
- <profile>
- <id>firefox</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <browser>*firefox</browser>
- </properties>
- </profile>
- <profile>
- <id>iexplore</id>
- <properties>
- <browser>*iexplore</browser>
- </properties>
- </profile>
- <profile>
- <id>otherbrowser</id>
- <properties>
- <browser>${browserPath}</browser>
- </properties>
- </profile>
-
- <profile>
- <id>all-subprojects</id>
- </profile>
-
- </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-selenium</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy.maven.support</groupId>
+ <artifactId>slf4j-gossip</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>commands-testsuite</module>
+ <module>concurrent-testsuite</module>
+ <module>console-testsuite</module>
+ <module>corba-testsuite</module>
+ <module>deployment-testsuite</module>
+ <module>enterprise-testsuite</module>
+ <module>security-testsuite</module>
+ <module>web-testsuite</module>
+ <module>webservices-testsuite</module>
+ </modules>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/filtered-resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>testsuite-maven-plugin</artifactId>
+ <version>${version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <resourcesDir>${project.build.outputDirectory}</resourcesDir>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+ <webResources>
+ <resource>
+ <directory>${pom.basedir}/src/main/webapp</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.outputDirectory}</directory>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <!-- Disable surefire plugin and make it not run in the testsuites -->
+ <skip>true</skip>
+ </configuration>
+ <!-- By default, use failsafe plugin -->
+ <!--
+ <executions> <execution> <id>test</id> <phase>test</phase> <goals>
+ <goal>test</goal> </goals> <configuration> <skip>true</skip>
+ </configuration> </execution> <execution> <id>integration</id>
+ <phase>integration-test</phase> <goals> <goal>test</goal> </goals>
+ <configuration> <testFailureIgnore>true</testFailureIgnore>
+ <skip>false</skip> </configuration> </execution> </executions>
+ -->
+ </plugin>
+
+ <!--
+ m-m-p is used to launch all of tests in one testsuite, while just
+ start/stop server only one time, it saves time
+ -->
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>maven-maven-plugin</artifactId>
+ <version>1.5</version>
+ <configuration>
+ <fileset>
+ <basedir>${pom.basedir}</basedir>
+ <includes>
+ <include>*/pom.xml</include>
+ </includes>
+ </fileset>
+ <profiles>
+ <profile>child</profile>
+ </profiles>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>invoke</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>site-deploy</id>
+ <phase>site-deploy</phase>
+ <goals>
+ <goal>invoke</goal>
+ </goals>
+ <configuration>
+ <goals>
+ <goal>site-deploy</goal>
+ </goals>
+ <parameters>
+ <buildNumber>${buildNumber}</buildNumber>
+ </parameters>
+ </configuration>
+ </execution>
+ <execution>
+ <id>clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>invoke</goal>
+ </goals>
+ <configuration>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <configuration>
+ <!--
+ this reporter is used to generate server start/stop information
+ when using surefire plugin
+ -->
+ <reporters>
+ <reporter
+ implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
+ <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+ </reporter>
+ </reporters>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>start</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <logOutput>true</logOutput>
+ <background>true</background>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop-server</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <forkMode>once</forkMode>
+ <argLine>-enableassertions</argLine>
+ <failIfNoTests>false</failIfNoTests>
+ <testFailureIgnore>true</testFailureIgnore>
+ <workingDirectory>${project.build.directory}</workingDirectory>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <!-- TestNG suiteXML config overrides includes/excludes above -->
+ <!--
+ <suiteXmlFiles>
+ <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ -->
+ <systemPropertyVariables>
+ <property>
+ <name>geronimoVersion</name>
+ <value>${project.version}</value>
+ </property>
+ </systemPropertyVariables>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <configuration>
+ <!-- Don't bother checking legal muck here, we never publish them. -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!-- We never release testsuite artifacts -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>scp://people.apache.org/www/people.apache.org/builds/geronimo/server/testsuite/${buildNumber}</url>
+ </site>
+ </distributionManagement>
+
+ <reporting>
+ <plugins>
+ <!-- Use t-m-p to generate human readable report -->
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>testsuite-maven-plugin</artifactId>
+ </plugin>
+
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>start</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <logOutput>true</logOutput>
+ <background>true</background>
+ <verifyTimeout>300</verifyTimeout>
+ <refresh>true</refresh>
+ <optionSets>
+ <optionSet>
+ <id>default</id>
+ <options>
+ <option>-XX:MaxPermSize=160m</option>
+ </options>
+ </optionSet>
+ </optionSets>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop</id>
+ <phase>install</phase>
+ <goals>
+ <goal>stop-server</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>testsuite-maven-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>summarize</id>
+ <phase>post-site</phase>
+ <goals>
+ <goal>summarize</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>it-manual</id>
+ </profile>
+
+ <profile>
+ <id>headless</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>xvfb</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>xvfb</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+
+ <profile>
+ <id>firefox</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <browser>*firefox</browser>
+ </properties>
+ </profile>
+ <profile>
+ <id>iexplore</id>
+ <properties>
+ <browser>*iexplore</browser>
+ </properties>
+ </profile>
+ <profile>
+ <id>otherbrowser</id>
+ <properties>
+ <browser>${browserPath}</browser>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>all-subprojects</id>
+ </profile>
+
+ </profiles>
</project>
Modified: geronimo/server/branches/2.2/testsuite/security-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/security-testsuite/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/security-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/security-testsuite/pom.xml Thu May 20 07:25:53 2010
@@ -36,31 +36,11 @@
<description>
Geronimo security testsuite.
- </description>
-
- <build>
- <plugins>
- <plugin>
- <!-- This plugin is needed for all suite poms. -->
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>testsuite-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-surefire-xml</id>
- <phase>install</phase>
- <goals>
- <goal>generate-surefire-xml</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </description>
<profiles>
<profile>
- <id>it</id>
-
+ <id>it</id>
<!--
TODO: Hook up m-m-p to allow child modules to be built early during this modules
compile (or something) phase.
@@ -101,8 +81,7 @@
</build>
</profile>
<profile>
- <id>it-manual</id>
-
+ <id>it-manual</id>
<!--
TODO: Hook up m-m-p to allow child modules to be built early during this modules
compile (or something) phase.
Modified: geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml Thu May 20 07:25:53 2010
@@ -81,6 +81,15 @@
<id>child</id>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/pom.xml Thu May 20 07:25:53 2010
@@ -45,82 +45,9 @@
</description>
<properties>
- <excludeTest>test-tomcat</excludeTest>
+ <excludeTest>test-jetty</excludeTest>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- This plugin is needed for all suite poms. -->
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>testsuite-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-surefire-xml</id>
- <phase>install</phase>
- <goals>
- <goal>generate-surefire-xml</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <skip>true</skip>
- <testFailureIgnore>true</testFailureIgnore>
- <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
- <reportFormat>plain</reportFormat>
- <useFile>true</useFile>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkMode>once</forkMode>
- <workingDirectory>${project.build.directory}</workingDirectory>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- <executions>
- <execution>
- <id>test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <aggregate>true</aggregate>
- <outputDirectory>${project.build.outputDirectory}/surefire-reports</outputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<profiles>
<profile>
<id>it</id>
@@ -148,12 +75,7 @@
</goals>
</execution>
</executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -207,12 +129,7 @@
</goals>
</execution>
</executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml Thu May 20 07:25:53 2010
@@ -52,6 +52,11 @@
<id>child</id>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml Thu May 20 07:25:53 2010
@@ -45,8 +45,11 @@
<profile>
<id>child</id>
<build>
-
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml Thu May 20 07:25:53 2010
@@ -45,8 +45,11 @@
<profile>
<id>child</id>
<build>
-
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml Thu May 20 07:25:53 2010
@@ -58,6 +58,10 @@
<id>child</id>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-tomcat/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-tomcat/pom.xml Thu May 20 07:25:53 2010
@@ -44,9 +44,12 @@
<profiles>
<profile>
<id>child</id>
- <build>
-
+ <build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml Thu May 20 07:25:53 2010
@@ -62,8 +62,11 @@
<profile>
<id>child</id>
<build>
-
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
@@ -87,8 +90,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
-
+ <artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<!-- "ear" packaging doesn't compile test classes -->
Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml Thu May 20 07:25:53 2010
@@ -62,8 +62,11 @@
<profile>
<id>child</id>
<build>
-
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
@@ -86,8 +89,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
-
+ <artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<!-- "ear" packaging doesn't compile test classes -->
Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml Thu May 20 07:25:53 2010
@@ -62,7 +62,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemProperties>
<property>
Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml Thu May 20 07:25:53 2010
@@ -37,12 +37,6 @@
<description>This project executes testcases for your testsuite</description>
<dependencies>
- <!--
- <dependency> <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
- <scope>provided</scope> </dependency>
- -->
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
@@ -56,7 +50,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemProperties>
<property>
Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml Thu May 20 07:25:53 2010
@@ -68,7 +68,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemProperties>
<property>
Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml Thu May 20 07:25:53 2010
@@ -62,7 +62,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemProperties>
<property>
Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml Thu May 20 07:25:53 2010
@@ -72,7 +72,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemProperties>
<property>
Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml Thu May 20 07:25:53 2010
@@ -76,7 +76,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemProperties>
<property>
Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml Thu May 20 07:25:53 2010
@@ -48,7 +48,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemProperties>
<property>
|