geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r944157 [2/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
Modified: geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-marshal/pom.xml Fri May 14 08:53:54 2010
@@ -1,44 +1,59 @@
 <?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-testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>corba-marshal</artifactId>
-    <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal</name>
-    <packaging>pom</packaging>
-    <description>Geronimo JEE5 CORBA Marshal Tests</description>
-
-    <modules>
-        <module>corba-marshal-ejb</module>
-        <module>corba-marshal-client</module>
-        <module>corba-marshal-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.
+	-->
+
+	<!--
+		$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-testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>corba-marshal</artifactId>
+	<name>Geronimo TestSuite :: CORBA TestSuite :: Marshal</name>
+	<packaging>pom</packaging>
+	<description>Geronimo JEE5 CORBA Marshal Tests</description>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<modules>
+				<module>corba-marshal-ejb</module>
+				<module>corba-marshal-client</module>
+				<module>corba-marshal-ear</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>all-subprojects</id>
+			<modules>
+				<module>corba-marshal-ejb</module>
+				<module>corba-marshal-client</module>
+				<module>corba-marshal-ear</module>
+			</modules>
+		</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=944157&r1=944156&r2=944157&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 Fri May 14 08:53:54 2010
@@ -124,12 +124,13 @@
     </build>
     <profiles>
         <profile>
-            <id>it</id>
+            <id>child</id>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
+                        <!--<artifactId>maven-surefire-plugin</artifactId>-->
+                        <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
                             <suiteXmlFiles>
                                 <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>

Modified: geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/corba-testsuite/corba-mytime/pom.xml Fri May 14 08:53:54 2010
@@ -1,45 +1,59 @@
 <?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>corba-testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>corba-mytime</artifactId>
-    <name>Geronimo TestSuite :: CORBA TestSuite :: My Time</name>
-    <packaging>pom</packaging>
-    
-    <description>Geronimo JEE5 CORBA My Time Tests</description>
-
-    <modules>
-        <module>corba-mytime-ejb</module>
-        <module>corba-mytime-war</module>
-        <module>corba-mytime-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.
+	-->
+
+	<!--
+		$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>corba-testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>corba-mytime</artifactId>
+	<name>Geronimo TestSuite :: CORBA TestSuite :: My Time</name>
+	<packaging>pom</packaging>
+
+	<description>Geronimo JEE5 CORBA My Time Tests</description>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<modules>
+				<module>corba-mytime-ejb</module>
+				<module>corba-mytime-war</module>
+				<module>corba-mytime-ear</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>all-subprojects</id>
+			<modules>
+				<module>corba-mytime-ejb</module>
+				<module>corba-mytime-war</module>
+				<module>corba-mytime-ear</module>
+			</modules>
+		</profile>
+
+	</profiles>
 
 </project>

Modified: geronimo/server/branches/2.2/testsuite/corba-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/corba-testsuite/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/corba-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/corba-testsuite/pom.xml Fri May 14 08:53:54 2010
@@ -1,52 +1,211 @@
 <?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
+	<!--
+		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">
+
+	<!--
+		NOTE: Override the following on the cmdline to only run specific
+		testsuite buckets. 
+
+    *** To only run one test backet: 
     
-    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>testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>corba-testsuite</artifactId>
-    <name>Geronimo TestSuite :: CORBA TestSuite</name>
-    <packaging>pom</packaging>
+        Against the default Jetty assembly - 
+            cd corba-testsuite/corba-helloworld
+            mvn clean install -Pit 
+
+        Against an already running server- 
+            cd corba-testsuite/corba-helloworld 
+            mvn clean install -Pit-manual
+	-->
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>corba-testsuite</artifactId>
+	<name>Geronimo TestSuite :: CORBA TestSuite</name>
+	<packaging>pom</packaging>
 
-    <description>
+	<description>
         Test Geronimo CORBA Functions
     </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>corba-helloworld</module>
-                <module>corba-marshal</module>
-                <module>corba-mytime</module>
-            </modules>
+
+
+	<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>
-    </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>corba-helloworld</module>
+				<module>corba-marshal</module>
+				<module>corba-mytime</module>
+			</modules>
+		</profile>
+	</profiles>
+    <!-- 
+        Comment out following if using surefire plugin to run integration test
+     -->
+	<!--<build>		
+		<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>-->
 
 </project>

Modified: geronimo/server/branches/2.2/testsuite/deployment-testsuite/deployment-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/deployment-testsuite/deployment-tests/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/deployment-tests/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/deployment-tests/pom.xml Fri May 14 08:53:54 2010
@@ -1,124 +1,134 @@
 <?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>deployment-testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-    
-    <artifactId>deployment-tests</artifactId>
-    <name>Geronimo TestSuite, Deployment :: Deployment Tests</name>
-    
-    <description>
+	<!--
+		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>deployment-testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>deployment-tests</artifactId>
+	<name>Geronimo TestSuite, Deployment :: Deployment Tests</name>
+
+	<description>
         Tests for the test-deployables.
     </description>
 
-    <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>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-ears</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <modules>
-                                <!-- Deploy only 1 module until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed. -->
-                                <!--
-                                <module>
-                                    <groupId>org.apache.geronimo.testsupport</groupId>
-                                    <artifactId>test-ear-j2ee_1.3</artifactId>
-                                    <version>${version}</version>
-                                    <type>ear</type>
-                                </module>
-                                -->
-                                
-                                <module>
-                                    <groupId>org.apache.geronimo.testsupport</groupId>
-                                    <artifactId>test-ear-j2ee_1.4</artifactId>
-                                    <version>${version}</version>
-                                    <type>ear</type>
-                                </module>
-                            </modules>
-                        </configuration>
-                    </execution>
-                    
-                    <!-- Comment the following block until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed. -->
-                    <!--
-                       <execution>
-                           <id>undeploy-ear-as-module</id>
-                           <phase>post-integration-test</phase>
-                           <goals>
-                               <goal>undeploy-module</goal>
-                           </goals>
-                           <configuration>
-                               <modules>
-                                   <module>
-                                       <groupId>org.apache.geronimo.testsupport</groupId>
-                                       <artifactId>test-ear-j2ee_1.3</artifactId>
-                                       <version>${version}</version>
-                                       <type>ear</type>
-                                   </module>
-                               </modules>
-                           </configuration>
-                       </execution>
-                    -->
-                    
-                    <execution>
-                        <id>undeploy-ear-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.testsupport/test-ear-j2ee_1.4/${version}/ear</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-failsafe-plugin</artifactId>
+							<configuration>
+								<suiteXmlFiles>
+									<suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+								</suiteXmlFiles>
+							</configuration>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+
+				<plugins>
+					<plugin>
+						<groupId>org.apache.geronimo.buildsupport</groupId>
+						<artifactId>geronimo-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>deploy-ears</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>deploy-module</goal>
+								</goals>
+								<configuration>
+									<modules>
+										<!--
+											Deploy only 1 module until
+											https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed.
+										-->
+
+										<!--<module>
+											<groupId>org.apache.geronimo.testsupport</groupId>
+											<artifactId>test-ear-j2ee_1.3</artifactId>
+											<version>${version}</version>
+											<type>ear</type>
+										</module>
+
+
+										--><module>
+											<groupId>org.apache.geronimo.testsupport</groupId>
+											<artifactId>test-ear-j2ee_1.4</artifactId>
+											<version>${version}</version>
+											<type>ear</type>
+										</module>
+									</modules>
+								</configuration>
+							</execution>
+
+							<!--
+								Comment the following block until
+								https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed.
+							-->
+
+							<!--<execution>
+								<id>undeploy-ear-as-module</id>
+								<phase>post-integration-test</phase>
+								<goals>
+									<goal>undeploy-module</goal>
+								</goals>
+								<configuration>
+									<modules>
+										<module>
+											<groupId>org.apache.geronimo.testsupport</groupId>
+											<artifactId>test-ear-j2ee_1.3</artifactId>
+											<version>${version}</version>
+											<type>ear</type>
+										</module>
+									</modules>
+								</configuration>
+							</execution>
+
 
+							--><execution>
+								<id>undeploy-ear-as-moduleId</id>
+								<phase>post-integration-test</phase>
+								<goals>
+									<goal>undeploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleId>org.apache.geronimo.testsupport/test-ear-j2ee_1.4/${version}/ear</moduleId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml Fri May 14 08:53:54 2010
@@ -1,163 +1,168 @@
 <?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>jca-cms-tests</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>jca-cms-ear</artifactId>
-    <name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security EAR</name>
-    <packaging>ear</packaging>
-
-    <!--
-    FIXME: Split this module up... one to build the ear, one to run the tests.
-    -->
-    
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>system-database</artifactId>
-                <version>${version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
+	<!--
+		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>jca-cms-tests</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>jca-cms-ear</artifactId>
+	<name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security EAR</name>
+	<packaging>ear</packaging>
+
+	<!--
+		FIXME: Split this module up... one to build the ear, one to run the
+		tests.
+	-->
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.geronimo.plugins</groupId>
+				<artifactId>system-database</artifactId>
+				<version>${version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.tranql</groupId>
+			<artifactId>tranql-connector-derby-embed-xa</artifactId>
+			<type>rar</type>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>jca-cms-war</artifactId>
+			<version>${version}</version>
+			<type>war</type>
+		</dependency>
 	</dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-xa</artifactId>
-            <type>rar</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>jca-cms-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <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>
-            </plugins>
-        </pluginManagement>
-        
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <displayName>Manifest Classpath Itest ear</displayName>
-                    <description>Manifest Classpath Itest ear</description>
-                    <version>1.4</version>
-                    <modules>
-                        <webModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>jca-cms-war</artifactId>
-                            <contextRoot>/jca-cms</contextRoot>
-                            <bundleFileName>web.war</bundleFileName>
-                        </webModule>
-                        <rarModule>
-                            <groupId>org.tranql</groupId>
-                            <artifactId>tranql-connector-derby-embed-xa</artifactId>
-                            <bundleFileName>tranql.rar</bundleFileName>
-                        </rarModule>
-                    </modules>
-                </configuration>
-            </plugin>
-
-             <!-- "ear" packaging doesn't compile test classes -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- "ear" packaging doesn't process test resources -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testResources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-ears</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy-ear-as-module</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-failsafe-plugin</artifactId>
+							<configuration>
+								<suiteXmlFiles>
+									<suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+								</suiteXmlFiles>
+							</configuration>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-ear-plugin</artifactId>
+						<configuration>
+							<displayName>Manifest Classpath Itest ear</displayName>
+							<description>Manifest Classpath Itest ear</description>
+							<version>1.4</version>
+							<modules>
+								<webModule>
+									<groupId>org.apache.geronimo.testsuite</groupId>
+									<artifactId>jca-cms-war</artifactId>
+									<contextRoot>/jca-cms</contextRoot>
+									<bundleFileName>web.war</bundleFileName>
+								</webModule>
+								<rarModule>
+									<groupId>org.tranql</groupId>
+									<artifactId>tranql-connector-derby-embed-xa</artifactId>
+									<bundleFileName>tranql.rar</bundleFileName>
+								</rarModule>
+							</modules>
+						</configuration>
+					</plugin>
+
+					<!-- "ear" packaging doesn't compile test classes -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<executions>
+							<execution>
+								<goals>
+									<goal>testCompile</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+					<!-- "ear" packaging doesn't process test resources -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
+						<executions>
+							<execution>
+								<goals>
+									<goal>testResources</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.geronimo.buildsupport</groupId>
+						<artifactId>geronimo-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>deploy-ears</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>deploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+								</configuration>
+							</execution>
+
+							<execution>
+								<id>undeploy-ear-as-module</id>
+								<phase>post-integration-test</phase>
+								<goals>
+									<goal>undeploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 
+	</profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/pom.xml Fri May 14 08:53:54 2010
@@ -1,42 +1,54 @@
 <?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>deployment-testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>jca-cms-tests</artifactId>
-    <packaging>pom</packaging>
-    <name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security Test</name>
-    
-    <modules>
-        <module>jca-cms-war</module>
-        <module>jca-cms-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.
+	-->
+
+	<!--
+		$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>deployment-testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>jca-cms-tests</artifactId>
+	<packaging>pom</packaging>
+	<name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security Test</name>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<modules>
+				<module>jca-cms-war</module>
+				<module>jca-cms-ear</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>all-subprojects</id>
+			<modules>
+				<module>jca-cms-war</module>
+				<module>jca-cms-ear</module>
+			</modules>
+		</profile>
+
+	</profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml Fri May 14 08:53:54 2010
@@ -1,113 +1,116 @@
 <?xml version="1.0"?>
-<!--
-  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>manifestcp-tests</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>manifestcp-ear</artifactId>
-    <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath EAR</name>
-    <packaging>ear</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-jar</artifactId>
-            <version>${version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-war-jar</artifactId>
-            <version>${version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <displayName>Manifest Classpath Itest ear</displayName>
-                    <description>Manifest Classpath Itest ear</description>
-                    <version>1.4</version>
-                    <modules>
-                        <webModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>manifestcp-war</artifactId>
-                            <contextRoot>/manifestcp</contextRoot>
-                            <bundleFileName>web.war</bundleFileName>
-                        </webModule>
-                        <ejbModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>manifestcp-ejb</artifactId>
-                            <bundleFileName>ejb.jar</bundleFileName>
-                        </ejbModule>
-                    </modules>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-ears</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy-ear-as-module</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <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.
+	-->
+<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>manifestcp-tests</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>manifestcp-ear</artifactId>
+	<name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath EAR</name>
+	<packaging>ear</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>manifestcp-jar</artifactId>
+			<version>${version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>manifestcp-war-jar</artifactId>
+			<version>${version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>manifestcp-ejb</artifactId>
+			<version>${version}</version>
+			<type>ejb</type>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>manifestcp-war</artifactId>
+			<version>${version}</version>
+			<type>war</type>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-ear-plugin</artifactId>
+						<configuration>
+							<displayName>Manifest Classpath Itest ear</displayName>
+							<description>Manifest Classpath Itest ear</description>
+							<version>1.4</version>
+							<modules>
+								<webModule>
+									<groupId>org.apache.geronimo.testsuite</groupId>
+									<artifactId>manifestcp-war</artifactId>
+									<contextRoot>/manifestcp</contextRoot>
+									<bundleFileName>web.war</bundleFileName>
+								</webModule>
+								<ejbModule>
+									<groupId>org.apache.geronimo.testsuite</groupId>
+									<artifactId>manifestcp-ejb</artifactId>
+									<bundleFileName>ejb.jar</bundleFileName>
+								</ejbModule>
+							</modules>
+						</configuration>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.geronimo.buildsupport</groupId>
+						<artifactId>geronimo-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>deploy-ears</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>deploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+								</configuration>
+							</execution>
+
+							<execution>
+								<id>undeploy-ear-as-module</id>
+								<phase>post-integration-test</phase>
+								<goals>
+									<goal>undeploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml Fri May 14 08:53:54 2010
@@ -1,62 +1,65 @@
 <?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>manifestcp-tests</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>manifestcp-ejb</artifactId>
-    <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath EJB</name>
-    <packaging>ejb</packaging>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-jar</artifactId>
-            <version>${version}</version>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ejb-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+	<!--
+		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>manifestcp-tests</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>manifestcp-ejb</artifactId>
+	<name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath EJB</name>
+	<packaging>ejb</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>manifestcp-jar</artifactId>
+			<version>${version}</version>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-ejb-plugin</artifactId>
+						<configuration>
+							<archive>
+								<manifest>
+									<addClasspath>true</addClasspath>
+								</manifest>
+							</archive>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml Fri May 14 08:53:54 2010
@@ -1,63 +1,66 @@
 <?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>manifestcp-tests</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>manifestcp-war</artifactId>
-    <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath WAR</name>
-    <packaging>war</packaging>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-war-jar</artifactId>
-            <version>${version}</version>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                    <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.
+	-->
+
+	<!--
+		$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>manifestcp-tests</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>manifestcp-war</artifactId>
+	<name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath WAR</name>
+	<packaging>war</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>manifestcp-war-jar</artifactId>
+			<version>${version}</version>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-war-plugin</artifactId>
+						<configuration>
+							<webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+							<archive>
+								<manifest>
+									<addClasspath>true</addClasspath>
+								</manifest>
+							</archive>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/pom.xml Fri May 14 08:53:54 2010
@@ -1,46 +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.
--->
-
-<!-- $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>deployment-testsuite</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>manifestcp-tests</artifactId>
-    <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath Test</name>
-    <packaging>pom</packaging>
-    
-    <modules>
-        <module>manifestcp-jar2</module>
-        <module>manifestcp-jar</module>
-        <module>manifestcp-war-jar</module>
-        <module>manifestcp-ejb</module>
-        <module>manifestcp-war</module>
-        <module>manifestcp-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.
+	-->
+
+	<!--
+		$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>deployment-testsuite</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>manifestcp-tests</artifactId>
+	<name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath Test</name>
+	<packaging>pom</packaging>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<modules>
+				<module>manifestcp-jar2</module>
+				<module>manifestcp-jar</module>
+				<module>manifestcp-war-jar</module>
+				<module>manifestcp-ejb</module>
+				<module>manifestcp-war</module>
+				<module>manifestcp-ear</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>all-subprojects</id>
+			<modules>
+				<module>manifestcp-jar2</module>
+				<module>manifestcp-jar</module>
+				<module>manifestcp-war-jar</module>
+				<module>manifestcp-ejb</module>
+				<module>manifestcp-war</module>
+				<module>manifestcp-ear</module>
+			</modules>
+		</profile>
+
+	</profiles>
 </project>

Modified: geronimo/server/branches/2.2/testsuite/deployment-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/deployment-testsuite/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/pom.xml Fri May 14 08:53:54 2010
@@ -37,8 +37,115 @@
     <description>
         Geronimo deployment testsuite.
     </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>
+    </build>
+
     <profiles>
         <profile>
+            <id>it</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <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.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </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>
+            
+
+            <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.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </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>

Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml?rev=944157&r1=944156&r2=944157&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml Fri May 14 08:53:54 2010
@@ -1,163 +1,167 @@
 <?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: 589258 $ $Date: 2007-10-27 21:41:57 -0400 (Sat, 27 Oct 2007) $ -->
-
-<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>ejb-tests</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>ejb-ear</artifactId>
-    <name>Geronimo TestSuite :: Enterprise Testsuite :: EJB Tests EAR</name>
-    <packaging>ear</packaging>
-
-    <!--
-    FIXME: Split this module up... one to build the ear, one to run the tests.
-    -->
-    
-    <description>
+	<!--
+		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: 589258 $ $Date: 2007-10-27 21:41:57 -0400 (Sat, 27 Oct 2007) $
+	-->
+
+<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>ejb-tests</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>ejb-ear</artifactId>
+	<name>Geronimo TestSuite :: Enterprise Testsuite :: EJB Tests EAR</name>
+	<packaging>ear</packaging>
+
+	<!--
+		FIXME: Split this module up... one to build the ear, one to run the
+		tests.
+	-->
+
+	<description>
         Geronimo test EAR for EJB Tests
     </description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>ejb-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>ejb-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-           <groupId>org.apache.geronimo.modules</groupId>
-           <artifactId>geronimo-openejb</artifactId>
-           <version>${version}</version>
-           <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <displayName>Geronimo EAR for EJB Tests</displayName>
-                    <description>Geronimo EAR for EJB Tests</description>
-                    <version>5</version>
-                    <modules>
-                      <ejbModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>ejb-ejb</artifactId>
-                            <bundleFileName>ejb-ejb-${version}.jar</bundleFileName>
-                        </ejbModule>
-
-                        <webModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
-                            <artifactId>ejb-war</artifactId>
-                            <contextRoot>/ejbtests</contextRoot>
-                            <bundleFileName>ejb-war-${version}.war</bundleFileName>
-                        </webModule>
-                    </modules>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                </configuration>
-            </plugin>
-
-            <!-- "ear" packaging doesn't process test resources -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- "ear" packaging doesn't process test resources -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testResources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>ejb-war</artifactId>
+			<version>${version}</version>
+			<type>war</type>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.testsuite</groupId>
+			<artifactId>ejb-ejb</artifactId>
+			<version>${version}</version>
+			<type>ejb</type>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.modules</groupId>
+			<artifactId>geronimo-openejb</artifactId>
+			<version>${version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>child</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-ear-plugin</artifactId>
+						<configuration>
+							<displayName>Geronimo EAR for EJB Tests</displayName>
+							<description>Geronimo EAR for EJB Tests</description>
+							<version>5</version>
+							<modules>
+								<ejbModule>
+									<groupId>org.apache.geronimo.testsuite</groupId>
+									<artifactId>ejb-ejb</artifactId>
+									<bundleFileName>ejb-ejb-${version}.jar</bundleFileName>
+								</ejbModule>
+
+								<webModule>
+									<groupId>org.apache.geronimo.testsuite</groupId>
+									<artifactId>ejb-war</artifactId>
+									<contextRoot>/ejbtests</contextRoot>
+									<bundleFileName>ejb-war-${version}.war</bundleFileName>
+								</webModule>
+							</modules>
+						</configuration>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-failsafe-plugin</artifactId>
+						<configuration>
+							<suiteXmlFiles>
+								<suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+							</suiteXmlFiles>
+						</configuration>
+					</plugin>
+
+					<!-- "ear" packaging doesn't process test resources -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<executions>
+							<execution>
+								<goals>
+									<goal>testCompile</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+					<!-- "ear" packaging doesn't process test resources -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
+						<executions>
+							<execution>
+								<goals>
+									<goal>testResources</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.geronimo.buildsupport</groupId>
+						<artifactId>geronimo-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>deploy</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>deploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+								</configuration>
+							</execution>
+
+							<execution>
+								<id>undeploy</id>
+								<phase>post-integration-test</phase>
+								<goals>
+									<goal>undeploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
 



Mime
View raw message