geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r923884 [3/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/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml Tue Mar 16 17:27:07 2010
@@ -29,47 +29,53 @@
     <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - JAR</name>
     <packaging>ejb</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
+    <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-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>
-
-        <!-- the enhancer seems to need xerces -->
-        <!--<dependency>-->
-            <!--<groupId>xerces</groupId>-->
-            <!--<artifactId>xercesImpl</artifactId>-->
-            <!--<scope>provided</scope>-->
-        <!--</dependency>-->
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ejb-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-    
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jta_1.1_spec</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                        
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+        
+                <dependency>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-security</artifactId>
+                    <version>${version}</version>
+                    <scope>provided</scope>
+                </dependency>
+        
+                <!-- the enhancer seems to need xerces -->
+                <!--<dependency>-->
+                    <!--<groupId>xerces</groupId>-->
+                    <!--<artifactId>xercesImpl</artifactId>-->
+                    <!--<scope>provided</scope>-->
+                <!--</dependency>-->
+            </dependencies>
+        
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-ejb-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+   
+        </profile>      
+    </profiles> 
 </project>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml Tue Mar 16 17:27:07 2010
@@ -30,34 +30,40 @@
     <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - WAR</name>
     <packaging>war</packaging>
 
-     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>sec-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>
-
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
+             <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>sec-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/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/pom.xml Tue Mar 16 17:27:07 2010
@@ -146,6 +146,7 @@
                 <plugin>
                     <groupId>org.apache.geronimo.genesis.plugins</groupId>
                     <artifactId>maven-maven-plugin</artifactId>
+                    <version>1.3</version>
                     <configuration>
                         <fileset>
                             <basedir>${pom.basedir}</basedir>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml Tue Mar 16 17:27:07 2010
@@ -27,119 +27,125 @@
         <version>2.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>web-forward-ear</artifactId>
-    <name>Geronimo Test Suite :: Test Servlet Forwarding :: EAR</name>
+    <name>Geronimo TestSuite :: Test Servlet Forwarding :: EAR</name>
     <packaging>ear</packaging>
     
     <description>
         Geronimo test EAR for Servlet forwarding
     </description>
-    
-    <dependencies>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>web-forward-war-1</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>web-forward-war-2</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-            </plugin>
 
-            <plugin>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <modules>
-                        <webModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>web-forward-war-1</artifactId>
-                            <contextRoot>/dispatch1</contextRoot>
-                            <bundleFileName>web-forward-war-1.war</bundleFileName>
-                        </webModule>
-                        <webModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>web-forward-war-2</artifactId>
-                            <contextRoot>/dispatch2</contextRoot>
-                            <bundleFileName>web-forward-war-2.war</bundleFileName>
-                        </webModule>
-                    </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>
+    <profiles>
+        <profile>
+            <id>child</id>
                     
-            <!-- "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.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>
+            <dependencies>
+        
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>web-forward-war-1</artifactId>
+                    <version>${version}</version>
+                    <type>war</type>
+                </dependency>
+        
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>web-forward-war-2</artifactId>
+                    <version>${version}</version>
+                    <type>war</type>
+                </dependency>
+        
+            </dependencies>
+            
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
+        
+                    <plugin>
+                        <artifactId>maven-ear-plugin</artifactId>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                            <modules>
+                                <webModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>web-forward-war-1</artifactId>
+                                    <contextRoot>/dispatch1</contextRoot>
+                                    <bundleFileName>web-forward-war-1.war</bundleFileName>
+                                </webModule>
+                                <webModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>web-forward-war-2</artifactId>
+                                    <contextRoot>/dispatch2</contextRoot>
+                                    <bundleFileName>web-forward-war-2.war</bundleFileName>
+                                </webModule>
+                            </modules>
                         </configuration>
-                    </execution>
-                            
-                    <execution>
-                        <id>undeploy-ear-as-moduleId</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.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-ears</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+                                    
+                            <execution>
+                                <id>undeploy-ear-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            
+        </profile>      
+    </profiles>    
 </project>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml Tue Mar 16 17:27:07 2010
@@ -27,26 +27,33 @@
         <version>2.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>web-forward-war-1</artifactId>
-    <name>Geronimo Test Suite :: Test Servlet Forwarding :: WAR I</name>
+    <name>Geronimo TestSuite :: Test Servlet Forwarding :: WAR I</name>
     <packaging>war</packaging>
     
     <description>
         Geronimo test WAR for Servlet forwarding
     </description>
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-                
-    </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>
+                        
+            </dependencies>
+
+        </profile>      
+    </profiles>    
 </project>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml Tue Mar 16 17:27:07 2010
@@ -27,26 +27,33 @@
         <version>2.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>web-forward-war-2</artifactId>
-    <name>Geronimo Test Suite :: Test Servlet Forwarding :: WAR II</name>
+    <name>Geronimo TestSuite :: Test Servlet Forwarding :: WAR II</name>
     <packaging>war</packaging>
     
     <description>
         Geronimo test WAR for Servlet forwarding
     </description>
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-                
-    </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>
+                        
+            </dependencies>
+
+        </profile>      
+    </profiles>            
 </project>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml Tue Mar 16 17:27:07 2010
@@ -33,112 +33,118 @@
     <description>
         Geronimo test EAR for Web References
     </description>
-    
-    <dependencies>
-        
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>web-references-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>web-references-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-        
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-            </plugin>
 
-            <plugin>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <modules>
-                        <webModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>web-references-war</artifactId>
-                            <contextRoot>/webref</contextRoot>
-                            <bundleFileName>web-references-war.war</bundleFileName>
-                        </webModule>
-                        <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>web-references-ejb</artifactId>
-                            <bundleFileName>web-references-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.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>
+    <profiles>
+        <profile>
+            <id>child</id>
+                        
+            <dependencies>
+                
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>web-references-war</artifactId>
+                    <version>${version}</version>
+                    <type>war</type>
+                </dependency>
+                
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>web-references-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                </dependency>
+                
+            </dependencies>
+            
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
+        
+                    <plugin>
+                        <artifactId>maven-ear-plugin</artifactId>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                            <modules>
+                                <webModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>web-references-war</artifactId>
+                                    <contextRoot>/webref</contextRoot>
+                                    <bundleFileName>web-references-war.war</bundleFileName>
+                                </webModule>
+                                <ejbModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>web-references-ejb</artifactId>
+                                    <bundleFileName>web-references-ejb.jar</bundleFileName>
+                                </ejbModule>
+                            </modules>
                         </configuration>
-                    </execution>
-                            
-                    <execution>
-                        <id>undeploy-ear-as-moduleId</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.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-ears</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+                                    
+                            <execution>
+                                <id>undeploy-ear-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+
+        </profile>      
+    </profiles>    
 </project>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml Tue Mar 16 17:27:07 2010
@@ -38,14 +38,20 @@
         Geronimo test EJBs for J2EE 1.4.
     </description>
 
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-    </dependencies>
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
+            <dependencies>
+                
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+                
+            </dependencies>
 
+        </profile>      
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml Tue Mar 16 17:27:07 2010
@@ -27,52 +27,59 @@
         <version>2.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>web-references-war</artifactId>
-    <name>Geronimo Test Suite :: Test Web References :: WAR</name>
+    <name>Geronimo TestSuite :: Test Web References :: WAR</name>
     <packaging>war</packaging>
     
     <description>
         Geronimo test WAR for web references
     </description>
-    <dependencies>
-        
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>web-references-ejb</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-            <type>ejb</type>
-        </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-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-ejb_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-    </dependencies>
-    
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
+            <dependencies>
+                
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>web-references-ejb</artifactId>
+                    <version>${version}</version>
+                    <scope>provided</scope>
+                    <type>ejb</type>
+                </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-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-ejb_3.0_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+        
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+                
+            </dependencies>
+
+        </profile>      
+    </profiles>            
 </project>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml Tue Mar 16 17:27:07 2010
@@ -37,112 +37,119 @@
        <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.test.JAXBClient</mainClass>
-                        </manifest>
-                    </archive>
-                </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>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        
+            <build>
+                <plugins>
+        
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
                         <configuration>
-                            <grandParent>true</grandParent>
+                            <archive>
+                                <manifest>
+                                    <mainClass>org.apache.geronimo.test.JAXBClient</mainClass>
+                                </manifest>
+                            </archive>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>clientLogFile</name>
-                            <value>${clientLogFile}</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-client</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.geronimo.genesis.plugins</groupId>
+                        <artifactId>tools-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                            <systemProperties>
+                                <property>
+                                    <name>clientLogFile</name>
+                                    <value>${clientLogFile}</value>
+                                </property>
+                            </systemProperties>
                         </configuration>
-                    </execution>
-
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <id>run-client</id>
-                        <goals>
-                            <goal>run-client</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/JAXBClient/1.1/car</moduleId>
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy-client-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/JAXBClientServer/1.1/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-client</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                </configuration>
+                            </execution>
+        
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXBClient/1.1/car</moduleId>
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                </configuration>
+                            </execution>
+        
+                            <execution>
+                                <id>undeploy-client-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXBClientServer/1.1/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+
+    
+        </profile>      
+    </profiles>
 </project>
 

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml Tue Mar 16 17:27:07 2010
@@ -35,100 +35,106 @@
 
     <description>This project executes testcases for your testsuite</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </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.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-ejb</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
-                        </configuration>
-                    </execution>
-                            
-                    <execution>
-                        <id>undeploy-ejb-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/JAXBEJB/1.1/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                </dependency>
+        
+                <dependency>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-core</artifactId>
+                </dependency>
+        
+                <dependency>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-client</artifactId>
+                </dependency>
+        
+                <dependency>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-kernel</artifactId>
+                    <version>${version}</version>
+                </dependency>
+        
+                <dependency>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-security</artifactId>
+                    <version>${version}</version>
+                </dependency>
+        
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>tools-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                    </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.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-ejb</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                </configuration>
+                            </execution>
+                                    
+                            <execution>
+                                <id>undeploy-ejb-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXBEJB/1.1/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+    
+        </profile>      
+    </profiles>
 </project>
 

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml Tue Mar 16 17:27:07 2010
@@ -34,86 +34,92 @@
 
     <description>This project executes testcases for your testsuite</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <scope>provided</scope>
-        </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.
-                        -->
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <scope>provided</scope>
+                </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>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <grandParent>true</grandParent>
+                            <systemProperties>
+                                <property>
+                                    <name>webAppName</name>
+                                    <value>${artifactId}-${version}</value>
+                                </property>
+                            </systemProperties>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>webAppName</name>
-                            <value>${artifactId}-${version}</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </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>
-                        <id>undeploy-war-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/JAXBServlet/1.1/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>tools-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                    </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>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXBServlet/1.1/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+    
+        </profile>      
+    </profiles>
 </project>
 

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml Tue Mar 16 17:27:07 2010
@@ -37,112 +37,118 @@
        <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
 
-    <dependencies>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jaxr_1.0_spec</artifactId>
-                <scope>provided</scope>
-            </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.test.JAXRClient</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>clientLogFile</name>
-                            <value>${clientLogFile}</value>
-                        </property>
-                    </systemProperties>
-                </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.specs</groupId>
+                        <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+                        <scope>provided</scope>
+                    </dependency>
+            </dependencies>
+        
+            <build>
+                <plugins>
+        
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
                         <configuration>
-                            <grandParent>true</grandParent>
+                            <archive>
+                                <manifest>
+                                    <mainClass>org.apache.geronimo.test.JAXRClient</mainClass>
+                                </manifest>
+                            </archive>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-client</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                            <systemProperties>
+                                <property>
+                                    <name>clientLogFile</name>
+                                    <value>${clientLogFile}</value>
+                                </property>
+                            </systemProperties>
                         </configuration>
-                    </execution>
-
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <id>run-client</id>
-                        <goals>
-                            <goal>run-client</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/JAXRClient/1.1/car</moduleId>
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy-client-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/JAXRClientServer/1.1/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
+                    </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.geronimo.genesis.plugins</groupId>
+                        <artifactId>tools-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-client</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                </configuration>
+                            </execution>
+        
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXRClient/1.1/car</moduleId>
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                </configuration>
+                            </execution>
+        
+                            <execution>
+                                <id>undeploy-client-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXRClientServer/1.1/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+    
+        </profile>      
+    </profiles>
 </project>
 

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml Tue Mar 16 17:27:07 2010
@@ -35,100 +35,106 @@
 
     <description>This project executes testcases for your testsuite</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </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.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-ejb</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
-                        </configuration>
-                    </execution>
-                            
-                    <execution>
-                        <id>undeploy-ejb-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/JAXREJB/1.1/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                </dependency>
+        
+                <dependency>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-core</artifactId>
+                </dependency>
+        
+                <dependency>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-client</artifactId>
+                </dependency>
+        
+                <dependency>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-kernel</artifactId>
+                    <version>${version}</version>
+                </dependency>
+        
+                <dependency>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-security</artifactId>
+                    <version>${version}</version>
+                </dependency>
+        
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>tools-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                    </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.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-ejb</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                </configuration>
+                            </execution>
+                                    
+                            <execution>
+                                <id>undeploy-ejb-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXREJB/1.1/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+    
+        </profile>      
+    </profiles>
 </project>
 



Mime
View raw message