geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r936356 - in /geronimo/server/trunk/testsuite: ./ security-testsuite/test-security/ web-testsuite/ web-testsuite/test-jetty/ web-testsuite/test-jetty/src/main/webapp/WEB-INF/ web-testsuite/test-jetty/src/test/resources/ web-testsuite/test-m...
Date Wed, 21 Apr 2010 15:35:12 GMT
Author: gawor
Date: Wed Apr 21 15:35:12 2010
New Revision: 936356

URL: http://svn.apache.org/viewvc?rev=936356&view=rev
Log:
GERONIMO-5262: Update a few more tests to use maven-failsafe plugin

Removed:
    geronimo/server/trunk/testsuite/security-testsuite/test-security/goals.txt
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/resources/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/test/resources/
Modified:
    geronimo/server/trunk/testsuite/pom.xml
    geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=936356&r1=936355&r2=936356&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Wed Apr 21 15:35:12 2010
@@ -278,32 +278,6 @@
         </profile>
 
         <profile>
-            <id>testsuite-with-jetty</id>
-            <activation>
-                <property>
-                    <name>assemblyId</name>
-                    <value>jetty</value>
-                </property>
-            </activation>
-            <properties>
-                <shittyTestExcludes>**/*tomcat*/pom.xml</shittyTestExcludes>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>testsuite-with-tomcat</id>
-            <activation>
-                <property>
-                    <name>assemblyId</name>
-                    <value>tomcat</value>
-                </property>
-            </activation>
-            <properties>
-                <shittyTestExcludes>**/*jetty*/pom.xml</shittyTestExcludes>
-            </properties>
-        </profile>
-
-        <profile>
             <id>headless</id>
             <build>
                 <pluginManagement>

Modified: geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml?rev=936356&r1=936355&r2=936356&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml Wed Apr 21 15:35:12
2010
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>test-security</artifactId>
-    <name>Geronimo TestSuite :: Web Testsuite :: Test Security</name>
+    <name>Geronimo TestSuite :: Security Testsuite :: Test Security</name>
     <packaging>war</packaging>
 
     <description>

Modified: geronimo/server/trunk/testsuite/web-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/pom.xml?rev=936356&r1=936355&r2=936356&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/pom.xml Wed Apr 21 15:35:12 2010
@@ -49,12 +49,38 @@
         <module>test-2.5-servlets</module>
         <module>test-tld</module>
 <!--
-        <module>test-jetty</module>
         <module>test-myfaces</module>
-        <module>test-tomcat</module>
         <module>test-web-forward</module>
         <module>test-web-references</module>
 -->
     </modules>
 
+    <profiles>
+        <profile>
+            <id>testsuite-with-jetty</id>
+            <activation>
+                <property>
+                    <name>assemblyId</name>
+                    <value>jetty</value>
+                </property>
+            </activation>
+            <modules>
+                <module>test-jetty</module>
+            </modules>
+        </profile>
+
+        <profile>
+            <id>testsuite-with-tomcat</id>
+            <activation>
+                <property>
+                    <name>assemblyId</name>
+                    <value>tomcat</value>
+                </property>
+            </activation>
+            <modules>
+                <module>test-tomcat</module>
+            </modules>
+        </profile>
+    </profiles>
+
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml?rev=936356&r1=936355&r2=936356&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml Wed Apr 21 15:35:12 2010
@@ -42,50 +42,40 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-wars</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy-war-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-wars</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml?rev=936356&r1=936355&r2=936356&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml
Wed Apr 21 15:35:12 2010
@@ -23,7 +23,7 @@
             <sys:groupId>${pom.groupId}</sys:groupId>
             <sys:artifactId>${pom.artifactId}</sys:artifactId>
             <sys:version>${version}</sys:version>
-            <sys:type>car</sys:type>
+            <sys:type>war</sys:type>
         </sys:moduleId>
     </sys:environment>
     <context-root>/JettyWeb</context-root>
@@ -35,4 +35,4 @@
             <virtual-host>testhost.com</virtual-host>
         </jetty>
     </container-config>
-</web-app>
\ No newline at end of file
+</web-app>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml?rev=936356&r1=936355&r2=936356&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml Wed Apr 21 15:35:12
2010
@@ -54,50 +54,59 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+    <profiles>
+        <profile>
+            <id>it</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.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-wars</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
-                        </configuration>
-                    </execution>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
 
-                    <execution>
-                        <id>undeploy-war-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-wars</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/WEB-INF/geronimo-web.xml?rev=936356&r1=936355&r2=936356&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/WEB-INF/geronimo-web.xml
Wed Apr 21 15:35:12 2010
@@ -21,7 +21,7 @@
       <dep:groupId>${pom.groupId}</dep:groupId>
       <dep:artifactId>${pom.artifactId}</dep:artifactId>
       <dep:version>${version}</dep:version>
-      <dep:type>car</dep:type>
+      <dep:type>war</dep:type>
     </dep:moduleId>
   </dep:environment>
   <context-root>/myfaces</context-root>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml?rev=936356&r1=936355&r2=936356&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml Wed Apr 21 15:35:12
2010
@@ -42,50 +42,40 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-wars</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                          <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy-war-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-wars</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml?rev=936356&r1=936355&r2=936356&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
Wed Apr 21 15:35:12 2010
@@ -26,7 +26,7 @@
             <sys:groupId>${pom.groupId}</sys:groupId>
             <sys:artifactId>${pom.artifactId}</sys:artifactId>
             <sys:version>${version}</sys:version>
-            <sys:type>car</sys:type>
+            <sys:type>war</sys:type>
         </sys:moduleId>
     </sys:environment>
     <context-root>/TomcatWeb</context-root>
@@ -87,4 +87,4 @@
             <!--roleClassNames=org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal-->
         <!--</attribute>-->
     <!--</gbean>-->
-</web-app>
\ No newline at end of file
+</web-app>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml?rev=936356&r1=936355&r2=936356&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
Wed Apr 21 15:35:12 2010
@@ -59,20 +59,6 @@
     </dependencies>
     
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -95,16 +81,6 @@
                 </configuration>
             </plugin>
             
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                </configuration>
-            </plugin>
-                    
             <!-- "ear" packaging doesn't compile test classes -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -130,35 +106,62 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-ears</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-                            
-                    <execution>
-                        <id>undeploy-ear-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>it</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.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-ears</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>undeploy-ear-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
     
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml?rev=936356&r1=936355&r2=936356&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
Wed Apr 21 15:35:12 2010
@@ -59,20 +59,6 @@
     </dependencies>
     
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -94,16 +80,6 @@
                 </configuration>
             </plugin>
             
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                </configuration>
-            </plugin>
-                    
             <!-- "ear" packaging doesn't compile test classes -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -129,35 +105,62 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-ears</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-                            
-                    <execution>
-                        <id>undeploy-ear-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>it</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.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-ears</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>undeploy-ear-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
     
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml?rev=936356&r1=936355&r2=936356&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
Wed Apr 21 15:35:12 2010
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>web-references-war</artifactId>
-    <name>Geronimo Test Suite :: Test Web References :: WAR</name>
+    <name>Geronimo TestSuite :: Test Web References :: WAR</name>
     <packaging>war</packaging>
 
     <description>
@@ -70,7 +70,7 @@
             <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-\
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>



Mime
View raw message