geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Donald Woods <dwo...@apache.org>
Subject Re: svn commit: r653533 - Rationale for using shitty-maven-plugin in testsuite?
Date Wed, 07 May 2008 16:12:04 GMT
So, can you give some background on this "shitty-maven-plugin" and why 
we need to switch to a Codehaus version instead of the Apache 
maven-maven-plugin???

It's a little worrisome that we keep creating new plugins over in 
Codehaus for Geronimo builds to use, instead of fixing the normal Apache 
Maven plugins.  Are we doing this because no one in the Geronimo 
community is a committer on Apache Maven and its just easier to create 
hacked up copies of ant, maven plugins, ... over there instead of fixing 
the ASF maintained code?


Also, can we get this "shitty" plugin to observer the -Dtest=false 
option, which it currently ignores for 2.1.x and 2.2 when building the 
framework/configs/geronimo-gbean-deployer/src/it/ code....



-Donald


jdillon@apache.org wrote:
> Author: jdillon
> Date: Mon May  5 10:25:46 2008
> New Revision: 653533
> 
> URL: http://svn.apache.org/viewvc?rev=653533&view=rev
> Log:
> (GERONIMO-3980) Use shitty-maven-plugin instead of maven-maven-plugin to drive test builds
> 
> Added:
>     geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/goals.txt   (with props)
>     geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/goals.txt   (with props)
>     geronimo/server/trunk/testsuite/web-testsuite/test-jetty/goals.txt   (with props)
>     geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/goals.txt   (with props)
>     geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/goals.txt   (with props)
>     geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/goals.txt   (with props)
>     geronimo/server/trunk/testsuite/web-testsuite/test-web-references/goals.txt   (with props)
> Modified:
>     geronimo/server/trunk/testsuite/console-testsuite/pom.xml
>     geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
>     geronimo/server/trunk/testsuite/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-tomcat/pom.xml
>     geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/pom.xml
>     geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
>     geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
>     geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
>     geronimo/server/trunk/testsuite/web-testsuite/test-web-references/pom.xml
>     geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
>     geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
> 
> Modified: geronimo/server/trunk/testsuite/console-testsuite/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?rev=653533&r1=653532&r2=653533&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
> +++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Mon May  5 10:25:46 2008
> @@ -70,6 +70,35 @@
>                  <groupId>org.apache.geronimo.buildsupport</groupId>
>                  <artifactId>geronimo-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>
> +                            <verifyTimeout>300</verifyTimeout>
> +                            <optionSets>
> +                                <optionSet>
> +                                    <id>default</id>
> +                                    <options>
> +                                       <option>-XX:MaxPermSize=128m</option>
> +                                    </options>
> +                                </optionSet>
> +                            </optionSets>
> +                        </configuration>
> +                    </execution>
> +                    <execution>
> +                        <id>stop</id>
> +                        <phase>install</phase>
> +                        <goals>
> +                            <goal>stop-server</goal>
> +                        </goals>
> +                    </execution>
> +                </executions>
>              </plugin>
>              
>              <plugin>
> 
> Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml?rev=653533&r1=653532&r2=653533&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml (original)
> +++ geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml Mon May  5 10:25:46 2008
> @@ -46,7 +46,7 @@
>          - JavaMail
>      </description>
>  
> -        <build>
> +    <build>
>          <pluginManagement>
>              <plugins>
>                  <plugin>
> 
> Modified: geronimo/server/trunk/testsuite/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=653533&r1=653532&r2=653533&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/pom.xml (original)
> +++ geronimo/server/trunk/testsuite/pom.xml Mon May  5 10:25:46 2008
> @@ -23,45 +23,30 @@
>  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>  
>      <modelVersion>4.0.0</modelVersion>
> -    
> +
>      <parent>
>          <groupId>org.apache.geronimo</groupId>
>          <artifactId>geronimo</artifactId>
>          <version>2.2-SNAPSHOT</version>
>      </parent>
> -    
> +
>      <groupId>org.apache.geronimo.testsuite</groupId>
>      <artifactId>testsuite</artifactId>
>      <name>Geronimo TestSuite</name>
>      <packaging>pom</packaging>
> -    
> +
>      <description>
> -        Geronimo integration testsuite. This contains 2 profiles, default and child.
> -        The default profile is used by the top level suites directly under this. The child profile is used by the test poms under the suites.
> -        This pom defines the basic dependencies needed by most suites.
> -        The start-selenium, start-server, invoke, and stop-server goals are globally configured here in the pluginManagement sections.
> -        They just need to be bound in the suites where needed and appropriate.
> -        The test poms under the suites should have this pom as their parent and set their relativePath appropriately
> -        The test poms under the suites inherit an empty 'child' profile from here. But any other build executions within the test poms should all be inside a 'child' profile.
> +        Geronimo integration testsuite.
>      </description>
> -    
> -    <dependencyManagement>
> -        <dependencies>
> -            <dependency>
> -                <groupId>org.apache.geronimo.testsupport</groupId>
> -                <artifactId>testsupport-selenium</artifactId>
> -                <version>${version}</version>
> -            </dependency>
> -        </dependencies>
> -    </dependencyManagement>
>  
>      <dependencies>
>          <dependency>
>              <groupId>org.apache.geronimo.testsupport</groupId>
>              <artifactId>testsupport-selenium</artifactId>
> +            <version>${version}</version>
>              <scope>test</scope>
>          </dependency>
> -        
> +
>          <dependency>
>              <groupId>org.slf4j</groupId>
>              <artifactId>slf4j-simple</artifactId>
> @@ -74,15 +59,15 @@
>          <module>corba-testsuite</module>
>          <module>deployment-testsuite</module>
>          <module>enterprise-testsuite</module>
> +        <module>security-testsuite</module>
>          <module>web-testsuite</module>
>          <module>webservices-testsuite</module>
> -        <module>security-testsuite</module>
>      </modules>
>  
>      <build>
>          <resources>
>              <resource>
> -                <directory>src/main/resources</directory>
> +                <directory>${project.basedir}/src/main/resources</directory>
>                  <filtering>true</filtering>
>              </resource>
>          </resources>
> @@ -94,7 +79,7 @@
>                      <artifactId>testsuite-maven-plugin</artifactId>
>                      <version>${version}</version>
>                  </plugin>
> -                
> +
>                  <plugin>
>                      <groupId>org.apache.maven.plugins</groupId>
>                      <artifactId>maven-ear-plugin</artifactId>
> @@ -102,11 +87,7 @@
>                          <resourcesDir>${project.build.outputDirectory}</resourcesDir>
>                      </configuration>
>                  </plugin>
> -                
> -                <!--
> -                FIXME: Need to reset the default values here since our parent sets up wars
> -                       for use with jspc.  Remove once parent pom has been fixed.
> -                -->
> +
>                  <plugin>
>                      <groupId>org.apache.maven.plugins</groupId>
>                      <artifactId>maven-war-plugin</artifactId>
> @@ -123,7 +104,7 @@
>                          </webResources>
>                      </configuration>
>                  </plugin>
> -                
> +
>                  <plugin>
>                      <groupId>org.apache.maven.plugins</groupId>
>                      <artifactId>maven-surefire-plugin</artifactId>
> @@ -154,58 +135,7 @@
>                          </execution>
>                      </executions>
>                  </plugin>
> -                
> -                <plugin>
> -                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
> -                    <artifactId>maven-maven-plugin</artifactId>
> -                    <configuration>
> -                        <fileset>
> -                            <basedir>${pom.basedir}</basedir>
> -                            <includes>
> -                                <include>*/pom.xml</include>
> -                            </includes>
> -                        </fileset>
> -                        <profiles>
> -                            <profile>child</profile>
> -                        </profiles>
> -                    </configuration>
> -                    <executions>
> -                        <execution>
> -                            <phase>integration-test</phase>
> -                            <goals>
> -                                <goal>invoke</goal>
> -                            </goals>
> -                        </execution>
> -                        <execution>
> -                            <id>site-deploy</id>
> -                            <phase>site-deploy</phase>
> -                            <goals>
> -                                <goal>invoke</goal>
> -                            </goals>
> -                            <configuration>
> -                                <goals>
> -                                    <goal>site-deploy</goal>
> -                                </goals>
> -                                <parameters>
> -                                    <buildNumber>${buildNumber}</buildNumber>
> -                                </parameters>
> -                            </configuration>
> -                        </execution>
> -                        <execution>
> -                            <id>clean</id>
> -                            <phase>clean</phase>
> -                            <goals>
> -                                <goal>invoke</goal>
> -                            </goals>
> -                            <configuration>
> -                                <goals>
> -                                    <goal>clean</goal>
> -                                </goals>
> -                            </configuration>
> -                        </execution>
> -                    </executions>
> -                </plugin>
> -                
> +
>                  <plugin>
>                      <groupId>org.apache.geronimo.buildsupport</groupId>
>                      <artifactId>geronimo-maven-plugin</artifactId>
> @@ -217,7 +147,7 @@
>                          </reporters>
>                      </configuration>
>                  </plugin>
> -                
> +
>                  <plugin>
>                      <groupId>org.codehaus.mojo</groupId>
>                      <artifactId>selenium-maven-plugin</artifactId>
> @@ -244,6 +174,23 @@
>                  </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>
>  
>      <distributionManagement>
> @@ -252,7 +199,7 @@
>              <url>scp://people.apache.org/www/people.apache.org/builds/geronimo/server/testsuite/${buildNumber}</url>
>          </site>
>      </distributionManagement>
> -    
> +
>      <reporting>
>          <plugins>
>              <plugin>
> @@ -262,71 +209,8 @@
>              </plugin>
>          </plugins>
>      </reporting>
> -    
> -    <profiles>
> -        <profile>
> -            <id>default</id>
> -            <activation>
> -                <activeByDefault>true</activeByDefault>
> -            </activation>
> -            <build>
> -                <pluginManagement>
> -                    <plugins>
> -                        <plugin>
> -                            <groupId>org.apache.geronimo.buildsupport</groupId>
> -                            <artifactId>geronimo-maven-plugin</artifactId>
> -                            <executions>
> -                                <execution>
> -                                    <id>start</id>
> -                                    <phase>pre-integration-test</phase>
> -                                    <goals>
> -                                        <goal>start-server</goal>
> -                                    </goals>
> -                                    <configuration>
> -                                        <logOutput>true</logOutput>
> -                                        <background>true</background>
> -                                        <verifyTimeout>300</verifyTimeout>
> -                                        <optionSets>
> -                                            <optionSet>
> -                                                <id>default</id>
> -                                                <options>
> -                                                   <option>-XX:MaxPermSize=128m</option>
> -                                                </options>
> -                                            </optionSet>
> -                                        </optionSets>
> -                                    </configuration>
> -                                </execution>
> -                                <execution>
> -                                    <id>stop</id>
> -                                    <phase>install</phase>
> -                                    <goals>
> -                                        <goal>stop-server</goal>
> -                                    </goals>
> -                                </execution>
> -                            </executions>
> -                        </plugin>
> -                    </plugins>
> -                </pluginManagement>
> -
> -                <plugins>
> -                    <plugin>
> -                        <groupId>org.apache.geronimo.buildsupport</groupId>
> -                        <artifactId>testsuite-maven-plugin</artifactId>
> -                        <inherited>false</inherited>
> -                        <executions>
> -                            <execution>
> -                                <id>summarize</id>
> -                                <phase>post-site</phase>
> -                                <goals>
> -                                    <goal>summarize</goal>
> -                                </goals>
> -                            </execution>
> -                        </executions>
> -                    </plugin>
> -                </plugins>
> -            </build>
> -        </profile>
>  
> +    <profiles>
>          <profile>
>              <id>headless</id>
>              <build>
> @@ -349,38 +233,6 @@
>                  </pluginManagement>
>              </build>
>          </profile>
> -        
> -        <profile>
> -            <id>common</id>
> -            <build>
> -                <pluginManagement>
> -                    <plugins>
> -                        <plugin>
> -                            <groupId>org.apache.geronimo.buildsupport</groupId>
> -                            <artifactId>geronimo-maven-plugin</artifactId>
> -                            <executions>
> -                                <execution>
> -                                    <id>start</id>
> -                                    <phase>pre-integration-test</phase>
> -                                    <goals>
> -                                        <goal>start-server</goal>
> -                                    </goals>
> -                                    <configuration>
> -                                        <logOutput>true</logOutput>
> -                                        <background>true</background>
> -                                        <installDirectory>${basedir}/../server</installDirectory>
> -                                    </configuration>
> -                                </execution>
> -                            </executions>
> -                        </plugin>
> -                    </plugins>
> -                </pluginManagement>
> -            </build>
> -        </profile>
> -        
> -        <profile>
> -            <id>child</id>
> -        </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=653533&r1=653532&r2=653533&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/pom.xml (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/pom.xml Mon May  5 10:25:46 2008
> @@ -21,19 +21,19 @@
>  <!-- $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-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.
> @@ -45,18 +45,110 @@
>      </description>
>  
>      <properties>
> -      <excludeTest>test-tomcat</excludeTest>
> +        <excludeTest>test-tomcat</excludeTest>
>      </properties>
>  
>      <build>
> +        <pluginManagement>
> +            <plugins>
> +                <plugin>
> +                    <groupId>org.apache.maven.plugins</groupId>
> +                    <artifactId>maven-surefire-plugin</artifactId>
> +                    <configuration>
> +                        <suiteXmlFiles>
> +                            <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
> +                        </suiteXmlFiles>
> +                        <systemProperties>
> +                            <property>
> +                                <name>geronimoVersion</name>
> +                                <value>${version}</value>
> +                            </property>
> +                        </systemProperties>
> +                    </configuration>
> +                </plugin>
> +            </plugins>
> +        </pluginManagement>
> +        
>          <plugins>
>              <plugin>
> -                <!-- This plugin is needed for all suite poms. -->
> +                <groupId>org.codehaus.mojo</groupId>
> +                <artifactId>selenium-maven-plugin</artifactId>
> +                <inherited>false</inherited>
> +            </plugin>
> +            
> +            <plugin>
> +                <groupId>org.apache.geronimo.buildsupport</groupId>
> +                <artifactId>geronimo-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>
> +                            <verifyTimeout>300</verifyTimeout>
> +                            <optionSets>
> +                                <optionSet>
> +                                    <id>default</id>
> +                                    <options>
> +                                       <option>-XX:MaxPermSize=128m</option>
> +                                    </options>
> +                                </optionSet>
> +                            </optionSets>
> +                        </configuration>
> +                    </execution>
> +                    <execution>
> +                        <id>stop</id>
> +                        <phase>install</phase>
> +                        <goals>
> +                            <goal>stop-server</goal>
> +                        </goals>
> +                    </execution>
> +                </executions>
> +            </plugin>
> +            
> +            <plugin>
> +                <groupId>org.codehaus.mojo</groupId>
> +                <artifactId>shitty-maven-plugin</artifactId>
> +                <inherited>false</inherited>
> +                <configuration>
> +                    <projects>
> +                        <fileset>
> +                            <directory>${project.basedir}</directory>
> +                            <includes>
> +                                <include>*/pom.xml</include>
> +                            </includes>
> +                            
> +                            <!--
> +                            HACK: Skip tomcat (or jetty) tests for now till we figure out how to switch it dynamically
> +                            -->
> +                            <excludes>
> +                                <exclude>${excludeTest}/pom.xml</exclude>
> +                            </excludes>
> +                        </fileset>
> +                    </projects>
> +                </configuration>
> +                <executions>
> +                    <execution>
> +                        <goals>
> +                            <goal>clean</goal>
> +                            <goal>install</goal>
> +                            <goal>test</goal>
> +                        </goals>
> +                    </execution>
> +                </executions>
> +            </plugin>
> +            
> +            <plugin>
>                  <groupId>org.apache.geronimo.buildsupport</groupId>
>                  <artifactId>testsuite-maven-plugin</artifactId>
> +                <inherited>false</inherited>
>                  <executions>
>                      <execution>
> -                        <id>generate-surefire-xml</id>
>                          <phase>install</phase>
>                          <goals>
>                              <goal>generate-surefire-xml</goal>
> @@ -66,68 +158,5 @@
>              </plugin>
>          </plugins>
>      </build>
> -    
> -    <profiles>
> -        <profile>
> -            <id>default</id>
> -            <activation>
> -                <activeByDefault>true</activeByDefault>
> -            </activation>
> -            <!--
> -            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
> -                        -->
> -                        <groupId>org.apache.maven.plugins</groupId>
> -                        <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>child</id>
> -        </profile>
> -    </profiles>
> -    
> +
>  </project>
> 
> Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/goals.txt
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/goals.txt?rev=653533&view=auto
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/goals.txt (added)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/goals.txt Mon May  5 10:25:46 2008
> @@ -0,0 +1 @@
> +clean install
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/goals.txt
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/goals.txt
> ------------------------------------------------------------------------------
>     svn:keywords = Date Author Id Revision HeadURL
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/goals.txt
> ------------------------------------------------------------------------------
>     svn:mime-type = text/plain
> 
> 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=653533&r1=653532&r2=653533&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 Mon May  5 10:25:46 2008
> @@ -34,13 +34,6 @@
>      <name>Geronimo TestSuite :: Web Testsuite :: Test JSPs</name>
>      <packaging>war</packaging>
>  
> -
> -    <description>
> -        Tests for the test-deployables.
> -        maven-maven-plugin:invoke executes the 'child' profile.
> -        Since build executions are done here, a 'child' profile is explicitly defined here to prevent inheriting other configurations and executions from parent.
> -    </description>
> -
>      <dependencies>
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
> @@ -55,51 +48,36 @@
>          </dependency>
>      </dependencies>
>  
> -    <profiles>
> -        <profile>
> -            <id>child</id>
> -            <build>
> -                <plugins>
> -                    <plugin>
> -                        <groupId>org.apache.maven.plugins</groupId>
> -                        <artifactId>maven-surefire-plugin</artifactId>
> +    <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>
> -                            <suiteXmlFiles>
> -                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
> -                            </suiteXmlFiles>
> +                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
>                          </configuration>
> -                    </plugin>
> -
> -                    <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>
>  
> -                            <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>
> +                    <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>
>  
>  </project>
> 
> Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/goals.txt
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/goals.txt?rev=653533&view=auto
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/goals.txt (added)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/goals.txt Mon May  5 10:25:46 2008
> @@ -0,0 +1 @@
> +clean install
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/goals.txt
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/goals.txt
> ------------------------------------------------------------------------------
>     svn:keywords = Date Author Id Revision HeadURL
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/goals.txt
> ------------------------------------------------------------------------------
>     svn:mime-type = text/plain
> 
> 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=653533&r1=653532&r2=653533&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 Mon May  5 10:25:46 2008
> @@ -34,13 +34,6 @@
>      <name>Geronimo TestSuite :: Web Testsuite :: Test Servlets</name>
>      <packaging>war</packaging>
>  
> -
> -    <description>
> -        Tests for the test-deployables.
> -        maven-maven-plugin:invoke executes the 'child' profile.
> -        Since build executions are done here, a 'child' profile is explicitly defined here to prevent inheriting other configurations and executions from parent.
> -    </description>
> -
>      <dependencies>
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
> @@ -49,51 +42,36 @@
>          </dependency>
>      </dependencies>
>  
> -    <profiles>
> -        <profile>
> -            <id>child</id>
> -            <build>
> -                <plugins>
> -                    <plugin>
> -                        <groupId>org.apache.maven.plugins</groupId>
> -                        <artifactId>maven-surefire-plugin</artifactId>
> +    <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>
> -                            <suiteXmlFiles>
> -                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
> -                            </suiteXmlFiles>
> +                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
>                          </configuration>
> -                    </plugin>
> -
> -                    <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>
>  
> -                            <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>
> +                    <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>
>  
>  </project>
> 
> Added: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/goals.txt
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/goals.txt?rev=653533&view=auto
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/goals.txt (added)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/goals.txt Mon May  5 10:25:46 2008
> @@ -0,0 +1 @@
> +clean install
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/goals.txt
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/goals.txt
> ------------------------------------------------------------------------------
>     svn:keywords = Date Author Id Revision HeadURL
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/goals.txt
> ------------------------------------------------------------------------------
>     svn:mime-type = text/plain
> 
> 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=653533&r1=653532&r2=653533&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml Mon May  5 10:25:46 2008
> @@ -17,10 +17,13 @@
>      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>
> @@ -30,12 +33,7 @@
>      <artifactId>test-jetty</artifactId>
>      <name>Geronimo TestSuite :: Web Testsuite :: Test Jetty</name>
>      <packaging>war</packaging>
> -    
> -    <description>
> -        Tests for the test-deployables.
> -        maven-maven-plugin:invoke executes the 'child' profile.
> -        Since build executions are done here, a 'child' profile is explicitly defined here to prevent inheriting other configurations and executions from parent.
> -    </description>
> +
>      <dependencies>
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
> @@ -43,50 +41,37 @@
>              <scope>provided</scope>
>          </dependency>
>      </dependencies>
> -    <profiles>
> -        <profile>
> -            <id>child</id>
> -            <build>
> -              <plugins>
> -                    <plugin>
> -                        <groupId>org.apache.maven.plugins</groupId>
> -                        <artifactId>maven-surefire-plugin</artifactId>
> +    
> +    <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>
> -                            <suiteXmlFiles>
> -                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
> -                            </suiteXmlFiles>
> +                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
>                          </configuration>
> -                    </plugin>
> +                    </execution>
>                      
> -                    <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>
> +                    <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>
> +
>  </project>
> 
> Added: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/goals.txt
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/goals.txt?rev=653533&view=auto
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/goals.txt (added)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/goals.txt Mon May  5 10:25:46 2008
> @@ -0,0 +1 @@
> +clean install
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/goals.txt
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/goals.txt
> ------------------------------------------------------------------------------
>     svn:keywords = Date Author Id Revision HeadURL
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/goals.txt
> ------------------------------------------------------------------------------
>     svn:mime-type = text/plain
> 
> 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=653533&r1=653532&r2=653533&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml Mon May  5 10:25:46 2008
> @@ -7,9 +7,9 @@
>      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
> @@ -19,6 +19,7 @@
>  -->
>  
>  <!-- $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>
> @@ -33,12 +34,6 @@
>      <name>Geronimo TestSuite :: Web Testsuite :: Test MyFaces</name>
>      <packaging>war</packaging>
>  
> -    <description>
> -        Tests for the test-deployables.
> -        maven-maven-plugin:invoke executes the 'child' profile.
> -        Since build executions are done here, a 'child' profile is explicitly defined here to prevent inheriting other configurations and executions from parent.
> -    </description>
> -
>      <dependencies>
>          <dependency>
>              <groupId>org.apache.myfaces.core</groupId>
> @@ -53,51 +48,36 @@
>          </dependency>
>      </dependencies>
>  
> -    <profiles>
> -        <profile>
> -            <id>child</id>
> -            <build>
> -                <plugins>
> -                    <plugin>
> -                        <groupId>org.apache.maven.plugins</groupId>
> -                        <artifactId>maven-surefire-plugin</artifactId>
> +    <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>
> -                            <suiteXmlFiles>
> -                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
> -                            </suiteXmlFiles>
> +                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
>                          </configuration>
> -                    </plugin>
> +                    </execution>
>  
> -                    <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>
> +                    <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>
>  
>  </project>
> 
> Added: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/goals.txt
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/goals.txt?rev=653533&view=auto
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/goals.txt (added)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/goals.txt Mon May  5 10:25:46 2008
> @@ -0,0 +1 @@
> +clean install
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/goals.txt
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/goals.txt
> ------------------------------------------------------------------------------
>     svn:keywords = Date Author Id Revision HeadURL
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/goals.txt
> ------------------------------------------------------------------------------
>     svn:mime-type = text/plain
> 
> 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=653533&r1=653532&r2=653533&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml Mon May  5 10:25:46 2008
> @@ -34,13 +34,6 @@
>      <name>Geronimo TestSuite :: Web Testsuite :: Test Tomcat</name>
>      <packaging>war</packaging>
>      
> -
> -    <description>
> -        Tests for the test-deployables.
> -        maven-maven-plugin:invoke executes the 'child' profile.
> -        Since build executions are done here, a 'child' profile is explicitly defined here to prevent inheriting other configurations and executions from parent.
> -    </description>
> -
>      <dependencies>
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
> @@ -49,51 +42,36 @@
>          </dependency>
>      </dependencies>
>  
> -    <profiles>
> -        <profile>
> -            <id>child</id>
> -            <build>
> -                <plugins>
> -                    <plugin>
> -                        <groupId>org.apache.maven.plugins</groupId>
> -                        <artifactId>maven-surefire-plugin</artifactId>
> +    <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>
> -                            <suiteXmlFiles>
> -                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
> -                            </suiteXmlFiles>
> +                          <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
>                          </configuration>
> -                    </plugin>
> +                    </execution>
>                      
> -                    <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>
> +                    <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>
>  
>  </project>
> 
> Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/goals.txt
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/goals.txt?rev=653533&view=auto
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/goals.txt (added)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/goals.txt Mon May  5 10:25:46 2008
> @@ -0,0 +1 @@
> +clean install
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/goals.txt
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/goals.txt
> ------------------------------------------------------------------------------
>     svn:keywords = Date Author Id Revision HeadURL
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/goals.txt
> ------------------------------------------------------------------------------
>     svn:mime-type = text/plain
> 
> Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/pom.xml?rev=653533&r1=653532&r2=653533&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/pom.xml (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/pom.xml Mon May  5 10:25:46 2008
> @@ -17,8 +17,11 @@
>      specific language governing permissions and limitations
>      under the License.
>  -->
> -<!-- $Rev: 558782 $ $Date: 2007-07-23 11:56:02 -0400 (Mon, 23 Jul 2007) $ -->
> +
> +<!-- $Rev: 653498 $ $Date: 2008-05-05 22:11:20 +0700 (Mon, 05 May 2008) $ -->
> +
>  <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>
> @@ -35,15 +38,10 @@
>          Geronimo test for web testsuite. Testing Servlet forwarding
>      </description>
>      
> -    <profiles>
> -        <profile>
> -            <id>child</id>
> -            <modules>
> -                <module>web-forward-war-1</module>
> -                <module>web-forward-war-2</module>
> -                <module>web-forward-ear</module>
> -            </modules>
> -        </profile>
> -    </profiles>
> +    <modules>
> +        <module>web-forward-war-1</module>
> +        <module>web-forward-war-2</module>
> +        <module>web-forward-ear</module>
> +    </modules>
>  
>  </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=653533&r1=653532&r2=653533&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 Mon May  5 10:25:46 2008
> @@ -17,10 +17,13 @@
>      specific language governing permissions and limitations
>      under the License.
>  -->
> -<!-- $Rev: 577928 $ $Date: 2007-09-20 17:20:00 -0400 (Thu, 20 Sep 2007) $ -->
> +
> +<!-- $Rev: 653498 $ $Date: 2008-05-05 22:11:20 +0700 (Mon, 05 May 2008) $ -->
> +
>  <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>test-web-forward</artifactId>
> @@ -31,6 +34,10 @@
>      <name>Geronimo Test Suite :: Test Servlet Forwarding :: EAR</name>
>      <packaging>ear</packaging>
>      
> +    <!--
> +    FIXME: Split this module up... one to build the ear, one to run the tests.
> +    -->
> +    
>      <description>
>          Geronimo test EAR for Servlet forwarding
>      </description>
> @@ -54,6 +61,7 @@
>      <build>
>          <plugins>
>              <plugin>
> +                <groupId>org.apache.maven.plugins</groupId>
>                  <artifactId>maven-ear-plugin</artifactId>
>                  <configuration>
>                      <modules>
> @@ -72,6 +80,7 @@
>                      </modules>
>                  </configuration>
>              </plugin>
> +            
>              <plugin>
>                  <groupId>org.apache.maven.plugins</groupId>
>                  <artifactId>maven-surefire-plugin</artifactId>
> 
> Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml?rev=653533&r1=653532&r2=653533&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml Mon May  5 10:25:46 2008
> @@ -17,10 +17,13 @@
>      specific language governing permissions and limitations
>      under the License.
>  -->
> -<!-- $Rev: 558782 $ $Date: 2007-07-23 11:56:02 -0400 (Mon, 23 Jul 2007) $ -->
> +
> +<!-- $Rev: 653498 $ $Date: 2008-05-05 22:11:20 +0700 (Mon, 05 May 2008) $ -->
> +
>  <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>test-web-forward</artifactId>
> 
> Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml?rev=653533&r1=653532&r2=653533&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml Mon May  5 10:25:46 2008
> @@ -17,9 +17,11 @@
>      specific language governing permissions and limitations
>      under the License.
>  -->
> -<!-- $Rev: 558782 $ $Date: 2007-07-23 11:56:02 -0400 (Mon, 23 Jul 2007) $ -->
> +
> +<!-- $Rev: 653498 $ $Date: 2008-05-05 22:11:20 +0700 (Mon, 05 May 2008) $ -->
> +
>  <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>
> 
> Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/goals.txt
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/goals.txt?rev=653533&view=auto
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/goals.txt (added)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/goals.txt Mon May  5 10:25:46 2008
> @@ -0,0 +1 @@
> +clean install
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/goals.txt
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/goals.txt
> ------------------------------------------------------------------------------
>     svn:keywords = Date Author Id Revision HeadURL
> 
> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/goals.txt
> ------------------------------------------------------------------------------
>     svn:mime-type = text/plain
> 
> Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/pom.xml?rev=653533&r1=653532&r2=653533&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/pom.xml (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/pom.xml Mon May  5 10:25:46 2008
> @@ -17,8 +17,11 @@
>      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>
> @@ -35,15 +38,10 @@
>          Geronimo test for web testsuite. Testing web references
>      </description>
>      
> -    <profiles>
> -        <profile>
> -            <id>child</id>
> -            <modules>
> -                <module>web-references-ejb</module>
> -                <module>web-references-war</module>
> -                <module>web-references-ear</module>
> -            </modules>
> -        </profile>
> -    </profiles>
> +    <modules>
> +        <module>web-references-ejb</module>
> +        <module>web-references-war</module>
> +        <module>web-references-ear</module>
> +    </modules>
>  
>  </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=653533&r1=653532&r2=653533&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 Mon May  5 10:25:46 2008
> @@ -17,10 +17,13 @@
>      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>test-web-references</artifactId>
> @@ -31,6 +34,10 @@
>      <name>Geronimo TestSuite :: Test Web References :: EAR</name>
>      <packaging>ear</packaging>
>      
> +    <!--
> +    FIXME: Split this module up... one to build the ear, one to run the tests.
> +    -->
> +    
>      <description>
>          Geronimo test EAR for Web References
>      </description>
> 
> Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml?rev=653533&r1=653532&r2=653533&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml Mon May  5 10:25:46 2008
> @@ -17,9 +17,11 @@
>      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>
> 
> 
> 

Mime
View raw message