geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r923884 [2/5] - in /geronimo/server/branches/2.1/testsuite: ./ corba-testsuite/corba-helloworld/corba-helloworld-client/ corba-testsuite/corba-helloworld/corba-helloworld-ear/ corba-testsuite/corba-helloworld/corba-helloworld-ejb/ corba-tes...
Date Tue, 16 Mar 2010 17:27:09 GMT
Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml Tue Mar 16 17:27:07 2010
@@ -27,105 +27,111 @@
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath EAR</name>
     <packaging>ear</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-jar</artifactId>
-            <version>${version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-war-jar</artifactId>
-            <version>${version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>testsuite-maven-plugin</artifactId>
-                <version>${version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-surefire-xml</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>generate-surefire-xml</goal>
-                        </goals>
-                        <!-- 
-                        Merging the configuration of this plugin with the one it inherits.
-                        Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
-                        -->
-                        <configuration>
-                            <grandParent>true</grandParent>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <displayName>Manifest Classpath Itest ear</displayName>
-                    <description>Manifest Classpath Itest ear</description>
-                    <version>1.4</version>
-                    <modules>
-                        <webModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>manifestcp-war</artifactId>
-                            <contextRoot>/manifestcp</contextRoot>
-                            <bundleFileName>web.war</bundleFileName>
-                        </webModule>
-                        <ejbModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>manifestcp-ejb</artifactId>
-                            <bundleFileName>ejb.jar</bundleFileName>
-                        </ejbModule>
-                    </modules>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-ears</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy-ear-as-module</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>manifestcp-jar</artifactId>
+                    <version>${version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>manifestcp-war-jar</artifactId>
+                    <version>${version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>manifestcp-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>manifestcp-war</artifactId>
+                    <version>${version}</version>
+                    <type>war</type>
+                </dependency>
+            </dependencies>
+        
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>testsuite-maven-plugin</artifactId>
+                        <version>${version}</version>
+                        <executions>
+                            <execution>
+                                <id>generate-surefire-xml</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>generate-surefire-xml</goal>
+                                </goals>
+                                <!-- 
+                                Merging the configuration of this plugin with the one it inherits.
+                                Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+                                -->
+                                <configuration>
+                                    <grandParent>true</grandParent>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <plugin>
+                        <artifactId>maven-ear-plugin</artifactId>
                         <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                            <displayName>Manifest Classpath Itest ear</displayName>
+                            <description>Manifest Classpath Itest ear</description>
+                            <version>1.4</version>
+                            <modules>
+                                <webModule>
+                                    <groupId>org.apache.geronimo.testsuite</groupId>
+                                    <artifactId>manifestcp-war</artifactId>
+                                    <contextRoot>/manifestcp</contextRoot>
+                                    <bundleFileName>web.war</bundleFileName>
+                                </webModule>
+                                <ejbModule>
+                                    <groupId>org.apache.geronimo.testsuite</groupId>
+                                    <artifactId>manifestcp-ejb</artifactId>
+                                    <bundleFileName>ejb.jar</bundleFileName>
+                                </ejbModule>
+                            </modules>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-ears</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+        
+                            <execution>
+                                <id>undeploy-ear-as-module</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
 
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml Tue Mar 16 17:27:07 2010
@@ -26,29 +26,37 @@
     <artifactId>manifestcp-ejb</artifactId>
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath EJB</name>
     <packaging>ejb</packaging>
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-ejb-plugin</artifactId>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <addClasspath>true</addClasspath>
+                                </manifest>
+                            </archive>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>manifestcp-jar</artifactId>
+                    <version>${version}</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+            
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ejb-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-jar</artifactId>
-            <version>${version}</version>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml Tue Mar 16 17:27:07 2010
@@ -25,17 +25,25 @@
 
     <artifactId>manifestcp-jar</artifactId>
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath JAR</name>
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>manifestcp-jar2</artifactId>
+                    <version>${version}</version>
+                </dependency>
+            </dependencies>
+            
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-jar2</artifactId>
-            <version>${version}</version>
-        </dependency>
-    </dependencies>
+        </profile>
+    </profiles> 
 </project>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml Tue Mar 16 17:27:07 2010
@@ -26,12 +26,19 @@
     <artifactId>manifestcp-jar2</artifactId>
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath JAR</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <dependencies>
+                <dependency>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                    <version>3.8.1</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml Tue Mar 16 17:27:07 2010
@@ -26,19 +26,25 @@
 
     <artifactId>manifestcp-war-jar</artifactId>
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath WAR-JAR</name>
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+    
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>manifestcp-jar2</artifactId>
+                    <version>${version}</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-jar2</artifactId>
-            <version>${version}</version>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml Tue Mar 16 17:27:07 2010
@@ -28,29 +28,36 @@
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath WAR</name>
     <packaging>war</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-war-jar</artifactId>
-            <version>${version}</version>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                            <archive>
+                                <manifest>
+                                    <addClasspath>true</addClasspath>
+                                </manifest>
+                            </archive>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>manifestcp-war-jar</artifactId>
+                    <version>${version}</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+            
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml Tue Mar 16 17:27:07 2010
@@ -37,145 +37,151 @@
     <description>
         Geronimo test EAR for EJB Tests
     </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>ejb-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>ejb-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-           <groupId>org.apache.openejb</groupId>
-           <artifactId>openejb-core</artifactId>
-           <scope>test</scope>
-        </dependency>
-        <dependency>
-           <groupId>org.apache.openejb</groupId>
-           <artifactId>openejb-client</artifactId>
-           <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <displayName>Geronimo EAR for EJB Tests</displayName>
-                    <description>Geronimo EAR for EJB Tests</description>
-                    <version>5</version>
-                    <modules>
-                      <ejbModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>ejb-ejb</artifactId>
-                            <bundleFileName>ejb-ejb-${version}.jar</bundleFileName>
-                        </ejbModule>
-
-                        <webModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>ejb-war</artifactId>
-                            <contextRoot>/ejbtests</contextRoot>
-                            <bundleFileName>ejb-war-${version}.war</bundleFileName>
-                        </webModule>
-                    </modules>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>testsuite-maven-plugin</artifactId>
-                <version>${version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-surefire-xml</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>generate-surefire-xml</goal>
-                        </goals>
-                        <!-- 
-                        Merging the configuration of this plugin with the one it inherits.
-                        Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
-                        -->
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>ejb-war</artifactId>
+                    <version>${version}</version>
+                    <type>war</type>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>ejb-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                   <groupId>org.apache.openejb</groupId>
+                   <artifactId>openejb-core</artifactId>
+                   <scope>test</scope>
+                </dependency>
+                <dependency>
+                   <groupId>org.apache.openejb</groupId>
+                   <artifactId>openejb-client</artifactId>
+                   <scope>test</scope>
+                </dependency>
+            </dependencies>
+        
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-ear-plugin</artifactId>
                         <configuration>
-                            <grandParent>true</grandParent>
+                            <displayName>Geronimo EAR for EJB Tests</displayName>
+                            <description>Geronimo EAR for EJB Tests</description>
+                            <version>5</version>
+                            <modules>
+                              <ejbModule>
+                                    <groupId>org.apache.geronimo.testsuite</groupId>
+                                    <artifactId>ejb-ejb</artifactId>
+                                    <bundleFileName>ejb-ejb-${version}.jar</bundleFileName>
+                                </ejbModule>
+        
+                                <webModule>
+                                    <groupId>org.apache.geronimo.testsuite</groupId>
+                                    <artifactId>ejb-war</artifactId>
+                                    <contextRoot>/ejbtests</contextRoot>
+                                    <bundleFileName>ejb-war-${version}.war</bundleFileName>
+                                </webModule>
+                            </modules>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                </configuration>
-            </plugin>
-
-            <!-- "ear" packaging doesn't process test resources -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- "ear" packaging doesn't process test resources -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testResources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <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}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>testsuite-maven-plugin</artifactId>
+                        <version>${version}</version>
+                        <executions>
+                            <execution>
+                                <id>generate-surefire-xml</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>generate-surefire-xml</goal>
+                                </goals>
+                                <!-- 
+                                Merging the configuration of this plugin with the one it inherits.
+                                Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+                                -->
+                                <configuration>
+                                    <grandParent>true</grandParent>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
+                    </plugin>
+        
+                    <!-- "ear" packaging doesn't process test resources -->
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>testCompile</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <!-- "ear" packaging doesn't process test resources -->
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>testResources</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <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}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+        
+                            <execution>
+                                <id>undeploy</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                </plugins>
+            </build>
+            
+        </profile>      
+    </profiles>
 </project>
 

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml Tue Mar 16 17:27:07 2010
@@ -37,14 +37,21 @@
     <description>
         Geronimo test WAR for EJB Tests
     </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>ejb-ejb</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>ejb-ejb</artifactId>
+                    <version>${version}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+    
+        </profile>      
+    </profiles>
+    
 </project>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml Tue Mar 16 17:27:07 2010
@@ -37,150 +37,155 @@
     <description>
         Geronimo test EAR for JMS.
     </description>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>jms-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>jms-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-client</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
     
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <displayName>Geronimo Test EAR for JMS</displayName>
-                    <description>Test EAR for JMS testing</description>
-                    <version>1.4</version>
-                    <modules>
-                        <webModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>jms-war</artifactId>
-                            <contextRoot>/testjms</contextRoot>
-                            <bundleFileName>web.war</bundleFileName>
-                        </webModule>
-                        <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>jms-ejb</artifactId>
-                            <bundleFileName>ejb.jar</bundleFileName>
-                        </ejbModule>
-                    </modules>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>testsuite-maven-plugin</artifactId>
-                <version>${version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-surefire-xml</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>generate-surefire-xml</goal>
-                        </goals>
-                        <!-- 
-                        Merging the configuration of this plugin with the one it inherits.
-                        Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
-                        -->
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <dependencies>
+        
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>jms-war</artifactId>
+                    <version>${version}</version>
+                    <type>war</type>
+                </dependency>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>jms-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-client</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    <version>1.0.1</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-ear-plugin</artifactId>
                         <configuration>
-                            <grandParent>true</grandParent>
+                            <displayName>Geronimo Test EAR for JMS</displayName>
+                            <description>Test EAR for JMS testing</description>
+                            <version>1.4</version>
+                            <modules>
+                                <webModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>jms-war</artifactId>
+                                    <contextRoot>/testjms</contextRoot>
+                                    <bundleFileName>web.war</bundleFileName>
+                                </webModule>
+                                <ejbModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>jms-ejb</artifactId>
+                                    <bundleFileName>ejb.jar</bundleFileName>
+                                </ejbModule>
+                            </modules>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                </configuration>
-            </plugin>
-
-            <!-- "ear" packaging doesn't compile test classes -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- "ear" packaging doesn't process test resources -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testResources</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>
-                <executions>
-                    <execution>
-                        <id>deploy</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>testsuite-maven-plugin</artifactId>
+                        <version>${version}</version>
+                        <executions>
+                            <execution>
+                                <id>generate-surefire-xml</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>generate-surefire-xml</goal>
+                                </goals>
+                                <!-- 
+                                Merging the configuration of this plugin with the one it inherits.
+                                Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+                                -->
+                                <configuration>
+                                    <grandParent>true</grandParent>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
                         </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-
-    </build>
+                    </plugin>
+        
+                    <!-- "ear" packaging doesn't compile test classes -->
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>testCompile</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <!-- "ear" packaging doesn't process test resources -->
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>testResources</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>
+                        <executions>
+                            <execution>
+                                <id>deploy</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+        
+                            <execution>
+                                <id>undeploy</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                </plugins>
+        
+            </build>
     
-
+        </profile>      
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml Tue Mar 16 17:27:07 2010
@@ -26,36 +26,44 @@
   <artifactId>jms-ejb</artifactId>
   <name>jms-ejb</name>
     <packaging>ejb</packaging>
-  <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <version>1.1.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <version>1.1.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-ejb-plugin</artifactId>
-        <configuration>
-          <ejbVersion>3.0</ejbVersion>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+  
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    <version>1.0.1</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jms_1.1_spec</artifactId>
+                    <version>1.1.1</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                    <version>1.1.1</version>
+                    <scope>provided</scope>
+                </dependency>
+        
+            </dependencies>
+            <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-ejb-plugin</artifactId>
+                    <configuration>
+                      <ejbVersion>3.0</ejbVersion>
+                    </configuration>
+                  </plugin>
+                </plugins>
+            </build>
+          
+        </profile>      
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml Tue Mar 16 17:27:07 2010
@@ -38,35 +38,41 @@
         Geronimo test WAR for JMS
     </description>
 
-    <dependencies>
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
+            <dependencies>
+                
+              <!--
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jsp_2.1_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+                -->
+                
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+                
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jms_1.1_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
         
-      <!--
-        <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-annotation_1.0_spec</artifactId>
+                    <version>1.1.1</version>
+                    <scope>provided</scope>
+                </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <version>1.1.1</version>
-            <scope>provided</scope>
-        </dependency>
+            </dependencies>
 
-    </dependencies>
-    
+        </profile>      
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml Tue Mar 16 17:27:07 2010
@@ -29,137 +29,142 @@
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - EAR</name>
     <packaging>ear</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>jpa-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>jpa-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>testsuite-maven-plugin</artifactId>
-                <version>${version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-surefire-xml</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>generate-surefire-xml</goal>
-                        </goals>
-                        <!-- 
-                        Merging the configuration of this plugin with the one it inherits.
-                        Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
-                        -->
-                        <configuration>
-                            <grandParent>true</grandParent>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <displayName>jpa Itest ear</displayName>
-                    <description>jpa Itest ear</description>
-                    <version>1.4</version>
-                    <modules>
-                        <webModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>jpa-war</artifactId>
-                            <contextRoot>/jpa</contextRoot>
-                            <bundleFileName>web.war</bundleFileName>
-                        </webModule>
-                        <ejbModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>jpa-ejb</artifactId>
-                            <bundleFileName>ejb.jar</bundleFileName>
-                        </ejbModule>
-                    </modules>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                </configuration>
-            </plugin>
-
-            <!-- "ear" packaging doesn't compile test classes -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- "ear" packaging doesn't process test resources -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testResources</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>
-                <executions>
-                    <execution>
-                        <id>deploy</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>jpa-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>jpa-war</artifactId>
+                    <version>${version}</version>
+                    <type>war</type>
+                </dependency>
+            </dependencies>
+        
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>testsuite-maven-plugin</artifactId>
+                        <version>${version}</version>
+                        <executions>
+                            <execution>
+                                <id>generate-surefire-xml</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>generate-surefire-xml</goal>
+                                </goals>
+                                <!-- 
+                                Merging the configuration of this plugin with the one it inherits.
+                                Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+                                -->
+                                <configuration>
+                                    <grandParent>true</grandParent>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <plugin>
+                        <artifactId>maven-ear-plugin</artifactId>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                            <displayName>jpa Itest ear</displayName>
+                            <description>jpa Itest ear</description>
+                            <version>1.4</version>
+                            <modules>
+                                <webModule>
+                                    <groupId>org.apache.geronimo.testsuite</groupId>
+                                    <artifactId>jpa-war</artifactId>
+                                    <contextRoot>/jpa</contextRoot>
+                                    <bundleFileName>web.war</bundleFileName>
+                                </webModule>
+                                <ejbModule>
+                                    <groupId>org.apache.geronimo.testsuite</groupId>
+                                    <artifactId>jpa-ejb</artifactId>
+                                    <bundleFileName>ejb.jar</bundleFileName>
+                                </ejbModule>
+                            </modules>
                         </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-    
-
+                    </plugin>
+        
+                    <!-- "ear" packaging doesn't compile test classes -->
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>testCompile</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <!-- "ear" packaging doesn't process test resources -->
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>testResources</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>
+                        <executions>
+                            <execution>
+                                <id>deploy</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+        
+                            <execution>
+                                <id>undeploy</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                </plugins>
+            </build>
+            
+        </profile>      
+    </profiles>
 
 </project>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Tue Mar 16 17:27:07 2010
@@ -29,78 +29,84 @@
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - JAR</name>
     <packaging>ejb</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
+            <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>provided</scope>
+                </dependency>
+                
+                <dependency>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa-persistence-jdbc</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.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
+                <!-- the enhancer seems to need xerces -->
+                <dependency>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                    <scope>provided</scope>
+                </dependency>
         
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-persistence-jdbc</artifactId>
-            <scope>provided</scope>
-        </dependency>
+            </dependencies>
         
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>compile</phase>
+                                <configuration>
+                                    <tasks>
+                                        <path id="enhance.path.ref">
+                                            <fileset dir="${project.build.outputDirectory}">
+                                                <include name="**/*.class"/>
+                                            </fileset>
+                                        </path>
+                                        <pathconvert property="enhance.files"
+                                           refid="enhance.path.ref"
+                                           pathsep=" "/>
+                                        <java classname="org.apache.openjpa.enhance.PCEnhancer">
+                                            <arg line="-p persistence.xml"/>
+                                            <arg line="${enhance.files}"/>
+                                            <classpath>
+                                                <path refid="maven.dependency.classpath"/>
+                                                <path refid="maven.compile.classpath"/>
+                                            </classpath>
+                                        </java>
+                                    </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-ejb-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
 
-        <!-- the enhancer seems to need xerces -->
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <configuration>
-                            <tasks>
-                                <path id="enhance.path.ref">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="**/*.class"/>
-                                    </fileset>
-                                </path>
-                                <pathconvert property="enhance.files"
-                                   refid="enhance.path.ref"
-                                   pathsep=" "/>
-                                <java classname="org.apache.openjpa.enhance.PCEnhancer">
-                                    <arg line="-p persistence.xml"/>
-                                    <arg line="${enhance.files}"/>
-                                    <classpath>
-                                        <path refid="maven.dependency.classpath"/>
-                                        <path refid="maven.compile.classpath"/>
-                                    </classpath>
-                                </java>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ejb-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-    
+        </profile>      
+    </profiles>    
 </project>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml Tue Mar 16 17:27:07 2010
@@ -29,39 +29,45 @@
     <artifactId>jpa-war</artifactId>
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - WAR</name>
     <packaging>war</packaging>
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
+             <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>jpa-ejb</artifactId>
+                    <version>${version}</version>
+                    <optional>true</optional>
+                </dependency>
+                
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-servlet_2.5_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.geronimo.framework</groupId>
+                    <artifactId>geronimo-security</artifactId>
+                    <version>${version}</version>
+                    <scope>provided</scope>
+                </dependency>
+                
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jta_1.1_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
 
-     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>jpa-ejb</artifactId>
-            <version>${version}</version>
-            <optional>true</optional>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_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.geronimo.framework</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
+        </profile>      
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml Tue Mar 16 17:27:07 2010
@@ -29,137 +29,142 @@
     <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - EAR</name>
     <packaging>ear</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>sec-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>sec-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>testsuite-maven-plugin</artifactId>
-                <version>${version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-surefire-xml</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>generate-surefire-xml</goal>
-                        </goals>
-                        <!-- 
-                        Merging the configuration of this plugin with the one it inherits.
-                        Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
-                        -->
-                        <configuration>
-                            <grandParent>true</grandParent>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <displayName>security Itest ear</displayName>
-                    <description>security Itest ear</description>
-                    <version>1.4</version>
-                    <modules>
-                        <webModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>sec-war</artifactId>
-                            <contextRoot>/sec</contextRoot>
-                            <bundleFileName>web.war</bundleFileName>
-                        </webModule>
-                        <ejbModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>sec-ejb</artifactId>
-                            <bundleFileName>ejb.jar</bundleFileName>
-                        </ejbModule>
-                    </modules>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                </configuration>
-            </plugin>
-
-            <!-- "ear" packaging doesn't compile test classes -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- "ear" packaging doesn't process test resources -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testResources</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>
-                <executions>
-                    <execution>
-                        <id>deploy</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>sec-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>sec-war</artifactId>
+                    <version>${version}</version>
+                    <type>war</type>
+                </dependency>
+            </dependencies>
+        
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>testsuite-maven-plugin</artifactId>
+                        <version>${version}</version>
+                        <executions>
+                            <execution>
+                                <id>generate-surefire-xml</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>generate-surefire-xml</goal>
+                                </goals>
+                                <!-- 
+                                Merging the configuration of this plugin with the one it inherits.
+                                Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+                                -->
+                                <configuration>
+                                    <grandParent>true</grandParent>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <plugin>
+                        <artifactId>maven-ear-plugin</artifactId>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                            <displayName>security Itest ear</displayName>
+                            <description>security Itest ear</description>
+                            <version>1.4</version>
+                            <modules>
+                                <webModule>
+                                    <groupId>org.apache.geronimo.testsuite</groupId>
+                                    <artifactId>sec-war</artifactId>
+                                    <contextRoot>/sec</contextRoot>
+                                    <bundleFileName>web.war</bundleFileName>
+                                </webModule>
+                                <ejbModule>
+                                    <groupId>org.apache.geronimo.testsuite</groupId>
+                                    <artifactId>sec-ejb</artifactId>
+                                    <bundleFileName>ejb.jar</bundleFileName>
+                                </ejbModule>
+                            </modules>
                         </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
+                    </plugin>
+        
+                    <!-- "ear" packaging doesn't compile test classes -->
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>testCompile</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <!-- "ear" packaging doesn't process test resources -->
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>testResources</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>
+                        <executions>
+                            <execution>
+                                <id>deploy</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+        
+                            <execution>
+                                <id>undeploy</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                </plugins>
+            </build>
     
-
+        </profile>      
+    </profiles>
 
 </project>



Mime
View raw message