geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r966916 - in /geronimo/server/trunk/testsuite: ./ aries-testsuite/jpa/jpa-eba/ aries-testsuite/simple/simple-eba/ commands-testsuite/deploy/ commands-testsuite/jaxws/ commands-testsuite/shutdown/ console-testsuite/advanced/ console-testsuit...
Date Fri, 23 Jul 2010 00:40:53 GMT
Author: gawor
Date: Fri Jul 23 00:40:52 2010
New Revision: 966916

URL: http://svn.apache.org/viewvc?rev=966916&view=rev
Log:
revert r966484 and add support for running the tests without starting a server

Modified:
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml
    geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml
    geronimo/server/trunk/testsuite/commands-testsuite/deploy/pom.xml
    geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml
    geronimo/server/trunk/testsuite/commands-testsuite/shutdown/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/datasource-test/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
    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-2.1-jsps/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.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/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml

Modified: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml (original)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml Fri Jul 23 00:40:52 2010
@@ -45,21 +45,44 @@
             <artifactId>jpa-wab</artifactId>
             <version>${project.version}</version>
         </dependency>
-    </dependencies>    
+    </dependencies>
     
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>eba-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <generateManifest>true</generateManifest>
+                    <instructions>
+                        <Application-Version>1.0.0</Application-Version>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.aries</groupId>
-                        <artifactId>eba-maven-plugin</artifactId>
-                        <extensions>true</extensions>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
-                            <generateManifest>true</generateManifest>
-                            <instructions>
-                                <Application-Version>1.0.0</Application-Version>
-                            </instructions>
+                            <systemPropertyVariables>
+                                <webAppName>jpa</webAppName>
+                            </systemPropertyVariables>
                         </configuration>
                     </plugin>
+
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
@@ -135,17 +158,9 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <webAppName>jpa</webAppName>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
                 </plugins>
             </build>
-        
+        </profile>
+    </profiles>
     
 </project>

Modified: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml (original)
+++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml Fri Jul 23 00:40:52 2010
@@ -47,19 +47,42 @@
         </dependency>
     </dependencies>
     
-            <build>               
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>eba-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <generateManifest>true</generateManifest>
+                    <instructions>
+                        <Application-Version>1.0.0</Application-Version>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.aries</groupId>
-                        <artifactId>eba-maven-plugin</artifactId>
-                        <extensions>true</extensions>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
-                            <generateManifest>true</generateManifest>
-                            <instructions>
-                                <Application-Version>1.0.0</Application-Version>
-                            </instructions>
+                            <systemPropertyVariables>
+                                <webAppName>simple</webAppName>
+                            </systemPropertyVariables>
                         </configuration>
                     </plugin>
+
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -86,16 +109,9 @@
                             </execution>
                         </executions>
                     </plugin>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-failsafe-plugin</artifactId>
-                            <configuration>
-                                <systemPropertyVariables>
-                                    <webAppName>simple</webAppName>
-                                </systemPropertyVariables>
-                            </configuration>
-                        </plugin>
                 </plugins>
-            </build>        
+            </build>
+        </profile>
+    </profiles>
     
 </project>

Modified: geronimo/server/trunk/testsuite/commands-testsuite/deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/deploy/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/commands-testsuite/deploy/pom.xml (original)
+++ geronimo/server/trunk/testsuite/commands-testsuite/deploy/pom.xml Fri Jul 23 00:40:52 2010
@@ -31,21 +31,22 @@
     <description>
         Test for the deploy.bat/sh
     </description>
-    <build>
-        <plugins>    
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>        
 
     <profiles>
         <profile>
             <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+                    <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
                     </plugin>

Modified: geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml (original)
+++ geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml Fri Jul 23 00:40:52 2010
@@ -51,7 +51,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
+                <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <systemProperties>
                         <property>

Modified: geronimo/server/trunk/testsuite/commands-testsuite/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/shutdown/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/commands-testsuite/shutdown/pom.xml (original)
+++ geronimo/server/trunk/testsuite/commands-testsuite/shutdown/pom.xml Fri Jul 23 00:40:52 2010
@@ -31,21 +31,22 @@
     <description>
         Test for the shutdown.bat/sh
     </description>
-    <build>
-        <plugins>    
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>    
 
     <profiles>
         <profile>
             <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+                    <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
                     </plugin>

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml Fri Jul 23 00:40:52 2010
@@ -37,25 +37,27 @@
         Advanced test for the Geronimo console.
     </description>
 
-    <build>
-        <plugins>    
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>   
-
     <profiles>
         <profile>
             <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </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>

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml Fri Jul 23 00:40:52 2010
@@ -37,26 +37,27 @@
         Basic test for the Geronimo console.
     </description>
 
-    <build>
-        <plugins>    
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>   
-
-
     <profiles>
         <profile>
             <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </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>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml Fri Jul 23 00:40:52 2010
@@ -109,6 +109,37 @@
                     </execution>
                 </executions>
             </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Deploy the ear and invoke the imbedded CORBA app client  -->
+                    <!-- ======================================================== -->
+                    <!-- ===================================================================== -->
+                    <!-- Setup the client log file location for access by the CORBA app client -->
+                    <!-- ===================================================================== -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemProperties>
+                                <property>
+                                    <name>clientLogFile</name>
+                                    <value>${clientLogFile}</value>
+                                </property>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -182,23 +213,10 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <!-- Deploy the ear and invoke the imbedded CORBA app client  -->
-                    <!-- ======================================================== -->
-                    <!-- ===================================================================== -->
-                    <!-- Setup the client log file location for access by the CORBA app client -->
-                    <!-- ===================================================================== -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <systemProperties>
-                                <property>
-                                    <name>clientLogFile</name>
-                                    <value>${clientLogFile}</value>
-                                </property>
-                            </systemProperties>
-                        </configuration>
-                    </plugin>
-        </plugins>
-    </build>
+                    
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml Fri Jul 23 00:40:52 2010
@@ -82,7 +82,27 @@
                         </jarModule>
                     </modules>
                 </configuration>
-            </plugin>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+
+                    <!-- Deploy the ear and invoke the imbedded CORBA app client -->
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -129,7 +149,9 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>    
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml Fri Jul 23 00:40:52 2010
@@ -115,15 +115,30 @@
                     </execution>
                 </executions>
             </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>
+            
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <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.codehaus.mojo</groupId>
                         <artifactId>selenium-maven-plugin</artifactId>
@@ -160,7 +175,10 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/pom.xml Fri Jul 23 00:40:52 2010
@@ -42,7 +42,7 @@
 <!--
         <module>corba-helloworld</module>
 -->
-        <!--<module>corba-marshal</module>-->
+        <module>corba-marshal</module>
         <module>corba-mytime</module>
     </modules>
 

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml Fri Jul 23 00:40:52 2010
@@ -37,17 +37,26 @@
         Tests for the test-deployables.
     </description>
 
-    <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>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <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.codehaus.mojo</groupId>
                         <artifactId>selenium-maven-plugin</artifactId>
@@ -118,8 +127,9 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>
-    
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml Fri Jul 23 00:40:52 2010
@@ -115,15 +115,28 @@
                     </execution>
                 </executions>
             </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>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <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.codehaus.mojo</groupId>
@@ -156,7 +169,9 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml Fri Jul 23 00:40:52 2010
@@ -79,6 +79,24 @@
                     </modules>
                 </configuration>
             </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -105,7 +123,9 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml Fri Jul 23 00:40:52 2010
@@ -92,6 +92,19 @@
                     </execution>
                 </executions>
             </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
@@ -136,7 +149,10 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/datasource-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/datasource-test/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/datasource-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/datasource-test/pom.xml Fri Jul 23 00:40:52 2010
@@ -41,21 +41,30 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
-            <build>                         
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
                 <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-failsafe-plugin</artifactId>
-                            <configuration>
-                                <systemProperties>
-                                    <property>
-                                        <name>webAppName</name>
-                                        <value>datasource</value>
-                                    </property>
-                                </systemProperties>
-                            </configuration>
-                        </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemProperties>
+                                <property>
+                                    <name>webAppName</name>
+                                    <value>datasource</value>
+                                </property>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -83,6 +92,8 @@
                         </executions>
                     </plugin>
                 </plugins>
-            </build>        
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml Fri Jul 23 00:40:52 2010
@@ -118,6 +118,24 @@
                     </execution>
                 </executions>
             </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -144,8 +162,10 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
 

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml Fri Jul 23 00:40:52 2010
@@ -121,16 +121,29 @@
                     </execution>
                 </executions>
             </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>
-                    
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <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.codehaus.mojo</groupId>
                         <artifactId>selenium-maven-plugin</artifactId>
@@ -162,7 +175,9 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml Fri Jul 23 00:40:52 2010
@@ -104,6 +104,24 @@
                     </execution>
                 </executions>
             </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -130,7 +148,9 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml Fri Jul 23 00:40:52 2010
@@ -53,7 +53,7 @@
         <module>sec-tests</module>
 -->
         <module>jpa-tests</module>
-        <!--<module>sec-client-tests</module>-->
+        <module>sec-client-tests</module>
         <module>datasource-test</module>
         <module>appname-tests</module>
     </modules>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml Fri Jul 23 00:40:52 2010
@@ -62,6 +62,20 @@
                     </archive>
                 </configuration>
             </plugin>
+
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
@@ -74,6 +88,7 @@
                             </systemProperties>
                         </configuration>
                     </plugin>
+
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -114,8 +129,10 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
 

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml Fri Jul 23 00:40:52 2010
@@ -119,6 +119,19 @@
                     </execution>
                 </executions>
             </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
@@ -175,7 +188,10 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Fri Jul 23 00:40:52 2010
@@ -107,7 +107,6 @@
                     </configuration>
                 </plugin>
 
-                <!-- turn off tests unless 'it' profile active-->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -116,71 +115,70 @@
                     </configuration>
                 </plugin>
 
-                        <plugin>
-                            <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>selenium-maven-plugin</artifactId>
-                            <!--<inherited>false</inherited>-->
-                            <executions>
-                                <execution>
-                                    <id>start-selenium</id>
-                                    <phase>pre-integration-test</phase>
-                                    <goals>
-                                        <goal>start-server</goal>
-                                    </goals>
-                                    <configuration>
-                                        <logOutput>true</logOutput>
-                                        <background>true</background>
-                                        <systemProperties>
-                                            <property>
-                                                <name>browser</name>
-                                                <value>${browser}</value>
-                                            </property>
-                                        </systemProperties>
-                                    </configuration>
-                                </execution>
-                                <execution>
-                                    <id>stop-selenium</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>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>selenium-maven-plugin</artifactId>
+                    <inherited>false</inherited>
+                    <executions>
+                        <execution>
+                            <id>start-selenium</id>
+                            <phase>pre-integration-test</phase>
+                            <goals>
+                                <goal>start-server</goal>
+                            </goals>
                             <configuration>
-                                <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                                <forkMode>once</forkMode>
-                                <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
-                                <argLine>-enableassertions</argLine>
-                                <failIfNoTests>false</failIfNoTests>
-                                <testFailureIgnore>true</testFailureIgnore>
-                                <workingDirectory>${project.build.directory}</workingDirectory>
-                                <includes>
-                                    <include>**/Test*.java</include>
-                                    <include>**/*Test.java</include>
-                                </includes>
+                                <logOutput>true</logOutput>
+                                <background>true</background>
+                                <systemProperties>
+                                    <property>
+                                        <name>browser</name>
+                                        <value>${browser}</value>
+                                    </property>
+                                </systemProperties>
                             </configuration>
-                            <executions>
-                                <execution>
-                                    <id>integration-test</id>
-                                    <goals>
-                                        <goal>integration-test</goal>
-                                    </goals>
-                                </execution>
-                                <execution>
-                                    <id>verify</id>
-                                    <phase>install</phase>
-                                    <goals>
-                                        <goal>verify</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                        </plugin>
+                        </execution>
+                        <execution>
+                            <id>stop-selenium</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>
+                        <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+                        <argLine>-enableassertions</argLine>
+                        <failIfNoTests>false</failIfNoTests>
+                        <workingDirectory>${project.build.directory}</workingDirectory>
+                        <includes>
+                            <include>**/Test*.java</include>
+                            <include>**/*Test.java</include>
+                        </includes>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>integration-test</id>
+                            <goals>
+                                <goal>integration-test</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>verify</id>
+                            <phase>install</phase>
+                            <goals>
+                                <goal>verify</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
 
             </plugins>
         </pluginManagement>
@@ -263,9 +261,12 @@
     <profiles>
         <profile>
             <id>it</id>
-            <!--<activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>-->
+            <activation>
+                <property>
+                    <name>it</name>
+                    <value>auto</value>
+                </property>
+            </activation>
             <build>
                 <pluginManagement>
                     <plugins>
@@ -304,14 +305,21 @@
                                 </execution>
                             </executions>
                         </plugin>
-
                     </plugins>
-                </pluginManagement>                
+                </pluginManagement>
             </build>
         </profile>
 
         <profile>
-            <id>it-manual</id>            
+            <id>it-manual</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                    <value>manual</value>
+                </property>
+            </activation>
+            <build>
+            </build>
         </profile>
 
         <profile>
@@ -361,43 +369,4 @@
         </profile>
     </profiles>
 
-    <!--<repositories>
-        <repository>
-            <releases>
-                <enabled>false</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>warn</checksumPolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>
-            <id>codehausSnapshots</id>
-            <name>Codehaus Snapshots</name>
-            <url>http://snapshots.maven.codehaus.org/maven2</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>-->
-    
-    <pluginRepositories>
-        <pluginRepository>
-            <id>ApacheSnapshots</id>
-            <name>Apache Snapshots</name>
-            <url>https://repository.apache.org/content/repositories/snapshots</url>
-            <layout>default</layout>
-            <releases>
-                <enabled>false</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>warn</checksumPolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>            
-        </pluginRepository>
-    </pluginRepositories>
-
-
 </project>

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=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml Fri Jul 23 00:40:52 2010
@@ -72,12 +72,26 @@
         </dependency>
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </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>
@@ -106,5 +120,7 @@
                     </plugin>
                 </plugins>
             </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/pom.xml Fri Jul 23 00:40:52 2010
@@ -48,7 +48,7 @@
         <module>test-2.1-jsps</module>
         <module>test-2.5-servlets</module>
         <module>test-tld</module>
-        <!--<module>test-myfaces</module>-->
+        <module>test-myfaces</module>
 <!--
         <module>test-web-forward</module>
         <module>test-web-references</module>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml Fri Jul 23 00:40:52 2010
@@ -48,9 +48,22 @@
         </dependency>
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
                         <executions>
@@ -78,5 +91,7 @@
                     </plugin>
                 </plugins>
             </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml Fri Jul 23 00:40:52 2010
@@ -42,9 +42,27 @@
         </dependency>
     </dependencies>
 
-            <build>                
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <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.codehaus.mojo</groupId>
                         <artifactId>selenium-maven-plugin</artifactId>
                     </plugin>
@@ -75,16 +93,9 @@
                             </execution>
                         </executions>
                     </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>
                 </plugins>
             </build>
+        </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=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml Fri Jul 23 00:40:52 2010
@@ -42,9 +42,22 @@
         </dependency>
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
                         <executions>
@@ -72,5 +85,7 @@
                     </plugin>
                 </plugins>
             </build>
+        </profile>
+    </profiles>
 
 </project>

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=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml Fri Jul 23 00:40:52 2010
@@ -58,19 +58,34 @@
             <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <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.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>selenium-maven-plugin</artifactId>
@@ -104,5 +119,7 @@
                     </plugin>
                 </plugins>
             </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml Fri Jul 23 00:40:52 2010
@@ -54,9 +54,22 @@
         </dependency>
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
                         <executions>
@@ -84,5 +97,7 @@
                     </plugin>
                 </plugins>
             </build>
+        </profile>
+    </profiles>
 
 </project>

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=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml Fri Jul 23 00:40:52 2010
@@ -42,9 +42,22 @@
         </dependency>
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
                         <executions>
@@ -72,5 +85,7 @@
                     </plugin>
                 </plugins>
             </build>
+        </profile>
+    </profiles>
 
 </project>

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=966916&r1=966915&r2=966916&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 Fri Jul 23 00:40:52 2010
@@ -106,15 +106,28 @@
                     </execution>
                 </executions>
             </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>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <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.codehaus.mojo</groupId>
@@ -147,7 +160,9 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>
+                </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=966916&r1=966915&r2=966916&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 Fri Jul 23 00:40:52 2010
@@ -105,15 +105,29 @@
                     </execution>
                 </executions>
             </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>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <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.codehaus.mojo</groupId>
                         <artifactId>selenium-maven-plugin</artifactId>
@@ -145,7 +159,9 @@
                             </execution>
                         </executions>
                     </plugin>
-        </plugins>
-    </build>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
     
 </project>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml Fri Jul 23 00:40:52 2010
@@ -43,21 +43,29 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-            
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-failsafe-plugin</artifactId>
-                            <configuration>
-                                <systemProperties>
-                                    <property>
-                                        <name>webAppName</name>
-                                        <value>${project.artifactId}-${project.version}</value>
-                                    </property>
-                                </systemProperties>
-                            </configuration>
-                        </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemProperties>
+                                <property>
+                                    <name>webAppName</name>
+                                    <value>${project.artifactId}-${project.version}</value>
+                                </property>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
 
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -87,6 +95,8 @@
                     </plugin>
                 </plugins>
             </build>
+        </profile>
+    </profiles>
 
 </project>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml?rev=966916&r1=966915&r2=966916&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml Fri Jul 23 00:40:52 2010
@@ -50,20 +50,29 @@
         </dependency>
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-failsafe-plugin</artifactId>
-                            <configuration>
-                                <systemProperties>
-                                    <property>
-                                        <name>webAppName</name>
-                                        <value>${project.artifactId}-${project.version}</value>
-                                    </property>
-                                </systemProperties>
-                            </configuration>
-                        </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemProperties>
+                                <property>
+                                    <name>webAppName</name>
+                                    <value>${project.artifactId}-${project.version}</value>
+                                </property>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -92,6 +101,8 @@
                     </plugin>
                 </plugins>
             </build>
+        </profile>
+    </profiles>
 
 </project>
 



Mime
View raw message