geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r923884 [1/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
Author: rwonly
Date: Tue Mar 16 17:27:07 2010
New Revision: 923884

URL: http://svn.apache.org/viewvc?rev=923884&view=rev
Log:
should not run itest in testsuite's all-subproject profile

Modified:
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
    geronimo/server/branches/2.1/testsuite/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml Tue Mar 16 17:27:07 2010
@@ -32,45 +32,52 @@
     <name>Geronimo TestSuite :: CORBA TestSuite :: Hello World Client</name>
     <packaging>jar</packaging>
     <description>Example using CORBA to access a stateless EJB</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>corba-helloworld-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>corba-helloworld-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <description>Geronimo Hello World Enterprise Application CORBA Client JAR</description>
-                    <displayName>Geronimo Hello World Enterprise Application CORBA Client JAR</displayName>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.testsuite.corba.helloworld.HelloWorldEJBClient</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <dependencies>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-helloworld-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                    <scope>provided</scope>
+                </dependency>
+        
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-helloworld-war</artifactId>
+                    <version>${version}</version>
+                    <type>war</type>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <configuration>
+                            <description>Geronimo Hello World Enterprise Application CORBA Client JAR</description>
+                            <displayName>Geronimo Hello World Enterprise Application CORBA Client JAR</displayName>
+                            <archive>
+                                <manifest>
+                                    <mainClass>org.apache.geronimo.testsuite.corba.helloworld.HelloWorldEJBClient</mainClass>
+                                </manifest>
+                            </archive>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            
+        </profile>
+    </profiles>
+        
 </project>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml Tue Mar 16 17:27:07 2010
@@ -37,183 +37,189 @@
         <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>corba-helloworld-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>corba-helloworld-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>corba-helloworld-client</artifactId>
-            <version>${version}</version>
-            <type>jar</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>
-                    <description>Geronimo Hello World Enterprise Application EAR</description>
-                    <displayName>Geronimo Hello World Enterprise Application EAR</displayName>
-                    <version>5</version>
-                    <modules>
-                        <webModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>corba-helloworld-war</artifactId>
-                            <contextRoot>/corba-helloworld</contextRoot>
-                            <bundleFileName>corba-helloworld-war-${version}.war</bundleFileName>
-                        </webModule>
-                        <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>corba-helloworld-ejb</artifactId>
-                            <bundleFileName>corba-helloworld-ejb-${version}.jar</bundleFileName>
-                        </ejbModule>
-                        <jarModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>corba-helloworld-client</artifactId>
-                            <bundleFileName>corba-helloworld-client-${version}.jar</bundleFileName>
-                        </jarModule>
-                    </modules>
-                </configuration>
-            </plugin>
-            <!-- Deploy the ear and invoke the imbedded CORBA app client  -->
-            <!-- ======================================================== -->
-            <!-- ===================================================================== -->
-            <!-- Setup the client log file location for access by the CORBA app client -->
-            <!-- ===================================================================== -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-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>
-                    <!-- ============================================================================= -->
-                    <!-- These modules must be running before deploying a CORBA module can be deployed -->
-                    <!-- ============================================================================= -->
-                    <execution>
-                        <id>start-j2ee-corba-yoko</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>openejb-corba-deployer</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-
-                    <!-- ======================= -->
-                    <!-- Deploy the CORBA module -->
-                    <!-- ======================= -->
-                    <execution>
-                        <id>deploy-ear</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <!-- =========================== -->
-                    <!-- Invoke the CORBA app client -->
-                    <!-- =========================== -->
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <id>run-client</id>
-                        <goals>
-                            <goal>run-client</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.testsuite/corba-helloworld-client/${version}/car</moduleId>
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
-                        </configuration>
-                    </execution>
-
-                    <!-- ========================= -->
-                    <!-- Undeploy the CORBA module -->
-                    <!-- ========================= -->
-                    <execution>
-                        <id>undeploy-ear</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- "ear" packaging doesn't compile test classes -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <dependencies>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-helloworld-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                </dependency>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-helloworld-war</artifactId>
+                    <version>${version}</version>
+                    <type>war</type>
+                </dependency>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-helloworld-client</artifactId>
+                    <version>${version}</version>
+                    <type>jar</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>
+                            <description>Geronimo Hello World Enterprise Application EAR</description>
+                            <displayName>Geronimo Hello World Enterprise Application EAR</displayName>
+                            <version>5</version>
+                            <modules>
+                                <webModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>corba-helloworld-war</artifactId>
+                                    <contextRoot>/corba-helloworld</contextRoot>
+                                    <bundleFileName>corba-helloworld-war-${version}.war</bundleFileName>
+                                </webModule>
+                                <ejbModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>corba-helloworld-ejb</artifactId>
+                                    <bundleFileName>corba-helloworld-ejb-${version}.jar</bundleFileName>
+                                </ejbModule>
+                                <jarModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>corba-helloworld-client</artifactId>
+                                    <bundleFileName>corba-helloworld-client-${version}.jar</bundleFileName>
+                                </jarModule>
+                            </modules>
+                        </configuration>
+                    </plugin>
+                    <!-- Deploy the ear and invoke the imbedded CORBA app client  -->
+                    <!-- ======================================================== -->
+                    <!-- ===================================================================== -->
+                    <!-- Setup the client log file location for access by the CORBA app client -->
+                    <!-- ===================================================================== -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-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>
+                            <!-- ============================================================================= -->
+                            <!-- These modules must be running before deploying a CORBA module can be deployed -->
+                            <!-- ============================================================================= -->
+                            <execution>
+                                <id>start-j2ee-corba-yoko</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>openejb-corba-deployer</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+        
+                            <!-- ======================= -->
+                            <!-- Deploy the CORBA module -->
+                            <!-- ======================= -->
+                            <execution>
+                                <id>deploy-ear</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+        
+                            <!-- =========================== -->
+                            <!-- Invoke the CORBA app client -->
+                            <!-- =========================== -->
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.testsuite/corba-helloworld-client/${version}/car</moduleId>
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                </configuration>
+                            </execution>
+        
+                            <!-- ========================= -->
+                            <!-- Undeploy the CORBA module -->
+                            <!-- ========================= -->
+                            <execution>
+                                <id>undeploy-ear</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <!-- "ear" packaging doesn't compile test classes -->
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>testCompile</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                </plugins>
+            </build>
+            
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml Tue Mar 16 17:27:07 2010
@@ -30,13 +30,19 @@
     <name>Geronimo TestSuite :: CORBA TestSuite :: Hello World EJB</name>
     <packaging>ejb</packaging>
     <description>Geronimo Hello World Enterprise Stateless EJB</description>
+    
+    <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>
 
-    <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/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml Tue Mar 16 17:27:07 2010
@@ -33,23 +33,29 @@
     <packaging>war</packaging>
     <description>Geronimo Hello World Enterprise Web Application</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>corba-helloworld-ejb</artifactId>
-            <version>${version}</version>
-            <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-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <dependencies>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-helloworld-ejb</artifactId>
+                    <version>${version}</version>
+                    <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-servlet_2.5_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
 
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml Tue Mar 16 17:27:07 2010
@@ -33,36 +33,42 @@
     <packaging>jar</packaging>
     <description>Example using CORBA to access a stateless EJB</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>corba-marshal-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <description>Geronimo Marshal Enterprise Application CORBA Client JAR</description>
-                    <displayName>Geronimo Marshal Enterprise Application CORBA Client JAR</displayName>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.testsuite.corba.marshal.MarshalEJBClient</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <dependencies>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-marshal-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <configuration>
+                            <description>Geronimo Marshal Enterprise Application CORBA Client JAR</description>
+                            <displayName>Geronimo Marshal Enterprise Application CORBA Client JAR</displayName>
+                            <archive>
+                                <manifest>
+                                    <mainClass>org.apache.geronimo.testsuite.corba.marshal.MarshalEJBClient</mainClass>
+                                </manifest>
+                            </archive>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
 
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml Tue Mar 16 17:27:07 2010
@@ -37,137 +37,143 @@
         <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>corba-marshal-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>corba-marshal-client</artifactId>
-            <version>${version}</version>
-            <type>jar</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>
-                    <description>Geronimo Marshal Enterprise Application EAR</description>
-                    <displayName>Geronimo Marshal Enterprise Application EAR</displayName>
-                    <version>5</version>
-                    <modules>
-                        <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>corba-marshal-ejb</artifactId>
-                            <bundleFileName>corba-marshal-ejb-${version}.jar</bundleFileName>
-                        </ejbModule>
-                        <jarModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>corba-marshal-client</artifactId>
-                            <bundleFileName>corba-marshal-client-${version}.jar</bundleFileName>
-                        </jarModule>
-                    </modules>
-                </configuration>
-            </plugin>
-
-            <!-- Deploy the ear and invoke the imbedded CORBA app client -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-
-                <executions>
-                    <!-- These modules must be running before deploying a CORBA module can be deployed -->
-                    <execution>
-                        <id>start-j2ee-corba-yoko</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>openejb-corba-deployer</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-
-                    <!-- Deploy the CORBA module -->
-                    <execution>
-                        <id>deploy-ear</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <!-- Invoke the CORBA app client -->
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <id>run-client</id>
-                        <goals>
-                            <goal>run-client</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.testsuite/corba-marshal-client/${version}/car</moduleId>
-                            <!--
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
-                            -->
-                        </configuration>
-                    </execution>
-
-                    <!-- Undeploy the CORBA module -->
-                    <execution>
-                        <id>undeploy-ear</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <dependencies>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-marshal-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                </dependency>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-marshal-client</artifactId>
+                    <version>${version}</version>
+                    <type>jar</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>
+                            <description>Geronimo Marshal Enterprise Application EAR</description>
+                            <displayName>Geronimo Marshal Enterprise Application EAR</displayName>
+                            <version>5</version>
+                            <modules>
+                                <ejbModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>corba-marshal-ejb</artifactId>
+                                    <bundleFileName>corba-marshal-ejb-${version}.jar</bundleFileName>
+                                </ejbModule>
+                                <jarModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>corba-marshal-client</artifactId>
+                                    <bundleFileName>corba-marshal-client-${version}.jar</bundleFileName>
+                                </jarModule>
+                            </modules>
+                        </configuration>
+                    </plugin>
+        
+                    <!-- Deploy the ear and invoke the imbedded CORBA app client -->
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+        
+                        <executions>
+                            <!-- These modules must be running before deploying a CORBA module can be deployed -->
+                            <execution>
+                                <id>start-j2ee-corba-yoko</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>openejb-corba-deployer</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+        
+                            <!-- Deploy the CORBA module -->
+                            <execution>
+                                <id>deploy-ear</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+        
+                            <!-- Invoke the CORBA app client -->
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.testsuite/corba-marshal-client/${version}/car</moduleId>
+                                    <!--
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                    -->
+                                </configuration>
+                            </execution>
+        
+                            <!-- Undeploy the CORBA module -->
+                            <execution>
+                                <id>undeploy-ear</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                </plugins>
+            </build>
 
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml Tue Mar 16 17:27:07 2010
@@ -31,12 +31,18 @@
     <packaging>ejb</packaging>
     <description>Geronimo Marshal Enterprise Stateless EJB</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/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml Tue Mar 16 17:27:07 2010
@@ -36,170 +36,176 @@
     <properties>
         <container>jetty6</container>
     </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>corba-mytime-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>corba-mytime-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <type>jar</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>
-                    <description>Geronimo My Time Enterprise Application EAR</description>
-                    <displayName>Geronimo My Time Enterprise Application EAR</displayName>
-                    <version>5</version>
-                    <modules>
-                        <webModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>corba-mytime-war</artifactId>
-                            <contextRoot>/corba-mytime</contextRoot>
-                            <bundleFileName>corba-mytime-war-${version}.war</bundleFileName>
-                        </webModule>
-                        <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>corba-mytime-ejb</artifactId>
-                            <bundleFileName>corba-mytime-ejb-${version}.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>
-
-            <!-- Start the selenium server for browser invocation and testing -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-            </plugin>
-
-            <!-- Start the Geronimo server in the pre-integration-test and
-                 stop  the Geronimo server in the post-integration-test phase -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-
-                    <!-- These two modules must be running before a CORBA module can be deployed -->
-                    <execution>
-                        <id>start-j2ee-corba-yoko</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-module</goal>
-                        </goals>
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+
+            <dependencies>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-mytime-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                </dependency>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-mytime-war</artifactId>
+                    <version>${version}</version>
+                    <type>war</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    <type>jar</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>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
+                            <description>Geronimo My Time Enterprise Application EAR</description>
+                            <displayName>Geronimo My Time Enterprise Application EAR</displayName>
+                            <version>5</version>
+                            <modules>
+                                <webModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>corba-mytime-war</artifactId>
+                                    <contextRoot>/corba-mytime</contextRoot>
+                                    <bundleFileName>corba-mytime-war-${version}.war</bundleFileName>
+                                </webModule>
+                                <ejbModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>corba-mytime-ejb</artifactId>
+                                    <bundleFileName>corba-mytime-ejb-${version}.jar</bundleFileName>
+                                </ejbModule>
+                            </modules>
                         </configuration>
-                    </execution>
-                    <execution>
-                        <id>openejb-corba-deployer</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-module</goal>
-                        </goals>
+                    </plugin>
+        
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
                         </configuration>
-                    </execution>
-
-                    <!-- Deploy the CORBA module -->
-                    <execution>
-                        <id>deploy-ear</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <!-- Undeploy the CORBA module -->
-                    <execution>
-                        <id>undeploy-ear</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Compile the test class(es), which is not done by default for an "ear" package -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Process the test resource (i.e., testng.xml), which is not done by default for an "ear" package -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testResources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
+                    </plugin>
+        
+                    <!-- Start the selenium server for browser invocation and testing -->
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
+        
+                    <!-- Start the Geronimo server in the pre-integration-test and
+                         stop  the Geronimo server in the post-integration-test phase -->
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+        
+                            <!-- These two modules must be running before a CORBA module can be deployed -->
+                            <execution>
+                                <id>start-j2ee-corba-yoko</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>openejb-corba-deployer</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+        
+                            <!-- Deploy the CORBA module -->
+                            <execution>
+                                <id>deploy-ear</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+        
+                            <!-- Undeploy the CORBA module -->
+                            <execution>
+                                <id>undeploy-ear</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <!-- Compile the test class(es), which is not done by default for an "ear" package -->
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>testCompile</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <!-- Process the test resource (i.e., testng.xml), which is not done by default for an "ear" package -->
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>testResources</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                </plugins>
+            </build>
 
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml Tue Mar 16 17:27:07 2010
@@ -31,12 +31,18 @@
     <packaging>ejb</packaging>
     <description>Geronimo My Time Enterprise Stateless EJB</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/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml Tue Mar 16 17:27:07 2010
@@ -33,23 +33,29 @@
     <packaging>war</packaging>
     <description>Geronimo My Time Enterprise Web Application</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>corba-mytime-ejb</artifactId>
-            <version>${version}</version>
-            <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-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <dependencies>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-mytime-ejb</artifactId>
+                    <version>${version}</version>
+                    <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-servlet_2.5_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
 
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml Tue Mar 16 17:27:07 2010
@@ -26,135 +26,141 @@
     <artifactId>jca-cms-ear</artifactId>
     <name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security EAR</name>
     <packaging>ear</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-xa</artifactId>
-            <type>rar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>jca-cms-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.
-                        -->
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+
+            <dependencies>
+                <dependency>
+                    <groupId>org.tranql</groupId>
+                    <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                    <type>rar</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>jca-cms-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>
-                            <grandParent>true</grandParent>
+                            <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>jca-cms-war</artifactId>
+                                    <contextRoot>/jca-cms</contextRoot>
+                                    <bundleFileName>web.war</bundleFileName>
+                                </webModule>
+                                <rarModule>
+                                    <groupId>org.tranql</groupId>
+                                    <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                                    <bundleFileName>tranql.rar</bundleFileName>
+                                </rarModule>
+                            </modules>
                         </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>jca-cms-war</artifactId>
-                            <contextRoot>/jca-cms</contextRoot>
-                            <bundleFileName>web.war</bundleFileName>
-                        </webModule>
-                        <rarModule>
-                            <groupId>org.tranql</groupId>
-                            <artifactId>tranql-connector-derby-embed-xa</artifactId>
-                            <bundleFileName>tranql.rar</bundleFileName>
-                        </rarModule>
-                    </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>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-            </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-module</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>
+        
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </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-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/jca-cms-tests/jca-cms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml?rev=923884&r1=923883&r2=923884&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml Tue Mar 16 17:27:07 2010
@@ -28,35 +28,41 @@
     <name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security WAR</name>
     <packaging>war</packaging>
     
-    <dependencies>
-        <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-annotation_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+    <profiles>
+        <profile>
+            <id>child</id>   
+            
+            <dependencies>
+                <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-annotation_1.0_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-security</artifactId>
+                    <version>${version}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
     
-    <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>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+        </profile>
+    </profiles>
 </project>



Mime
View raw message