geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r832538 [1/2] - in /geronimo/server/branches/2.2: ./ framework/configs/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/ framework/configs/geronimo-gbean-deplo...
Date Tue, 03 Nov 2009 20:28:13 GMT
Author: djencks
Date: Tue Nov  3 20:28:11 2009
New Revision: 832538

URL: http://svn.apache.org/viewvc?rev=832538&view=rev
Log:
GERONIMO-4655 Try to set up build so that all-subprojects profile will build but not test all integration tests, also do not deploy its, also rename geronimo-gbean-deployer integration tests to have unique and informative names

Added:
    geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/
      - copied from r832528, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/
    geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/
      - copied from r832528, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/
    geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/
      - copied from r832528, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/
    geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/
      - copied from r832528, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/
Removed:
    geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/
    geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/
    geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/
    geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/
Modified:
    geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
    geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
    geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml
    geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
    geronimo/server/branches/2.2/framework/configs/pom.xml
    geronimo/server/branches/2.2/plugins/activemq/activemq-server/pom.xml
    geronimo/server/branches/2.2/plugins/activemq/pom.xml
    geronimo/server/branches/2.2/plugins/clustering/clustering-it/plugin-farm-it/pom.xml
    geronimo/server/branches/2.2/plugins/clustering/clustering-it/pom.xml
    geronimo/server/branches/2.2/plugins/clustering/pom.xml
    geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml
    geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty-server/pom.xml
    geronimo/server/branches/2.2/plugins/monitoring/pom.xml
    geronimo/server/branches/2.2/pom.xml
    geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-client-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml

Modified: geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?rev=832538&r1=832528&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml Tue Nov  3 20:28:11 2009
@@ -29,8 +29,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.buildsupport.it</groupId>
-    <artifactId>j2ee-system</artifactId>
-    <name>Geronimo Configs :: J2EE System</name>
+    <artifactId>j2ee-system-it1</artifactId>
+    <name>Geronimo Configs :: J2EE System IT1</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -209,6 +209,13 @@
 
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml?rev=832538&r1=832528&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml Tue Nov  3 20:28:11 2009
@@ -29,8 +29,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.buildsupport.it</groupId>
-    <artifactId>j2ee-system-2</artifactId>
-    <name>Geronimo Configs :: J2EE System</name>
+    <artifactId>j2ee-system-it2</artifactId>
+    <name>Geronimo Configs :: J2EE System IT2</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -206,6 +206,13 @@
                     <config-xml-content load = "false"/>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml?rev=832538&r1=832528&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml Tue Nov  3 20:28:11 2009
@@ -31,8 +31,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.buildsupport.it</groupId>
-    <artifactId>metadatageneration</artifactId>
-    <name>Metadata generation test</name>
+    <artifactId>metadatageneration-it3</artifactId>
+    <name>Metadata generation test it3</name>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -161,6 +161,13 @@
                     </instance>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml?rev=832538&r1=832528&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml Tue Nov  3 20:28:11 2009
@@ -31,8 +31,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.buildsupport.it</groupId>
-    <artifactId>metadatatest-2</artifactId>
-    <name>Metadata test 2</name>
+    <artifactId>metadatatest-it4</artifactId>
+    <name>Metadata test  it4</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -106,6 +106,13 @@
                     </instance>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.2/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/pom.xml (original)
+++ geronimo/server/branches/2.2/framework/configs/pom.xml Tue Nov  3 20:28:11 2009
@@ -99,10 +99,10 @@
             <id>all-subprojects</id>
             <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
             <modules>
-                <module>geronimo-gbean-deployer/src/it/j2ee-system</module>
-                <module>geronimo-gbean-deployer/src/it/j2ee-system-2</module>
-                <module>geronimo-gbean-deployer/src/it/metadatageneration</module>
-                <module>geronimo-gbean-deployer/src/it/metadatageneration-2</module>
+                <module>geronimo-gbean-deployer/src/it/j2ee-system-it1</module>
+                <module>geronimo-gbean-deployer/src/it/j2ee-system-it2</module>
+                <module>geronimo-gbean-deployer/src/it/metadatageneration-it3</module>
+                <module>geronimo-gbean-deployer/src/it/metadatageneration-it4</module>
             </modules>
         </profile>
 

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-server/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-server/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-server/pom.xml Tue Nov  3 20:28:11 2009
@@ -200,6 +200,13 @@
                     </servers>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.2/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/activemq/pom.xml Tue Nov  3 20:28:11 2009
@@ -55,6 +55,12 @@
                 <module>activemq-server</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            <modules>
+                <module>activemq-server</module>
+            </modules>
+        </profile>
     </profiles>
 
     <properties>

Modified: geronimo/server/branches/2.2/plugins/clustering/clustering-it/plugin-farm-it/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/clustering-it/plugin-farm-it/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/clustering-it/plugin-farm-it/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/clustering/clustering-it/plugin-farm-it/pom.xml Tue Nov  3 20:28:11 2009
@@ -273,11 +273,21 @@
                     <category>Clustering</category>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/branches/2.2/plugins/clustering/clustering-it/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/clustering-it/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/clustering-it/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/clustering/clustering-it/pom.xml Tue Nov  3 20:28:11 2009
@@ -39,5 +39,16 @@
         <module>clustering-test</module>
         <module>plugin-farm-it</module>
     </modules>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>
\ No newline at end of file

Modified: geronimo/server/branches/2.2/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/clustering/pom.xml Tue Nov  3 20:28:11 2009
@@ -55,6 +55,12 @@
                 <module>clustering-it</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            <modules>
+                <module>clustering-it</module>
+            </modules>
+        </profile>
     </profiles>
 
     <properties>

Modified: geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml Tue Nov  3 20:28:11 2009
@@ -44,40 +44,56 @@
         
     </dependencies>
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                        <systemProperties>
-                            <property>
-                                <name>geronimoVersion</name>
-                                <value>${version}</value>
-                            </property>
-                        </systemProperties>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>testsuite-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>generate-surefire-xml</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <suiteXmlFiles>
+                                    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                                </suiteXmlFiles>
+                                <systemProperties>
+                                    <property>
+                                        <name>geronimoVersion</name>
+                                        <value>${version}</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>testsuite-maven-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>generate-surefire-xml</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty-server/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty-server/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty-server/pom.xml Tue Nov  3 20:28:11 2009
@@ -201,145 +201,152 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>start</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-server</goal>
-                        </goals>
-                        <configuration>
-                            <logOutput>true</logOutput>
-                            <background>true</background>
-                            <systemProperties>
-                                <property>
-                                    <name>browser</name>
-                                    <value>${browser}</value>
-                                </property>
-                            </systemProperties>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>stop</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop-server</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <inherited>false</inherited>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
-                   <assemblyArchive>${project.build.directory}/${pom.artifactId}-${pom.version}-bin.zip</assemblyArchive>
-                    <optionSets>
-                        <optionSet>
-                            <id>morememory</id>
-                            <options>
-                                <option>-Xmx512m</option>
-                                <option>-XX:MaxPermSize=128m</option>
-                            </options>
-                        </optionSet>
-
-                        <optionSet>
-                            <id>debug</id>
-                            <options>
-                                <option>-Xdebug</option>
-                                <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
-                            </options>
-                        </optionSet>
-                    </optionSets>
+                    <skip>true</skip>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>start</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-server</goal>
-                        </goals>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>start</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-server</goal>
+                                </goals>
+                                <configuration>
+                                    <logOutput>true</logOutput>
+                                    <background>true</background>
+                                    <systemProperties>
+                                        <property>
+                                            <name>browser</name>
+                                            <value>${browser}</value>
+                                        </property>
+                                    </systemProperties>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop-server</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <inherited>false</inherited>
                         <configuration>
-                            <logOutput>true</logOutput>
-                            <background>true</background>
-                            <verifyTimeout>300</verifyTimeout>
-                            <refresh>true</refresh>
+                           <assemblyArchive>${project.build.directory}/${pom.artifactId}-${pom.version}-bin.zip</assemblyArchive>
                             <optionSets>
                                 <optionSet>
-                                    <id>default</id>
+                                    <id>morememory</id>
+                                    <options>
+                                        <option>-Xmx512m</option>
+                                        <option>-XX:MaxPermSize=128m</option>
+                                    </options>
+                                </optionSet>
+
+                                <optionSet>
+                                    <id>debug</id>
                                     <options>
-                                       <option>-XX:MaxPermSize=128m</option>
+                                        <option>-Xdebug</option>
+                                        <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
                                     </options>
                                 </optionSet>
                             </optionSets>
                         </configuration>
-                    </execution>
-                    <execution>
-                        <id>stop</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>stop-server</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>shitty-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <projects>
-                        <fileset>
-                            <directory>${project.basedir}</directory>
-                            <includes>
-                                <include>${shittyTestIncludes}</include>
-                            </includes>
-                            <excludes>
-                                <exclude>${shittyTestExcludes}</exclude>
-                            </excludes>
-                        </fileset>
-                    </projects>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>clean</goal>
-                            <goal>install</goal>
-                            <goal>test</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>testsuite-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>summarize</id>
-                        <phase>post-site</phase>
-                        <goals>
-                            <goal>summarize</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>all-subprojects</id>
-            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
-            <modules>
-                <module>mconsole-itest-simple</module>
-            </modules>
+                        <executions>
+                            <execution>
+                                <id>start</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-server</goal>
+                                </goals>
+                                <configuration>
+                                    <logOutput>true</logOutput>
+                                    <background>true</background>
+                                    <verifyTimeout>300</verifyTimeout>
+                                    <refresh>true</refresh>
+                                    <optionSets>
+                                        <optionSet>
+                                            <id>default</id>
+                                            <options>
+                                               <option>-XX:MaxPermSize=128m</option>
+                                            </options>
+                                        </optionSet>
+                                    </optionSets>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>stop</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>stop-server</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>shitty-maven-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <projects>
+                                <fileset>
+                                    <directory>${project.basedir}</directory>
+                                    <includes>
+                                        <include>${shittyTestIncludes}</include>
+                                    </includes>
+                                    <excludes>
+                                        <exclude>${shittyTestExcludes}</exclude>
+                                    </excludes>
+                                </fileset>
+                            </projects>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>clean</goal>
+                                    <goal>install</goal>
+                                    <goal>test</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>testsuite-maven-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>summarize</id>
+                                <phase>post-site</phase>
+                                <goals>
+                                    <goal>summarize</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
 

Modified: geronimo/server/branches/2.2/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/monitoring/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/monitoring/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/monitoring/pom.xml Tue Nov  3 20:28:11 2009
@@ -72,6 +72,13 @@
                 <module>mconsole-jetty-server</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-submodules</id>
+            <modules>
+                <module>mconsole-jetty-server</module>
+                <module>mconsole-jetty-server/mconsole-itest-simple</module>
+            </modules>
+        </profile>
     </profiles>
 
     <build>        

Modified: geronimo/server/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Tue Nov  3 20:28:11 2009
@@ -2160,6 +2160,19 @@
             </modules>
         </profile>
 
+        <profile>
+            <id>all-subprojects</id>
+
+            <modules>
+                <module>testsupport</module>
+                <module>framework</module>
+                <module>plugins</module>
+                <module>plugingroups</module>
+                <module>assemblies</module>
+                <module>testsuite</module>
+            </modules>
+        </profile>
+
         <!--
         NOTE: This profile is used to enable plugin prefixes for easy command-line usage, as in:
 

Modified: geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml Tue Nov  3 20:28:11 2009
@@ -97,97 +97,6 @@
                 </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>
@@ -203,4 +112,106 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <!-- 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>
+                    
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

Modified: geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml Tue Nov  3 20:28:11 2009
@@ -84,76 +84,85 @@
                 </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>it</id>
+            <build>
+                <plugins>
+                    <!-- 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.2/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml Tue Nov  3 20:28:11 2009
@@ -20,7 +20,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,13 +34,13 @@
     <artifactId>corba-mytime-ear</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: My Time EAR</name>
     <packaging>ear</packaging>
-    
+
     <description>Example using CORBA to access a stateless EJB</description>
-    
+
     <!--
     FIXME: Split this module up... one to build the ear, one to run the tests.
     -->
-    
+
     <properties>
         <container>jetty7</container>
     </properties>
@@ -51,24 +52,24 @@
             <version>${version}</version>
             <type>ejb</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.testsuite</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>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <type>jar</type>
-       </dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>ejb31-api-experimental</artifactId>
+            <type>jar</type>
+        </dependency>
     </dependencies>
 
     <build>
@@ -96,71 +97,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                </configuration>
-            </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>
@@ -184,7 +120,84 @@
                     </execution>
                 </executions>
             </plugin>
+            
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+
+                    <!-- 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>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-client-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-client-tests/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-client-tests/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-client-tests/pom.xml Tue Nov  3 20:28:11 2009
@@ -63,61 +63,70 @@
                 </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>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>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleId>JEE5/SecClient/1.1/jar</moduleId>
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
+                            <systemProperties>
+                                <property>
+                                    <name>clientLogFile</name>
+                                    <value>${clientLogFile}</value>
+                                </property>
+                            </systemProperties>
                         </configuration>
-                    </execution>
+                    </plugin>
 
-                    <execution>
-                        <id>undeploy-client-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/SecClientServer/1.1/jar</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                    <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/SecClient/1.1/jar</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/SecClientServer/1.1/jar</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
 

Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml Tue Nov  3 20:28:11 2009
@@ -94,22 +94,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                    <systemProperties>
-                        <property>
-                            <name>clientLogFile</name>
-                            <value>${clientLogFile}</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-
             <!-- "ear" packaging doesn't compile test classes -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -135,49 +119,74 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <id>run-client</id>
-                        <goals>
-                            <goal>run-client</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/SecClient/1.1/jar</moduleId>
-                            <!--<moduleId>${groupId}/${artifactId}/${version/jar</moduleId>-->
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                            <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</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/SecClient/1.1/jar</moduleId>
+                                    <!--<moduleId>${groupId}/${artifactId}/${version/jar</moduleId>-->
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>



Mime
View raw message