geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r832538 [2/2] - in /geronimo/server/branches/2.2: ./ framework/configs/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/ framework/configs/geronimo-gbean-deplo...
Date Tue, 03 Nov 2009 20:28:13 GMT
Modified: geronimo/server/branches/2.2/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/pom.xml Tue Nov  3 20:28:11 2009
@@ -20,7 +20,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,7 +39,7 @@
     <description>
         Geronimo integration testsuite.
     </description>
-    
+
     <properties>
         <!--
         NOTE: The default assembly is jetty, so exclude any tomcat tests by
@@ -55,7 +56,7 @@
         -->
         <shittyTestIncludes>*/*/pom.xml</shittyTestIncludes>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
@@ -63,14 +64,14 @@
             <version>${version}</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.codehaus.groovy.maven.support</groupId>
             <artifactId>slf4j-gossip</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <!--
         <extensions>
@@ -80,7 +81,7 @@
                 <version>${version}</version>
             </extension>
         </extensions>
-        -->  
+        -->
 
         <pluginManagement>
             <plugins>
@@ -108,40 +109,14 @@
                         </webResources>
                     </configuration>
                 </plugin>
-                
-                <!--
-                NOTE: This horrible looking configuration sets up the surefire plugin to
-                      not run tests durring the 'test' phase, but instead during the
-                      'integration-test' phase.
-                -->
+
+                <!-- turn off tests unless 'it' profile active-->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <configuration>
                         <skip>true</skip>
                     </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>
-                                <skip>false</skip>
-                            </configuration>
-                        </execution>
-                    </executions>
                 </plugin>
 
                 <plugin>
@@ -149,7 +124,8 @@
                     <artifactId>geronimo-maven-plugin</artifactId>
                     <configuration>
                         <reporters>
-                            <reporter implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
+                            <reporter
+                                    implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
                                 <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
                             </reporter>
                         </reporters>
@@ -167,101 +143,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
-            
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>start</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-server</goal>
-                        </goals>
-                        <configuration>
-                            <logOutput>true</logOutput>
-                            <background>true</background>
-                            <systemProperties>
-                                <property>
-                                    <name>browser</name>
-                                    <value>${browser}</value>
-                                </property>
-                            </systemProperties>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>stop</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop-server</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>start</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-server</goal>
-                        </goals>
-                        <configuration>
-                            <logOutput>true</logOutput>
-                            <background>true</background>
-                            <verifyTimeout>300</verifyTimeout>
-                            <refresh>true</refresh>
-                            <optionSets>
-                                <optionSet>
-                                    <id>default</id>
-                                    <options>
-                                       <option>-XX:MaxPermSize=160m</option>
-                                    </options>
-                                </optionSet>
-                            </optionSets>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>stop</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>stop-server</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
+
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>shitty-maven-plugin</artifactId>
-                <inherited>false</inherited>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
-                    <projects>
-                        <fileset>
-                            <directory>${project.basedir}</directory>
-                            <includes>
-                                <include>${shittyTestIncludes}</include>
-                            </includes>
-                            <excludes>
-                                <exclude>${shittyTestExcludes}</exclude>
-                            </excludes>
-                        </fileset>
-                    </projects>
+                    <skip>true</skip>
                 </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>clean</goal>
-                            <goal>install</goal>
-                            <goal>test</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
@@ -274,22 +162,161 @@
     </distributionManagement>
 
     <!--<pluginRepositories>-->
-        <!--<pluginRepository>-->
-            <!--<id>codehaus</id>-->
-            <!--<name>Codehaus Release Repository</name>-->
-            <!--<url>http://repository.codehaus.org</url>-->
-            <!--<layout>default</layout>-->
-            <!--<snapshots>-->
-                <!--<enabled>false</enabled>-->
-            <!--</snapshots>-->
-            <!--<releases>-->
-                <!--<enabled>true</enabled>-->
-            <!--</releases>-->
-        <!--</pluginRepository>-->
+    <!--<pluginRepository>-->
+    <!--<id>codehaus</id>-->
+    <!--<name>Codehaus Release Repository</name>-->
+    <!--<url>http://repository.codehaus.org</url>-->
+    <!--<layout>default</layout>-->
+    <!--<snapshots>-->
+    <!--<enabled>false</enabled>-->
+    <!--</snapshots>-->
+    <!--<releases>-->
+    <!--<enabled>true</enabled>-->
+    <!--</releases>-->
+    <!--</pluginRepository>-->
     <!--</pluginRepositories>-->
-    
+
     <profiles>
         <profile>
+            <id>it</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.codehaus.mojo</groupId>
+                            <artifactId>shitty-maven-plugin</artifactId>
+                            <inherited>false</inherited>
+                            <configuration>
+                                <projects>
+                                    <fileset>
+                                        <directory>${project.basedir}</directory>
+                                        <includes>
+                                            <include>${shittyTestIncludes}</include>
+                                        </includes>
+                                        <excludes>
+                                            <exclude>${shittyTestExcludes}</exclude>
+                                        </excludes>
+                                    </fileset>
+                                </projects>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <goals>
+                                        <goal>clean</goal>
+                                        <goal>install</goal>
+                                        <goal>test</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.codehaus.mojo</groupId>
+                            <artifactId>selenium-maven-plugin</artifactId>
+                            <inherited>false</inherited>
+                            <executions>
+                                <execution>
+                                    <id>start</id>
+                                    <phase>pre-integration-test</phase>
+                                    <goals>
+                                        <goal>start-server</goal>
+                                    </goals>
+                                    <configuration>
+                                        <logOutput>true</logOutput>
+                                        <background>true</background>
+                                        <systemProperties>
+                                            <property>
+                                                <name>browser</name>
+                                                <value>${browser}</value>
+                                            </property>
+                                        </systemProperties>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>stop</id>
+                                    <phase>post-integration-test</phase>
+                                    <goals>
+                                        <goal>stop-server</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
+
+                        <!--
+                        NOTE: This horrible looking configuration sets up the surefire plugin to
+                              not run tests durring the 'test' phase, but instead during the
+                              'integration-test' phase.
+                        -->
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <skip>true</skip>
+                            </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>
+                                        <skip>false</skip>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.geronimo.buildsupport</groupId>
+                            <artifactId>geronimo-maven-plugin</artifactId>
+                            <inherited>false</inherited>
+                            <executions>
+                                <execution>
+                                    <id>start</id>
+                                    <phase>pre-integration-test</phase>
+                                    <goals>
+                                        <goal>start-server</goal>
+                                    </goals>
+                                    <configuration>
+                                        <logOutput>true</logOutput>
+                                        <background>true</background>
+                                        <verifyTimeout>300</verifyTimeout>
+                                        <refresh>true</refresh>
+                                        <optionSets>
+                                            <optionSet>
+                                                <id>default</id>
+                                                <options>
+                                                    <option>-XX:MaxPermSize=160m</option>
+                                                </options>
+                                            </optionSet>
+                                        </optionSets>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>stop</id>
+                                    <phase>install</phase>
+                                    <goals>
+                                        <goal>stop-server</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
+
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+
+        <profile>
             <id>testsuite-with-jetty</id>
             <activation>
                 <property>
@@ -301,7 +328,7 @@
                 <shittyTestExcludes>**/*tomcat*/pom.xml</shittyTestExcludes>
             </properties>
         </profile>
-        
+
         <profile>
             <id>testsuite-with-tomcat</id>
             <activation>
@@ -314,7 +341,7 @@
                 <shittyTestExcludes>**/*jetty*/pom.xml</shittyTestExcludes>
             </properties>
         </profile>
-        
+
         <profile>
             <id>headless</id>
             <build>

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml Tue Nov  3 20:28:11 2009
@@ -57,61 +57,71 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>clientLogFile</name>
-                            <value>${clientLogFile}</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-client</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <id>run-client</id>
-                        <goals>
-                            <goal>run-client</goal>
-                        </goals>
+       </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleId>JEE5/JAXBClient/1.1/car</moduleId>
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
+                            <systemProperties>
+                                <property>
+                                    <name>clientLogFile</name>
+                                    <value>${clientLogFile}</value>
+                                </property>
+                            </systemProperties>
                         </configuration>
-                    </execution>
+                    </plugin>
 
-                    <execution>
-                        <id>undeploy-client-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/JAXBClientServer/1.1/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-client</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXBClient/1.1/car</moduleId>
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy-client-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXBClientServer/1.1/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+          
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
 

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml Tue Nov  3 20:28:11 2009
@@ -62,61 +62,71 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>clientLogFile</name>
-                            <value>${clientLogFile}</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-client</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
-                        </configuration>
-                    </execution>
+        </plugins>
+    </build>
 
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <id>run-client</id>
-                        <goals>
-                            <goal>run-client</goal>
-                        </goals>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleId>JEE5/JAXRClient/1.1/car</moduleId>
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
+                            <systemProperties>
+                                <property>
+                                    <name>clientLogFile</name>
+                                    <value>${clientLogFile}</value>
+                                </property>
+                            </systemProperties>
                         </configuration>
-                    </execution>
+                    </plugin>
 
-                    <execution>
-                        <id>undeploy-client-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/JAXRClientServer/1.1/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-client</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXRClient/1.1/car</moduleId>
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy-client-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXRClientServer/1.1/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
 

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml Tue Nov  3 20:28:11 2009
@@ -20,26 +20,27 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxws-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>jaxws-client</artifactId>
     <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Client</name>
     <packaging>jar</packaging>
-    
+
     <description>This project executes testcases for your testsuite</description>
-    
+
     <properties>
         <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
@@ -49,7 +50,7 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -63,82 +64,92 @@
                     </archive>
                 </configuration>
             </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>clientLogFile</name>
-                            <value>${clientLogFile}</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-service</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <modules>
-                                <module>
-                                    <groupId>org.apache.geronimo.testsuite</groupId>
-                                    <artifactId>jaxws-war</artifactId>
-                                    <type>war</type>
-                                    <version>${version}</version>
-                                </module>
-                            </modules>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
-                        </configuration>
-                    </execution>
 
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <id>run-client</id>
-                        <goals>
-                            <goal>run-client</goal>
-                        </goals>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleId>JEE5/JAXWSClient/1.1/car</moduleId>
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
+                            <systemProperties>
+                                <property>
+                                    <name>clientLogFile</name>
+                                    <value>${clientLogFile}</value>
+                                </property>
+                            </systemProperties>
                         </configuration>
-                    </execution>
+                    </plugin>
 
-                    <execution>
-                        <id>undeploy-client-as-modules</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <modules>
-                                <module>
-                                    <groupId>JEE5</groupId>
-                                    <artifactId>JAXWSClientServer</artifactId>
-                                    <version>1.1</version>
-                                    <type>car</type>
-                                </module>
-                                <module>
-                                    <groupId>JEE5</groupId>
-                                    <artifactId>JAXWSServlet</artifactId>
-                                    <version>1.1</version>
-                                    <type>car</type>
-                                </module>
-                            </modules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-service</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <modules>
+                                        <module>
+                                            <groupId>org.apache.geronimo.testsuite</groupId>
+                                            <artifactId>jaxws-war</artifactId>
+                                            <type>war</type>
+                                            <version>${version}</version>
+                                        </module>
+                                    </modules>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar
+                                    </moduleArchive>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXWSClient/1.1/car</moduleId>
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy-client-as-modules</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <modules>
+                                        <module>
+                                            <groupId>JEE5</groupId>
+                                            <artifactId>JAXWSClientServer</artifactId>
+                                            <version>1.1</version>
+                                            <type>car</type>
+                                        </module>
+                                        <module>
+                                            <groupId>JEE5</groupId>
+                                            <artifactId>JAXWSServlet</artifactId>
+                                            <version>1.1</version>
+                                            <type>car</type>
+                                        </module>
+                                    </modules>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml Tue Nov  3 20:28:11 2009
@@ -62,61 +62,70 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>clientLogFile</name>
-                            <value>${clientLogFile}</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-client</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <id>run-client</id>
-                        <goals>
-                            <goal>run-client</goal>
-                        </goals>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleId>JEE5/SAAJClient/1.1/car</moduleId>
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
+                            <systemProperties>
+                                <property>
+                                    <name>clientLogFile</name>
+                                    <value>${clientLogFile}</value>
+                                </property>
+                            </systemProperties>
                         </configuration>
-                    </execution>
+                    </plugin>
 
-                    <execution>
-                        <id>undeploy-client-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/SAAJClientServer/1.1/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-client</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/SAAJClient/1.1/car</moduleId>
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy-client-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/SAAJClientServer/1.1/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
 

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml?rev=832538&r1=832537&r2=832538&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml Tue Nov  3 20:28:11 2009
@@ -61,62 +61,71 @@
                     </archive>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>clientLogFile</name>
-                            <value>${clientLogFile}</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-client</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <id>run-client</id>
-                        <goals>
-                            <goal>run-client</goal>
-                        </goals>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <moduleId>JEE5/StaxClient/1.1/car</moduleId>
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
+                            <systemProperties>
+                                <property>
+                                    <name>clientLogFile</name>
+                                    <value>${clientLogFile}</value>
+                                </property>
+                            </systemProperties>
                         </configuration>
-                    </execution>
+                    </plugin>
 
-                    <execution>
-                        <id>undeploy-client-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/StaxClientServer/1.1/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-client</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/StaxClient/1.1/car</moduleId>
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy-client-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/StaxClientServer/1.1/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
 



Mime
View raw message