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 [2/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...
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml Fri Dec 17 15:59:12 2010
@@ -65,96 +65,106 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>JAX-WS WS-A TestSuite EAR</displayName>
- <description>JAX-WS WS-A TestSuite EAR</description>
- <version>5</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>wsa-war</artifactId>
- <contextRoot>/wsa</contextRoot>
- <bundleFileName>wsa-war-${project.version}.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>wsa-ejb</artifactId>
- <bundleFileName>wsa-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>wsa-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 WS-A TestSuite EAR</displayName>
+ <description>JAX-WS WS-A TestSuite EAR</description>
+ <version>5</version>
<modules>
- <module>
+ <webModule>
<groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>wsa-test-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </module>
+ <artifactId>wsa-war</artifactId>
+ <contextRoot>/wsa</contextRoot>
+ <bundleFileName>wsa-war-${project.version}.war</bundleFileName>
+ </webModule>
+ <ejbModule>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>wsa-ejb</artifactId>
+ <bundleFileName>wsa-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>wsa-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>wsa-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>wsa-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>wsa-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/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml Fri Dec 17 15:59:12 2010
@@ -45,7 +45,6 @@
<module>jaxrpc-jaxws-tests</module>
<module>jaxrpc-tests</module>
<module>jaxws-catalog-tests</module>
- <module>jaxws-catalog-tests</module>
<module>jaxws-mtom-tests</module>
<module>jaxws-provider-tests</module>
<module>jaxws-tests</module>
@@ -60,18 +59,15 @@
<id>all-subprojects</id>
<!-- use for things like versions:set and perhaps release when build has to run on all projects -->
<modules>
- <!--
<module>jaxr-tests</module>
<module>jaxrpc-jaxws-tests</module>
<module>jaxrpc-tests</module>
<module>jaxws-catalog-tests</module>
- <module>jaxws-catalog-tests</module>
<module>jaxws-mtom-tests</module>
<module>jaxws-provider-tests</module>
<module>jaxws-tests</module>
<module>jaxws-wsa-tests</module>
<module>saaj-tests</module>
- -->
</modules>
</profile>
</profiles>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml?rev=1050431&r1=1050430&r2=1050431&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml Fri Dec 17 15:59:12 2010
@@ -53,50 +53,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-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/SAAJServlet/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/SAAJServlet/1.1/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>