geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r944157 [1/9] - in /geronimo/server/branches/2.2: ./ testsuite/ testsuite/commands-testsuite/ testsuite/commands-testsuite/deploy/ testsuite/commands-testsuite/gshell/ testsuite/commands-testsuite/jaxws/ testsuite/commands-testsuite/shutdow...
Date Fri, 14 May 2010 08:53:57 GMT
Author: xiaming
Date: Fri May 14 08:53:54 2010
New Revision: 944157

URL: http://svn.apache.org/viewvc?rev=944157&view=rev
Log:
GERONIMO-5015 Use maven-maven-plugin to run testsuite in batch mode like in 2.1 branch, change some of cases to use failsafe plugin

Modified:
    geronimo/server/branches/2.2/pom.xml
    geronimo/server/branches/2.2/testsuite/commands-testsuite/deploy/pom.xml
    geronimo/server/branches/2.2/testsuite/commands-testsuite/gshell/pom.xml
    geronimo/server/branches/2.2/testsuite/commands-testsuite/jaxws/pom.xml
    geronimo/server/branches/2.2/testsuite/commands-testsuite/pom.xml
    geronimo/server/branches/2.2/testsuite/commands-testsuite/shutdown/pom.xml
    geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/pom.xml
    geronimo/server/branches/2.2/testsuite/concurrent-testsuite/pom.xml
    geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml
    geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml
    geronimo/server/branches/2.2/testsuite/console-testsuite/pom.xml
    geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/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-helloworld/pom.xml
    geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/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-marshal/pom.xml
    geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/pom.xml
    geronimo/server/branches/2.2/testsuite/corba-testsuite/pom.xml
    geronimo/server/branches/2.2/testsuite/deployment-testsuite/deployment-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
    geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/deployment-testsuite/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/ejb-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jms-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/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/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/pom.xml
    geronimo/server/branches/2.2/testsuite/security-testsuite/pom.xml
    geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-tomcat/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-forward/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-references/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxrpc-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-catalog-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-provider-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml

Modified: geronimo/server/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Fri May 14 08:53:54 2010
@@ -2122,6 +2122,19 @@
                 <module>testsuite</module>
             </modules>
         </profile>
+        
+        <profile>
+            <id>it-manual</id>
+
+            <modules>
+                <module>testsupport</module>
+                <module>framework</module>
+                <module>plugins</module>
+                <module>plugingroups</module>
+                <module>assemblies</module>
+                <module>testsuite</module>
+            </modules>
+        </profile>
 
         <profile>
             <id>all-subprojects</id>

Modified: geronimo/server/branches/2.2/testsuite/commands-testsuite/deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/commands-testsuite/deploy/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/commands-testsuite/deploy/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/commands-testsuite/deploy/pom.xml Fri May 14 08:53:54 2010
@@ -30,5 +30,19 @@
     <description>
         Test for the deploy.bat/sh
     </description>
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>        
+    </profiles>
 
 </project>

Modified: geronimo/server/branches/2.2/testsuite/commands-testsuite/gshell/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/commands-testsuite/gshell/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/commands-testsuite/gshell/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/commands-testsuite/gshell/pom.xml Fri May 14 08:53:54 2010
@@ -31,4 +31,18 @@
         Test for the gsh.bat/sh
     </description>
 
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>        
+    </profiles>
+
 </project>

Modified: geronimo/server/branches/2.2/testsuite/commands-testsuite/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/commands-testsuite/jaxws/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/commands-testsuite/jaxws/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/commands-testsuite/jaxws/pom.xml Fri May 14 08:53:54 2010
@@ -50,26 +50,32 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>project.build.directory</name>
-                            <value>${project.build.directory}</value>
-                        </property>
-                        <property>
-                            <name>project.directory</name>
-                            <value>${basedir}</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemProperties>
+                                <property>
+                                    <name>project.build.directory</name>
+                                    <value>${project.build.directory}</value>
+                                </property>
+                                <property>
+                                    <name>project.directory</name>
+                                    <value>${basedir}</value>
+                                </property>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+    </profiles>    
 
 </project>

Modified: geronimo/server/branches/2.2/testsuite/commands-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/commands-testsuite/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/commands-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/commands-testsuite/pom.xml Fri May 14 08:53:54 2010
@@ -40,36 +40,50 @@
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
             <artifactId>testsupport-commands</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </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>
-    </build>
+
 
     <profiles>
         <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>maven-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>it-manual</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>maven-maven-plugin</artifactId>
+                    </plugin>                    
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>child</id>
+        </profile>
+        
+        <profile>
             <id>all-subprojects</id>
-            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
             <modules>
                 <module>deploy</module>
                 <module>gshell</module>
@@ -78,4 +92,5 @@
             </modules>
         </profile>
     </profiles>
+
 </project>

Modified: geronimo/server/branches/2.2/testsuite/commands-testsuite/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/commands-testsuite/shutdown/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/commands-testsuite/shutdown/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/commands-testsuite/shutdown/pom.xml Fri May 14 08:53:54 2010
@@ -31,4 +31,18 @@
         Test for the shutdown.bat/sh
     </description>
 
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml Fri May 14 08:53:54 2010
@@ -1,183 +1,188 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev: 618875 $ $Date: 2008-02-05 23:04:08 -0500 (Tue, 05 Feb 2008) $ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>concurrent-basic</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>concurrent-ejb-ear</artifactId>
-    <name>Geronimo TestSuite :: Concurrent TestSuite :: EJB EAR</name>
-    <packaging>ear</packaging>
-
-    <description>This project executes testcases for your testsuite</description>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-concurrent-management</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-crypto</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-ra</artifactId>
-            <version>1.3</version>
-            <type>rar</type>
-        </dependency>
-                
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>concurrent-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>common-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>common-jar</artifactId>
-            <version>${version}</version>
-            <type>jar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>test</scope>
-       </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-client</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <displayName>Concurrent TestSuite EAR</displayName>
-                    <description>Concurrent TestSuite EAR</description>
-                    <version>5</version>
-                    <modules>
-                        <ejbModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>common-ejb</artifactId>
-                            <bundleFileName>common-ejb-${version}.jar</bundleFileName>
-                        </ejbModule>
-                        <ejbModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>concurrent-ejb</artifactId>
-                            <bundleFileName>concurrent-ejb-${version}.jar</bundleFileName>
-                        </ejbModule>
-                    </modules>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>webAppName</name>
-                            <value>concurrent</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-wars</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-                            
-                    <execution>
-                        <id>undeploy-war-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+
+	<!--
+		$Rev: 618875 $ $Date: 2008-02-05 23:04:08 -0500 (Tue, 05 Feb 2008) $
+	-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>concurrent-basic</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>concurrent-ejb-ear</artifactId>
+	<name>Geronimo TestSuite :: Concurrent TestSuite :: EJB EAR</name>
+	<packaging>ear</packaging>
+
+	<description>This project executes testcases for your testsuite</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.modules</groupId>
+			<artifactId>geronimo-concurrent-management</artifactId>
+			<version>${version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.framework</groupId>
+			<artifactId>geronimo-crypto</artifactId>
+			<version>${version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.tranql</groupId>
+			<artifactId>tranql-connector-ra</artifactId>
+			<version>1.3</version>
+			<type>rar</type>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>concurrent-ejb</artifactId>
+			<version>${version}</version>
+			<type>ejb</type>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>common-ejb</artifactId>
+			<version>${version}</version>
+			<type>ejb</type>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>common-jar</artifactId>
+			<version>${version}</version>
+			<type>jar</type>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-ejb_3.0_spec</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.openejb</groupId>
+			<artifactId>ejb31-api-experimental</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.framework</groupId>
+			<artifactId>geronimo-security</artifactId>
+			<version>${version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.openejb</groupId>
+			<artifactId>openejb-client</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-ear-plugin</artifactId>
+						<configuration>
+							<displayName>Concurrent TestSuite EAR</displayName>
+							<description>Concurrent TestSuite EAR</description>
+							<version>5</version>
+							<modules>
+								<ejbModule>
+									<groupId>org.apache.geronimo.testsuite</groupId>
+									<artifactId>common-ejb</artifactId>
+									<bundleFileName>common-ejb-${version}.jar</bundleFileName>
+								</ejbModule>
+								<ejbModule>
+									<groupId>org.apache.geronimo.testsuite</groupId>
+									<artifactId>concurrent-ejb</artifactId>
+									<bundleFileName>concurrent-ejb-${version}.jar</bundleFileName>
+								</ejbModule>
+							</modules>
+						</configuration>
+					</plugin>
+					<plugin>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<executions>
+							<execution>
+								<goals>
+									<goal>testCompile</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-failsafe-plugin</artifactId>
+						<configuration>
+							<systemPropertyVariables>
+								<property>
+									<name>webAppName</name>
+									<value>concurrent</value>
+								</property>
+							</systemPropertyVariables>
+						</configuration>						
+					</plugin>
+					<plugin>
+						<groupId>org.apache.geronimo.buildsupport</groupId>
+						<artifactId>geronimo-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>deploy-wars</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>deploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+								</configuration>
+							</execution>
+
+							<execution>
+								<id>undeploy-war-as-moduleId</id>
+								<phase>post-integration-test</phase>
+								<goals>
+									<goal>undeploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 
 </project>
 

Modified: geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml Fri May 14 08:53:54 2010
@@ -1,82 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>concurrent-basic</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>concurrent-ejb</artifactId>
-    <name>Geronimo TestSuite :: Concurrent TestSuite :: EJB</name>
-    <packaging>jar</packaging>
-
-    <description>This project executes testcases for your testsuite</description>
-
-   <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-concurrent_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</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.testsuite</groupId>
-            <artifactId>common-jar</artifactId>
-            <version>${version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>concurrent-basic</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>concurrent-ejb</artifactId>
+	<name>Geronimo TestSuite :: Concurrent TestSuite :: EJB</name>
+	<packaging>jar</packaging>
+
+	<description>This project executes testcases for your testsuite</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-concurrent_1.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-ejb_3.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openejb</groupId>
+			<artifactId>ejb31-api-experimental</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.testsuite</groupId>
+			<artifactId>common-jar</artifactId>
+			<version>${version}</version>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<configuration>
+							<archive>
+								<manifest>
+									<addClasspath>true</addClasspath>
+								</manifest>
+							</archive>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
 

Modified: geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml Fri May 14 08:53:54 2010
@@ -1,151 +1,156 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev: 618875 $ $Date: 2008-02-05 23:04:08 -0500 (Tue, 05 Feb 2008) $ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>concurrent-basic</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>concurrent-web-ear</artifactId>
-    <name>Geronimo TestSuite :: Concurrent TestSuite :: WEB EAR</name>
-    <packaging>ear</packaging>
-
-    <description>This project executes testcases for your testsuite</description>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-concurrent-management</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-crypto</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-ra</artifactId>
-            <version>1.3</version>
-            <type>rar</type>
-        </dependency>
-                
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>concurrent-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>common-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <displayName>Concurrent TestSuite EAR</displayName>
-                    <description>Concurrent TestSuite EAR</description>
-                    <version>5</version>
-                    <modules>
-                        <ejbModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>common-ejb</artifactId>
-                            <bundleFileName>common-ejb-${version}.jar</bundleFileName>
-                        </ejbModule>
-                        <webModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>concurrent-war</artifactId>
-                            <contextRoot>/concurrent</contextRoot>
-                            <bundleFileName>concurrent-war-${version}.war</bundleFileName>
-                        </webModule>
-                    </modules>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>webAppName</name>
-                            <value>concurrent</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-wars</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-                            
-                    <execution>
-                        <id>undeploy-war-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+
+	<!--
+		$Rev: 618875 $ $Date: 2008-02-05 23:04:08 -0500 (Tue, 05 Feb 2008) $
+	-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>concurrent-basic</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>concurrent-web-ear</artifactId>
+	<name>Geronimo TestSuite :: Concurrent TestSuite :: WEB EAR</name>
+	<packaging>ear</packaging>
+
+	<description>This project executes testcases for your testsuite</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.modules</groupId>
+			<artifactId>geronimo-concurrent-management</artifactId>
+			<version>${version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.framework</groupId>
+			<artifactId>geronimo-crypto</artifactId>
+			<version>${version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.tranql</groupId>
+			<artifactId>tranql-connector-ra</artifactId>
+			<version>1.3</version>
+			<type>rar</type>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>concurrent-war</artifactId>
+			<version>${version}</version>
+			<type>war</type>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>common-ejb</artifactId>
+			<version>${version}</version>
+			<type>ejb</type>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<plugins>
+
+					<plugin>
+						<artifactId>maven-ear-plugin</artifactId>
+						<configuration>
+							<displayName>Concurrent TestSuite EAR</displayName>
+							<description>Concurrent TestSuite EAR</description>
+							<version>5</version>
+							<modules>
+								<ejbModule>
+									<groupId>org.apache.geronimo.testsuite</groupId>
+									<artifactId>common-ejb</artifactId>
+									<bundleFileName>common-ejb-${version}.jar</bundleFileName>
+								</ejbModule>
+								<webModule>
+									<groupId>org.apache.geronimo.testsuite</groupId>
+									<artifactId>concurrent-war</artifactId>
+									<contextRoot>/concurrent</contextRoot>
+									<bundleFileName>concurrent-war-${version}.war</bundleFileName>
+								</webModule>
+							</modules>
+						</configuration>
+					</plugin>
+					<plugin>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<executions>
+							<execution>
+								<goals>
+									<goal>testCompile</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-failsafe-plugin</artifactId>
+						<configuration>
+							<systemPropertyVariables>
+								<property>
+									<name>webAppName</name>
+									<value>concurrent</value>
+								</property>
+							</systemPropertyVariables>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.geronimo.buildsupport</groupId>
+						<artifactId>geronimo-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>deploy-wars</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>deploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+								</configuration>
+							</execution>
+
+							<execution>
+								<id>undeploy-war-as-moduleId</id>
+								<phase>post-integration-test</phase>
+								<goals>
+									<goal>undeploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
 

Modified: geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/pom.xml Fri May 14 08:53:54 2010
@@ -1,44 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>concurrent-testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>concurrent-basic</artifactId>
-    <packaging>pom</packaging>
-    <name>Geronimo TestSuite :: Concurrent TestSuite :: Basic Tests</name>
-    <description>Tests for Concurrency Utilities for Java EE implementation</description>
-
-    <modules>
-        <module>common-ejb</module>
-        <module>common-jar</module>
-        <module>concurrent-war</module>
-        <module>concurrent-ejb</module>
-        <module>concurrent-web-ear</module>
-        <module>concurrent-ejb-ear</module>
-    </modules>
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>concurrent-testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>concurrent-basic</artifactId>
+	<packaging>pom</packaging>
+	<name>Geronimo TestSuite :: Concurrent TestSuite :: Basic Tests</name>
+	<description>Tests for Concurrency Utilities for Java EE implementation</description>
+
+	<profiles>
+		<profile>
+			<id>child</id>
+			<modules>
+				<module>common-ejb</module>
+				<module>common-jar</module>
+				<module>concurrent-war</module>
+				<module>concurrent-ejb</module>
+				<module>concurrent-web-ear</module>
+				<module>concurrent-ejb-ear</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>all-subprojects</id>
+			<!--
+				use for things like versions:set and perhaps release when build has
+				to run on all projects
+			-->
+			<modules>
+				<module>common-ejb</module>
+				<module>common-jar</module>
+				<module>concurrent-war</module>
+				<module>concurrent-ejb</module>
+				<module>concurrent-web-ear</module>
+				<module>concurrent-ejb-ear</module>
+			</modules>
+		</profile>
+	</profiles>
 
 </project>

Modified: geronimo/server/branches/2.2/testsuite/concurrent-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/concurrent-testsuite/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/concurrent-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/concurrent-testsuite/pom.xml Fri May 14 08:53:54 2010
@@ -1,45 +1,198 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>concurrent-testsuite</artifactId>
-    <packaging>pom</packaging>
-    <name>Geronimo TestSuite :: Concurrent TestSuite</name>
-    <description>Tests for Concurrency Utilities for Java EE implementation</description>
-
-    <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>concurrent-basic</module>
-            </modules>
-        </profile>
-    </profiles>
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
 
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>concurrent-testsuite</artifactId>
+	<packaging>pom</packaging>
+	<name>Geronimo TestSuite :: Concurrent TestSuite</name>
+	<description>Tests for Concurrency Utilities for Java EE implementation</description>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<!--  This plugin is needed for all suite poms. -->
+				<groupId>org.apache.geronimo.buildsupport</groupId>
+				<artifactId>testsuite-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-surefire-xml</id>
+						<phase>install</phase>
+						<goals>
+							<goal>generate-surefire-xml</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<skip>true</skip>
+						<testFailureIgnore>true</testFailureIgnore>
+						<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+						<reportFormat>plain</reportFormat>
+						<useFile>true</useFile>
+						<redirectTestOutputToFile>true</redirectTestOutputToFile>
+						<forkMode>once</forkMode>
+						<workingDirectory>${project.build.directory}</workingDirectory>
+						<suiteXmlFiles>
+                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+					</configuration>
+					<executions>
+						<execution>
+							<id>test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>test</goal>
+							</goals>
+							<configuration>
+								<skip>true</skip>
+							</configuration>
+						</execution>
+						<execution>
+							<id>integration</id>
+							<phase>integration-test</phase>
+							<goals>
+								<goal>test</goal>
+							</goals>
+							<configuration>
+								<testFailureIgnore>true</testFailureIgnore>
+								<skip>false</skip>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-report-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<aggregate>true</aggregate>
+						<outputDirectory>${project.build.outputDirectory}/surefire-reports</outputDirectory>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+	<profiles>
+		<profile>
+			<id>it</id>
+			<!--
+				TODO: Hook up m-m-p to allow child modules to be built early during
+				this modules compile (or something) phase.
+			-->
+			<build>
+				<plugins>
+					<plugin>
+						<!--
+							One of the pom that this invokes using m-m-p has packaging set to
+							"pom". That expects it's parent (this pom) to be installed
+							already. So installing it ahead before we invoke it in the
+							integration-test phase
+						-->
+						<artifactId>maven-install-plugin</artifactId>
+						<inherited>false</inherited>
+						<executions>
+							<execution>
+								<id>install-ahead</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>install</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.geronimo.buildsupport</groupId>
+						<artifactId>geronimo-maven-plugin</artifactId>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.geronimo.genesis.plugins</groupId>
+						<artifactId>maven-maven-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>it-manual</id>
+
+			<!--
+				TODO: Hook up m-m-p to allow child modules to be built early during
+				this modules compile (or something) phase.
+			-->
+			<build>
+				<plugins>
+					<plugin>
+						<!--
+							One of the pom that this invokes using m-m-p has packaging set to
+							"pom". That expects it's parent (this pom) to be installed
+							already. So installing it ahead before we invoke it in the
+							integration-test phase
+						-->
+						<artifactId>maven-install-plugin</artifactId>
+						<inherited>false</inherited>
+						<executions>
+							<execution>
+								<id>install-ahead</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>install</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.geronimo.genesis.plugins</groupId>
+						<artifactId>maven-maven-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>child</id>
+		</profile>
+
+		<profile>
+			<id>all-subprojects</id>
+			<!--
+				use for things like versions:set and perhaps release when build has
+				to run on all projects
+			-->
+			<modules>
+				<module>concurrent-basic</module>
+			</modules>
+		</profile>
+	</profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml Fri May 14 08:53:54 2010
@@ -1,40 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>console-testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+
+	<!--
+		$Rev$ $Date$
+	-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>console-testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
 
-    <artifactId>advanced</artifactId>
-    <name>Geronimo TestSuite :: Console Testsuite :: Advanced Tests</name>
+	<artifactId>advanced</artifactId>
+	<name>Geronimo TestSuite :: Console Testsuite :: Advanced Tests</name>
 
-    <description>
+	<description>
         Advanced test for the Geronimo console.
     </description>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<plugins>
+					<!--
+						Called by m-m-p from the parent project, do not call it separately
+					-->
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>selenium-maven-plugin</artifactId>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+	</profiles>
 
 </project>

Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml Fri May 14 08:53:54 2010
@@ -36,5 +36,26 @@
     <description>
         Basic test for the Geronimo console.
     </description>
+    <profiles>
+        <profile>
+            <!-- Called by m-m-p from the parent project, do not call it separately -->
+            <id>child</id>
+            <build>
+                <plugins>
+                   <plugin>
+                      <groupId>org.codehaus.mojo</groupId>
+                      <artifactId>selenium-maven-plugin</artifactId>
+                   </plugin>
 
+                    <plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+
+					</plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        
+    </profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/pom.xml Fri May 14 08:53:54 2010
@@ -37,30 +37,121 @@
     <description>
         Geronimo console testsuite.
     </description>
-    
+
     <build>
+        <!-- What if console testsuite use surefire plugin instead of failsafe plugin -->
         <pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.5</version>
                     <configuration>
+                        <skip>true</skip>
+                        <testFailureIgnore>true</testFailureIgnore>
+                        <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+                        <reportFormat>plain</reportFormat>
+                        <useFile>true</useFile>
+                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                        <forkMode>once</forkMode>
+                        <workingDirectory>${project.build.directory}</workingDirectory>
                         <suiteXmlFiles>
                             <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
                         </suiteXmlFiles>
-                        <systemProperties>
-                            <property>
-                                <name>geronimoVersion</name>
-                                <value>${version}</value>
-                            </property>
-                        </systemProperties>
                     </configuration>
+                    <executions>
+                        <execution>
+                            <id>test</id>
+                            <phase>test</phase>
+                            <goals>
+                                <goal>test</goal>
+                            </goals>
+                            <configuration>
+                                <skip>true</skip>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>integration</id>
+                            <phase>integration-test</phase>
+                            <goals>
+                                <goal>test</goal>
+                            </goals>
+                            <configuration>
+                                <testFailureIgnore>true</testFailureIgnore>
+                                <skip>false</skip>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-report-plugin</artifactId>
+                    <version>2.5</version>
+                    <configuration>
+                        <aggregate>true</aggregate>
+                        <outputDirectory>${project.build.outputDirectory}/surefire-reports</outputDirectory>
+                    </configuration>                                      
                 </plugin>
             </plugins>
         </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
+    
     <profiles>
         <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <!-- Console testsuite needs s-m-p to run test cases -->                    
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>maven-maven-plugin</artifactId>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>it-manual</id>
+            <build>
+                <plugins>
+                    <!-- Console testsuite needs s-m-p to run test cases -->                    
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>maven-maven-plugin</artifactId>
+                    </plugin>                    
+                </plugins>
+            </build>
+        </profile>
+
+
+        <profile>
+            <id>child</id>
+        </profile>        
+
+        <profile>
             <id>all-subprojects</id>
             <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
             <modules>

Modified: geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml Fri May 14 08:53:54 2010
@@ -65,6 +65,10 @@
        </dependency>
     </dependencies>
 
+<profiles>
+        <profile>
+            <id>child</id>
+
     <build>
         <plugins>
             <plugin>
@@ -82,5 +86,6 @@
             </plugin>
         </plugins>
     </build>
-
+</profile>
+    </profiles>
 </project>

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=944157&r1=944156&r2=944157&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 Fri May 14 08:53:54 2010
@@ -114,17 +114,18 @@
 
     <profiles>
         <profile>
-            <id>it</id>
+            <id>child</id>
             <build>
                 <plugins>
-                    <!-- Deploy the ear and invoke the imbedded CORBA app client  -->
+                    <!-- Deploy the ear and invoke the embedded 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>
+                        <!--<artifactId>maven-surefire-plugin</artifactId>-->
+                        <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
                             <systemProperties>
                                 <property>

Modified: geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-helloworld/pom.xml Fri May 14 08:53:54 2010
@@ -35,11 +35,28 @@
     <packaging>pom</packaging>
     <description>Geronimo JEE5 CORBA Hello World Tests</description>
 
-    <modules>
-        <module>corba-helloworld-ejb</module>
-        <module>corba-helloworld-war</module>
-        <module>corba-helloworld-client</module>
-        <module>corba-helloworld-ear</module>
-    </modules>
+    <profiles>
+        <profile>
+            <id>child</id>
+            <modules>
+                <module>corba-helloworld-ejb</module>
+                <module>corba-helloworld-war</module>
+                <module>corba-helloworld-client</module>
+                <module>corba-helloworld-ear</module>
+            </modules>
+        </profile>
+        
+        <profile>
+            <id>all-subprojects</id>
+            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
+            <modules>
+                <module>corba-helloworld-ejb</module>
+                <module>corba-helloworld-war</module>
+                <module>corba-helloworld-client</module>
+                <module>corba-helloworld-ear</module>
+            </modules>
+        </profile>
+        
+    </profiles>
 
 </project>

Modified: geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml Fri May 14 08:53:54 2010
@@ -1,77 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>corba-marshal</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>corba-marshal-client</artifactId>
-    <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal Client</name>
-    
-    <description>Example using CORBA to access a stateless EJB</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</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>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <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>
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+
+	<!--
+		$Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $
+	-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>corba-marshal</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>corba-marshal-client</artifactId>
+	<name>Geronimo TestSuite :: CORBA TestSuite :: Marshal Client</name>
+
+	<description>Example using CORBA to access a stateless EJB</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</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>
+		<dependency>
+			<groupId>org.apache.openejb</groupId>
+			<artifactId>ejb31-api-experimental</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<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.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=944157&r1=944156&r2=944157&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 Fri May 14 08:53:54 2010
@@ -88,7 +88,7 @@
     </build>
     <profiles>
         <profile>
-            <id>it</id>
+            <id>child</id>
             <build>
                 <plugins>
                     <!-- Deploy the ear and invoke the imbedded CORBA app client -->



Mime
View raw message