geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r944157 [4/9] - in /geronimo/server/branches/2.2: ./ testsuite/ testsuite/commands-testsuite/ testsuite/commands-testsuite/deploy/ testsuite/commands-testsuite/gshell/ testsuite/commands-testsuite/jaxws/ testsuite/commands-testsuite/shutdow...
Date Fri, 14 May 2010 08:53:57 GMT
Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml Fri May 14 08:53:54 2010
@@ -1,83 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>sec-tests</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>sec-ejb</artifactId>
-    <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - JAR</name>
-    <packaging>ejb</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
-                
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ejb-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-    
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+
+	<!--
+		$Rev$ $Date$
+	-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>sec-tests</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>sec-ejb</artifactId>
+	<name>Geronimo TestSuite :: Enterprise Testsuite :: Security - JAR</name>
+	<packaging>ejb</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jpa_1.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jta_1.1_spec</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-ejb_3.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openejb</groupId>
+			<artifactId>ejb31-api-experimental</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-annotation_1.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.framework</groupId>
+			<artifactId>geronimo-security</artifactId>
+			<version>${version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-ejb-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/pom.xml Fri May 14 08:53:54 2010
@@ -39,41 +39,40 @@
         Geronimo integration testsuite.
     </description>
 
-    <!--
-    NOTE: Override the following on the cmdline to only run specific 
+	<!--
+    NOTE: Override the following on the cmdline to only run specific
           testsuite buckets.
 
-          To run all tests against the default Jetty assembly -
-            mvn clean install -Pit,all-subprojects
+        *** To run all tests:
+          Against the default Jetty assembly -
+            mvn clean install -Pit
+
+          Against the pre-installed assembly -
+            mvn clean install -Pit -DgeronimoHome=<Path to Geronimo Home>
+          
+          Against an already running server -
+            mvn clean install -Pit-manual
 
-          To only run console-testsuite/advanced -
-            cd console-testsuite/advanced
-            mvn clean install -Pit,all-subprojects
+        *** To run one of testsuites:         
+          Against the default Jetty assembly -
+            cd console-testsuite
+            mvn clean install -Pit
+
+          Against the pre-installed assembly -
+            cd console-testsuite
+            mvn clean install -Pit -DgeronimoHome=<Path to Geronimo Home>
 
-          To run console-testsuite/advanced against an already running server-
-            cd console-testsuite/advanced
+          Against an already running server -
+            cd console-testsuite
             mvn clean install -Pit-manual
-              or
-            mvn integration-test -Pit-manual
-    -->
 
-    <properties>
-        <!--
-        NOTE: The default assembly is jetty, so exclude any tomcat tests by
-              default. Profiles below will set this based on the assemblyId.
-        -->
-        <shittyTestExcludes>**/*tomcat*/pom.xml</shittyTestExcludes>
-
-        <!--
-        NOTE: Override the following on the cmdline to only run specific 
-              testsuite buckets.  To only run console-testsuite/advanced -
-                mvn -DshittyTestIncludes=console-testsuite/advanced/pom.xml
-              or
-                mvn install -Dtests=console-testsuite/advanced -Pit,all-subprojects
-        -->
-        <shittyTestIncludes>*/*/pom.xml</shittyTestIncludes>
-    </properties>
+        *** To only run one test backet:
+          Against an already running server-
+            cd console-testsuite/advanced
+            mvn clean install -Pchild
 
+    -->
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
@@ -89,20 +88,38 @@
         </dependency>
     </dependencies>
 
+    <modules>
+         <module>commands-testsuite</module>         
+         <module>concurrent-testsuite</module>
+         <module>console-testsuite</module>
+         <module>corba-testsuite</module>
+         <module>deployment-testsuite</module>
+         <module>enterprise-testsuite</module>
+         <module>security-testsuite</module>
+         <module>web-testsuite</module>
+         <module>webservices-testsuite</module>
+    </modules>
+
     <build>
-        <!--
-        <extensions>
-            <extension>
-                <groupId>org.apache.geronimo.testsupport</groupId>
-                <artifactId>testsupport-packaging</artifactId>
-                <version>${version}</version>
-            </extension>
-        </extensions>
-        -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/filtered-resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
 
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
+                    <artifactId>testsuite-maven-plugin</artifactId>
+                    <version>${version}</version>
+                </plugin>
+                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
                     <configuration>
@@ -114,10 +131,10 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
                     <configuration>
-                        <webXml>${project.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                        <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
                         <webResources>
                             <resource>
-                                <directory>${project.basedir}/src/main/webapp</directory>
+                                <directory>${pom.basedir}/src/main/webapp</directory>
                                 <filtering>true</filtering>
                             </resource>
                             <resource>
@@ -127,30 +144,177 @@
                     </configuration>
                 </plugin>
 
-                <!-- turn off tests unless 'it' profile active-->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.5</version>                    
                     <configuration>
+                        <!-- Disable surefire plugin and make it not run in the testsuites -->
                         <skip>true</skip>
                     </configuration>
+                    <!-- By default, use failsafe plugin -->
+                    <!--<executions>
+                        <execution>
+                            <id>test</id>
+                            <phase>test</phase>
+                            <goals>
+                                <goal>test</goal>
+                            </goals>
+                            <configuration>
+                                <skip>true</skip>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>integration</id>
+                            <phase>integration-test</phase>
+                            <goals>
+                                <goal>test</goal>
+                            </goals>
+                            <configuration>
+                                <testFailureIgnore>true</testFailureIgnore>
+                                <skip>false</skip>
+                            </configuration>
+                        </execution>
+                    </executions>-->
                 </plugin>
-
+                
+                <!-- m-m-p is used to launch all of tests in one testsuite, while just start/stop server only one time, it saves time -->
                 <plugin>
-                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                    <artifactId>geronimo-maven-plugin</artifactId>
+                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                    <artifactId>maven-maven-plugin</artifactId>
+                    <version>1.5</version>
                     <configuration>
-                        <reporters>
-                            <reporter implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
-                                <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
-                            </reporter>
-                        </reporters>
+                        <fileset>
+                            <basedir>${pom.basedir}</basedir>
+                            <includes>
+                                <include>*/pom.xml</include>
+                            </includes>
+                        </fileset>
+                        <profiles>
+                            <profile>child</profile>
+                        </profiles>
                     </configuration>
-                </plugin>
+                    <executions>
+                        <execution>
+                            <phase>integration-test</phase>
+                            <goals>
+                                <goal>invoke</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>site-deploy</id>
+                            <phase>site-deploy</phase>
+                            <goals>
+                                <goal>invoke</goal>
+                            </goals>
+                            <configuration>
+                                <goals>
+                                    <goal>site-deploy</goal>
+                                </goals>
+                                <parameters>
+                                    <buildNumber>${buildNumber}</buildNumber>
+                                </parameters>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>clean</id>
+                            <phase>clean</phase>
+                            <goals>
+                                <goal>invoke</goal>
+                            </goals>
+                            <configuration>
+                                <goals>
+                                    <goal>clean</goal>
+                                </goals>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>    
+                        
+                <plugin>
+                     <groupId>org.apache.geronimo.buildsupport</groupId>
+                     <artifactId>geronimo-maven-plugin</artifactId>
+                     <configuration>
+                            <!-- this reporter is used to generate server start/stop information when using surefire plugin -->
+                            <reporters>
+                                <reporter implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
+                                    <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+                                </reporter>
+                            </reporters>
+                     </configuration>
+               </plugin>
+
+               <plugin>
+                     <groupId>org.codehaus.mojo</groupId>
+                     <artifactId>selenium-maven-plugin</artifactId>
+                     <executions>
+                          <execution>
+                               <id>start</id>
+                               <phase>pre-integration-test</phase>
+                               <goals>
+                                   <goal>start-server</goal>
+                               </goals>
+                               <configuration>
+                                    <logOutput>true</logOutput>
+                                    <background>true</background>                                        
+                               </configuration>
+                          </execution>
+                          <execution>
+                               <id>stop</id>
+                               <phase>post-integration-test</phase>
+                               <goals>
+                                   <goal>stop-server</goal>
+                               </goals>                               
+                          </execution>
+                    </executions>
+              </plugin>
+
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-failsafe-plugin</artifactId>
+                            <version>2.5</version>
+                            <configuration>
+                                <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                                <forkMode>once</forkMode>
+                                <argLine>-enableassertions</argLine>
+                                <failIfNoTests>false</failIfNoTests>
+                                <testFailureIgnore>true</testFailureIgnore>
+                                <workingDirectory>${project.build.directory}</workingDirectory>
+                                <includes>
+                                    <include>**/Test*.java</include>
+                                    <include>**/*Test.java</include>
+                                </includes>
+                                <suiteXmlFiles>
+                                    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                                </suiteXmlFiles>
+                                <systemPropertyVariables>
+                                    <property>
+                                        <name>geronimoVersion</name>
+                                        <value>${project.version}</value>
+                                    </property>
+                                </systemPropertyVariables>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <id>integration-test</id>
+                                    <goals>
+                                        <goal>integration-test</goal>
+                                    </goals>
+                                </execution>
+                                <execution>
+                                    <id>verify</id>
+                                    <phase>verify</phase>
+                                    <goals>
+                                        <goal>verify</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
             </plugins>
         </pluginManagement>
 
         <plugins>
+            
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>ianal-maven-plugin</artifactId>
@@ -164,6 +328,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
+                    <!-- We never release testsuite artifacts -->
                     <skip>true</skip>
                 </configuration>
             </plugin>
@@ -177,124 +342,27 @@
         </site>
     </distributionManagement>
 
-    <!--<pluginRepositories>-->
-    <!--<pluginRepository>-->
-    <!--<id>codehaus</id>-->
-    <!--<name>Codehaus Release Repository</name>-->
-    <!--<url>http://repository.codehaus.org</url>-->
-    <!--<layout>default</layout>-->
-    <!--<snapshots>-->
-    <!--<enabled>false</enabled>-->
-    <!--</snapshots>-->
-    <!--<releases>-->
-    <!--<enabled>true</enabled>-->
-    <!--</releases>-->
-    <!--</pluginRepository>-->
-    <!--</pluginRepositories>-->
+    <reporting>
+        <plugins>
+            <!-- Use t-m-p to generate human readable report -->
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+            </plugin>
+            
+        </plugins>
+    </reporting>
 
     <profiles>
         <profile>
             <id>it</id>
+            
             <build>
                 <pluginManagement>
                     <plugins>
                         <plugin>
-                            <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>shitty-maven-plugin</artifactId>
-                            <inherited>false</inherited>
-                            <configuration>
-                                <projects>
-                                    <fileset>
-                                        <directory>${project.basedir}</directory>
-                                        <includes>
-                                            <include>${shittyTestIncludes}</include>
-                                        </includes>
-                                        <excludes>
-                                            <exclude>${shittyTestExcludes}</exclude>
-                                        </excludes>
-                                    </fileset>
-                                </projects>
-                            </configuration>
-                            <executions>
-                                <execution>
-                                    <goals>
-                                        <goal>clean</goal>
-                                        <goal>install</goal>
-                                        <goal>test</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                        </plugin>
-                        <plugin>
-                            <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>selenium-maven-plugin</artifactId>
-                            <inherited>false</inherited>
-                            <executions>
-                                <execution>
-                                    <id>start</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</id>
-                                    <phase>post-integration-test</phase>
-                                    <goals>
-                                        <goal>stop-server</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                        </plugin>
-
-                        <!--
-                        NOTE: This horrible looking configuration sets up the surefire plugin to
-                              not run tests durring the 'test' phase, but instead during the
-                              'integration-test' phase.
-                        -->
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <skip>true</skip>
-                            </configuration>
-                            <executions>
-                                <execution>
-                                    <id>test</id>
-                                    <phase>test</phase>
-                                    <goals>
-                                        <goal>test</goal>
-                                    </goals>
-                                    <configuration>
-                                        <skip>true</skip>
-                                    </configuration>
-                                </execution>
-                                <execution>
-                                    <id>integration</id>
-                                    <phase>integration-test</phase>
-                                    <goals>
-                                        <goal>test</goal>
-                                    </goals>
-                                    <configuration>
-                                        <skip>false</skip>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-                        <plugin>
                             <groupId>org.apache.geronimo.buildsupport</groupId>
                             <artifactId>geronimo-maven-plugin</artifactId>
-                            <inherited>false</inherited>
                             <executions>
                                 <execution>
                                     <id>start</id>
@@ -326,142 +394,30 @@
                                 </execution>
                             </executions>
                         </plugin>
-
                     </plugins>
                 </pluginManagement>
-            </build>
-        </profile>
 
-        <!-- run the testsuite against an already running external server -->
-        <profile>
-            <id>it-manual</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>shitty-maven-plugin</artifactId>
-                            <inherited>false</inherited>
-                            <configuration>
-                                <projects>
-                                    <fileset>
-                                        <directory>${project.basedir}</directory>
-                                        <includes>
-                                            <include>${shittyTestIncludes}</include>
-                                        </includes>
-                                        <excludes>
-                                            <exclude>${shittyTestExcludes}</exclude>
-                                        </excludes>
-                                    </fileset>
-                                </projects>
-                            </configuration>
-                            <executions>
-                                <execution>
-                                    <goals>
-                                        <goal>clean</goal>
-                                        <goal>install</goal>
-                                        <goal>test</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                        </plugin>
-                        <plugin>
-                            <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>selenium-maven-plugin</artifactId>
-                            <inherited>false</inherited>
-                            <executions>
-                                <execution>
-                                    <id>start</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</id>
-                                    <phase>post-integration-test</phase>
-                                    <goals>
-                                        <goal>stop-server</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                        </plugin>
-                        <!--
-                        NOTE: This horrible looking configuration sets up the surefire plugin to
-                              not run tests durring the 'test' phase, but instead during the
-                              'integration-test' phase.
-                        -->
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <skip>true</skip>
-                            </configuration>
-                            <executions>
-                                <execution>
-                                    <id>test</id>
-                                    <phase>test</phase>
-                                    <goals>
-                                        <goal>test</goal>
-                                    </goals>
-                                    <configuration>
-                                        <skip>true</skip>
-                                    </configuration>
-                                </execution>
-                                <execution>
-                                    <id>integration</id>
-                                    <phase>integration-test</phase>
-                                    <goals>
-                                        <goal>test</goal>
-                                    </goals>
-                                    <configuration>
-                                        <skip>false</skip>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>testsuite-maven-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>summarize</id>
+                                <phase>post-site</phase>
+                                <goals>
+                                    <goal>summarize</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
             </build>
-        </profile>
-
-        <profile>
-            <id>testsuite-with-jetty</id>
-            <activation>
-                <property>
-                    <name>assemblyId</name>
-                    <value>jetty</value>
-                </property>
-            </activation>
-            <properties>
-                <shittyTestExcludes>**/*tomcat*/pom.xml</shittyTestExcludes>
-            </properties>
-        </profile>
+        </profile>        
 
         <profile>
-            <id>testsuite-with-tomcat</id>
-            <activation>
-                <property>
-                    <name>assemblyId</name>
-                    <value>tomcat</value>
-                </property>
-            </activation>
-            <properties>
-                <shittyTestExcludes>**/*jetty*/pom.xml</shittyTestExcludes>
-            </properties>
+            <id>it-manual</id>            
         </profile>
 
         <profile>
@@ -472,7 +428,6 @@
                         <plugin>
                             <groupId>org.codehaus.mojo</groupId>
                             <artifactId>selenium-maven-plugin</artifactId>
-                            <inherited>false</inherited>
                             <executions>
                                 <execution>
                                     <id>xvfb</id>
@@ -509,22 +464,11 @@
                 <browser>${browserPath}</browser>
             </properties>
         </profile>
-
+        
         <profile>
-            <id>all-subprojects</id>
-            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
-            <modules>
-                <module>commands-testsuite</module>
-                <module>concurrent-testsuite</module>
-                <module>console-testsuite</module>
-                <module>corba-testsuite</module>
-                <module>deployment-testsuite</module>
-                <module>enterprise-testsuite</module>
-                <module>security-testsuite</module>
-                <module>web-testsuite</module>
-                <module>webservices-testsuite</module>
-            </modules>
+            <id>all-subprojects</id>            
         </profile>
+        
     </profiles>
 
 </project>

Modified: geronimo/server/branches/2.2/testsuite/security-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/security-testsuite/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/security-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/security-testsuite/pom.xml Fri May 14 08:53:54 2010
@@ -39,23 +39,109 @@
     </description>
 
     <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>
+                <!-- This plugin is needed for all suite poms. -->
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
-
+    
     <profiles>
         <profile>
+            <id>it</id>
+            
+            <!--
+            TODO: Hook up m-m-p to allow child modules to be built early during this modules
+                  compile (or something) phase.
+            -->
+            <build>
+                <plugins>
+                  <plugin>
+                        <!--
+                          One of the pom that this invokes using m-m-p has packaging set to "pom".
+                          That expects it's parent (this pom) to be installed already.
+                          So installing it ahead before we invoke it in the integration-test phase
+                        -->
+                        <artifactId>maven-install-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>install-ahead</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>install</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                    </plugin>
+                    
+                     
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>maven-maven-plugin</artifactId>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>it-manual</id>
+            
+            <!--
+            TODO: Hook up m-m-p to allow child modules to be built early during this modules
+                  compile (or something) phase.
+            -->
+            <build>
+                <plugins>
+                  <plugin>
+                        <!--
+                          One of the pom that this invokes using m-m-p has packaging set to "pom".
+                          That expects it's parent (this pom) to be installed already.
+                          So installing it ahead before we invoke it in the integration-test phase
+                        -->
+                        <artifactId>maven-install-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>install-ahead</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>install</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>                    
+                     
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>maven-maven-plugin</artifactId>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+        
+        <profile>
+            <id>child</id>
+        </profile>
+        
+        <profile>
             <id>all-subprojects</id>
             <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
             <modules>

Modified: geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml Fri May 14 08:53:54 2010
@@ -1,112 +1,115 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>security-testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>test-security</artifactId>
-    <name>Geronimo TestSuite :: Web Testsuite :: Test Security</name>
-    <packaging>war</packaging>
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+
+	<!--
+		$Rev$ $Date$
+	-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>security-testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>test-security</artifactId>
+	<name>Geronimo TestSuite :: Web Testsuite :: Test Security</name>
+	<packaging>war</packaging>
 
-    <description>
+	<description>
         Tests for the test-deployables.
     </description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb</artifactId>
-            <version>${version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy</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</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>
-
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jsp_2.1_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-ejb_3.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openejb</groupId>
+			<artifactId>ejb31-api-experimental</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.modules</groupId>
+			<artifactId>geronimo-openejb</artifactId>
+			<version>${version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.framework</groupId>
+			<artifactId>geronimo-security</artifactId>
+			<version>${version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.geronimo.buildsupport</groupId>
+						<artifactId>geronimo-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>deploy</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</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/branches/2.2/testsuite/web-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/pom.xml Fri May 14 08:53:54 2010
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>web-testsuite</artifactId>
-    <name>Geronimo TestSuite :: Web-tier Testsuite</name>
-    <packaging>pom</packaging>
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
 
-    <description>
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+
+	<!--
+		$Rev$ $Date$
+	-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>web-testsuite</artifactId>
+	<name>Geronimo TestSuite :: Web-tier Testsuite</name>
+	<packaging>pom</packaging>
+
+	<description>
         Geronimo web tier testsuite.
         Use this testsuite to test the webcontainer.
          - Servlet 2.5
@@ -44,20 +44,216 @@
          - JSTL
     </description>
 
-    <profiles>
-        <profile>
-            <id>all-subprojects</id>
-            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
-            <modules>
-                <module>test-2.1-jsps</module>
-                <module>test-2.5-servlets</module>
-                <module>test-jetty</module>
-                <module>test-myfaces</module>
-                <module>test-tomcat</module>
-                <module>test-web-forward</module>
-                <module>test-web-references</module>
-            </modules>
-        </profile>
-    </profiles>
+	<properties>
+		<excludeTest>test-tomcat</excludeTest>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<!-- This plugin is needed for all suite poms. -->
+				<groupId>org.apache.geronimo.buildsupport</groupId>
+				<artifactId>testsuite-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-surefire-xml</id>
+						<phase>install</phase>
+						<goals>
+							<goal>generate-surefire-xml</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<skip>true</skip>
+						<testFailureIgnore>true</testFailureIgnore>
+						<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+						<reportFormat>plain</reportFormat>
+						<useFile>true</useFile>
+						<redirectTestOutputToFile>true</redirectTestOutputToFile>
+						<forkMode>once</forkMode>
+						<workingDirectory>${project.build.directory}</workingDirectory>
+						<suiteXmlFiles>
+                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+					</configuration>
+					<executions>
+						<execution>
+							<id>test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>test</goal>
+							</goals>
+							<configuration>
+								<skip>true</skip>
+							</configuration>
+						</execution>
+						<execution>
+							<id>integration</id>
+							<phase>integration-test</phase>
+							<goals>
+								<goal>test</goal>
+							</goals>
+							<configuration>
+								<testFailureIgnore>true</testFailureIgnore>
+								<skip>false</skip>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-report-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<aggregate>true</aggregate>
+						<outputDirectory>${project.build.outputDirectory}/surefire-reports</outputDirectory>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>it</id>
+			<!--
+				TODO: Hook up m-m-p to allow child modules to be built early during
+				this modules compile (or something) phase.
+			-->
+			<build>
+				<plugins>
+					<plugin>
+						<!--
+							One of the pom that this invokes using m-m-p has packaging set to
+							"pom". That expects it's parent (this pom) to be installed
+							already. So installing it ahead before we invoke it in the
+							integration-test phase
+						-->
+						<artifactId>maven-install-plugin</artifactId>
+						<inherited>false</inherited>
+						<executions>
+							<execution>
+								<id>install-ahead</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>install</goal>
+								</goals>
+							</execution>
+						</executions>
+					</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>
+
+
+					<plugin>
+						<groupId>org.apache.geronimo.genesis.plugins</groupId>
+						<artifactId>maven-maven-plugin</artifactId>
+						<!--
+							Skip tomcat (or jetty) tests for now till we figure out how to
+							switch it dynamically
+						-->
+						<configuration>
+							<fileset>
+								<excludes>
+									<exclude>${excludeTest}/pom.xml</exclude>
+								</excludes>
+							</fileset>
+						</configuration>
+					</plugin>
+
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>it-manual</id>
+			<!--
+				TODO: Hook up m-m-p to allow child modules to be built early during
+				this modules compile (or something) phase.
+			-->
+			<build>
+				<plugins>
+					<plugin>
+						<!--
+							One of the pom that this invokes using m-m-p has packaging set to
+							"pom". That expects it's parent (this pom) to be installed
+							already. So installing it ahead before we invoke it in the
+							integration-test phase
+						-->
+						<artifactId>maven-install-plugin</artifactId>
+						<inherited>false</inherited>
+						<executions>
+							<execution>
+								<id>install-ahead</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>install</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>selenium-maven-plugin</artifactId>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.geronimo.genesis.plugins</groupId>
+						<artifactId>maven-maven-plugin</artifactId>
+						<!--
+							Skip tomcat (or jetty) tests for now till we figure out how to
+							switch it dynamically
+						-->
+						<configuration>
+							<fileset>
+								<excludes>
+									<exclude>${excludeTest}/pom.xml</exclude>
+								</excludes>
+							</fileset>
+						</configuration>
+					</plugin>
+
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>child</id>
+		</profile>
+
+		<profile>
+			<id>all-subprojects</id>
+			<!--
+				use for things like versions:set and perhaps release when build has
+				to run on all projects
+			-->
+			<modules>
+				<module>test-2.1-jsps</module>
+				<module>test-2.5-servlets</module>
+				<module>test-jetty</module>
+				<module>test-myfaces</module>
+				<module>test-tomcat</module>
+				<module>test-web-forward</module>
+				<module>test-web-references</module>
+			</modules>
+		</profile>
+	</profiles>
 
 </project>

Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml Fri May 14 08:53:54 2010
@@ -1,97 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>web-testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>test-2.1-jsps</artifactId>
-    <name>Geronimo TestSuite :: Web Testsuite :: Test JSPs</name>
-    <packaging>war</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <scope>provided</scope>
-        </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>
-
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+
+	<!--
+		$Rev$ $Date$
+	-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>web-testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>test-2.1-jsps</artifactId>
+	<name>Geronimo TestSuite :: Web Testsuite :: Test JSPs</name>
+	<packaging>war</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jsp_2.1_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</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}/car</moduleId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml Fri May 14 08:53:54 2010
@@ -1,91 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>web-testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>test-2.5-servlets</artifactId>
-    <name>Geronimo TestSuite :: Web Testsuite :: Test Servlets</name>
-    <packaging>war</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-        </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>
-
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+
+	<!--
+		$Rev$ $Date$
+	-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>web-testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>test-2.5-servlets</artifactId>
+	<name>Geronimo TestSuite :: Web Testsuite :: Test Servlets</name>
+	<packaging>war</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-servlet_2.5_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</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}/car</moduleId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml Fri May 14 08:53:54 2010
@@ -1,91 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>web-testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-    
-    <artifactId>test-jetty</artifactId>
-    <name>Geronimo TestSuite :: Web Testsuite :: Test Jetty</name>
-    <packaging>war</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
-            <scope>provided</scope>
-        </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>
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
 
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+
+	<!--
+		$Rev$ $Date$
+	-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>web-testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>test-jetty</artifactId>
+	<name>Geronimo TestSuite :: Web Testsuite :: Test Jetty</name>
+	<packaging>war</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jsp_2.1_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</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}/car</moduleId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml Fri May 14 08:53:54 2010
@@ -1,103 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>web-testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>test-myfaces</artifactId>
-    <name>Geronimo TestSuite :: Web Testsuite :: Test MyFaces</name>
-    <packaging>war</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </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>
-
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+
+	<!--
+		$Rev$ $Date$
+	-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>web-testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>test-myfaces</artifactId>
+	<name>Geronimo TestSuite :: Web Testsuite :: Test MyFaces</name>
+	<packaging>war</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.myfaces.core</groupId>
+			<artifactId>myfaces-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-annotation_1.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</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}/car</moduleId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>



Mime
View raw message