You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/12/17 16:59:13 UTC
svn commit: r1050431 [1/2] - in /geronimo/server/trunk/testsuite:
commands-testsuite/ enterprise-testsuite/jms-tests/jms-ejb/
webservices-testsuite/ webservices-testsuite/jaxr-tests/jaxr-ejb/
webservices-testsuite/jaxr-tests/jaxr-war/ webservices-tests...
Author: rickmcguire
Date: Fri Dec 17 15:59:12 2010
New Revision: 1050431
URL: http://svn.apache.org/viewvc?rev=1050431&view=rev
Log:
add profiles to more testsuite projects so they can be built using all-subprojects
Modified:
geronimo/server/trunk/testsuite/commands-testsuite/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
Modified: geronimo/server/trunk/testsuite/commands-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/commands-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/commands-testsuite/pom.xml Fri Dec 17 15:59:12 2010
@@ -69,6 +69,13 @@
</pluginManagement>
</build>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+ <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
+ <modules>
+ <module>jaxws</module>
+ </modules>
+ </profile>
</profiles>
<modules>
@@ -78,5 +85,4 @@
-->
<module>shutdown</module>
</modules>
-
</project>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml Fri Dec 17 15:59:12 2010
@@ -58,7 +58,7 @@
<artifactId>geronimo-annotation_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml Fri Dec 17 15:59:12 2010
@@ -66,38 +66,42 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-ejb</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
+ </configuration>
+ </execution>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ejb</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-ejb-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXREJB/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
+ <execution>
+ <id>undeploy-ejb-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>JEE5/JAXREJB/1.1/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml Fri Dec 17 15:59:12 2010
@@ -58,50 +58,56 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}-${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>${project.artifactId}-${project.version}</value>
+ </property>
+ </systemProperties>
</configuration>
- </execution>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>JEE5/JAXRServlet/1.1/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXRServlet/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml Fri Dec 17 15:59:12 2010
@@ -58,50 +58,61 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}-${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>${project.artifactId}-${project.version}</value>
+ </property>
+ </systemProperties>
</configuration>
- </execution>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>JEE5/JAXRPC-JAXWS/1.1/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXRPC-JAXWS/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml Fri Dec 17 15:59:12 2010
@@ -64,49 +64,59 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>greeter</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ejb</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>greeter</value>
+ </property>
+ </systemProperties>
</configuration>
- </execution>
+ </plugin>
- <execution>
- <id>undeploy-ejb-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXRPCEJB/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-ejb</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-ejb-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>JEE5/JAXRPCEJB/1.1/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml Fri Dec 17 15:59:12 2010
@@ -40,50 +40,60 @@
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}-${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>${project.artifactId}-${project.version}</value>
+ </property>
+ </systemProperties>
</configuration>
- </execution>
+ </plugin>
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXRPCServlet/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-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>JEE5/JAXRPCServlet/1.1/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml Fri Dec 17 15:59:12 2010
@@ -59,72 +59,82 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>JAX-WS Catalog TestSuite EAR</displayName>
- <description>JAX-WS Catalog TestSuite EAR</description>
- <version>5</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>catalog-war</artifactId>
- <contextRoot>/catalog</contextRoot>
- <bundleFileName>catalog-war-${project.version}.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>catalog-ejb</artifactId>
- <bundleFileName>catalog-ejb-${project.version}.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
<configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
+ <displayName>JAX-WS Catalog TestSuite EAR</displayName>
+ <description>JAX-WS Catalog TestSuite EAR</description>
+ <version>5</version>
+ <modules>
+ <webModule>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>catalog-war</artifactId>
+ <contextRoot>/catalog</contextRoot>
+ <bundleFileName>catalog-war-${project.version}.war</bundleFileName>
+ </webModule>
+ <ejbModule>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>catalog-ejb</artifactId>
+ <bundleFileName>catalog-ejb-${project.version}.jar</bundleFileName>
+ </ejbModule>
+ </modules>
</configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${plugin.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${plugin.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml Fri Dec 17 15:59:12 2010
@@ -62,97 +62,107 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>JAX-WS MTOM TestSuite EAR</displayName>
- <description>JAX-WS MTOM TestSuite EAR</description>
- <version>5</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>mtom-war</artifactId>
- <contextRoot>/mtom</contextRoot>
- <bundleFileName>mtom-war-${project.version}.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>mtom-ejb</artifactId>
- <bundleFileName>mtom-ejb-${project.version}.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>mtom-test-war</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
<configuration>
+ <displayName>JAX-WS MTOM TestSuite EAR</displayName>
+ <description>JAX-WS MTOM TestSuite EAR</description>
+ <version>5</version>
<modules>
- <module>
+ <webModule>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>mtom-war</artifactId>
+ <contextRoot>/mtom</contextRoot>
+ <bundleFileName>mtom-war-${project.version}.war</bundleFileName>
+ </webModule>
+ <ejbModule>
<groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>mtom-test-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </module>
+ <artifactId>mtom-ejb</artifactId>
+ <bundleFileName>mtom-ejb-${project.version}.jar</bundleFileName>
+ </ejbModule>
</modules>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
</configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <modules>
- <module>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>mtom-test-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </module>
- </modules>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>mtom-test-war</value>
+ </property>
+ </systemProperties>
</configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <modules>
+ <module>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>mtom-test-war</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ </module>
+ </modules>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <modules>
+ <module>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>mtom-test-war</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ </module>
+ </modules>
+ <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml Fri Dec 17 15:59:12 2010
@@ -44,6 +44,11 @@
<artifactId>geronimo-ejb_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/pom.xml Fri Dec 17 15:59:12 2010
@@ -34,6 +34,12 @@
<dependencies>
<dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml Fri Dec 17 15:59:12 2010
@@ -68,97 +68,107 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>JAX-WS Provider TestSuite EAR</displayName>
- <description>JAX-WS Provider TestSuite EAR</description>
- <version>5</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-war</artifactId>
- <contextRoot>/provider</contextRoot>
- <bundleFileName>provider-war-${project.version}.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-ejb</artifactId>
- <bundleFileName>provider-ejb-${project.version}.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>provider-test-war</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <!-- modules>
- <module>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-test-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </module>
- </modules-->
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
<configuration>
+ <displayName>JAX-WS Provider TestSuite EAR</displayName>
+ <description>JAX-WS Provider TestSuite EAR</description>
+ <version>5</version>
<modules>
- <!--module>
+ <webModule>
<groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-test-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </module-->
+ <artifactId>provider-war</artifactId>
+ <contextRoot>/provider</contextRoot>
+ <bundleFileName>provider-war-${project.version}.war</bundleFileName>
+ </webModule>
+ <ejbModule>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>provider-ejb</artifactId>
+ <bundleFileName>provider-ejb-${project.version}.jar</bundleFileName>
+ </ejbModule>
</modules>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
</configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>provider-test-war</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <!-- modules>
+ <module>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>provider-test-war</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ </module>
+ </modules-->
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <modules>
+ <!--module>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>provider-test-war</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ </module-->
+ </modules>
+ <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml Fri Dec 17 15:59:12 2010
@@ -72,50 +72,60 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}-${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ejb</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>${project.artifactId}-${project.version}</value>
+ </property>
+ </systemProperties>
</configuration>
- </execution>
-
- <execution>
- <id>undeploy-ejb-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/jar</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-ejb</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-ejb-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${project.groupId}/${project.artifactId}/${project.version}/jar</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml Fri Dec 17 15:59:12 2010
@@ -63,51 +63,61 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}-${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ejb</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>${project.artifactId}-${project.version}</value>
+ </property>
+ </systemProperties>
</configuration>
- </execution>
-
- <execution>
- <id>undeploy-ejb-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXWSEJB/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-ejb</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-ejb-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>JEE5/JAXWSEJB/1.1/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml Fri Dec 17 15:59:12 2010
@@ -33,50 +33,60 @@
<artifactId>jaxws-partial</artifactId>
<name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Partial</name>
<packaging>war</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>${project.artifactId}</value>
+ </property>
+ </systemProperties>
</configuration>
- </execution>
+ </plugin>
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXWSPartial/1.0/war</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>JEE5/JAXWSPartial/1.0/war</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml Fri Dec 17 15:59:12 2010
@@ -40,50 +40,60 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>${project.artifactId}</value>
+ </property>
+ </systemProperties>
</configuration>
- </execution>
+ </plugin>
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXWSRESTServlet/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-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>JEE5/JAXWSRESTServlet/1.1/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml Fri Dec 17 15:59:12 2010
@@ -59,50 +59,60 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ejb</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-ejb-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>${project.artifactId}</value>
+ </property>
+ </systemProperties>
</configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-ejb</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-ejb-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml Fri Dec 17 15:59:12 2010
@@ -33,59 +33,69 @@
<artifactId>jaxws-war</artifactId>
<name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS WAR</name>
<packaging>war</packaging>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>${project.artifactId}</value>
+ </property>
+ </systemProperties>
</configuration>
- </execution>
+ </plugin>
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXWSServlet/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-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>JEE5/JAXWSServlet/1.1/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>