Author: mwringe Date: 2010-06-24 15:08:32 -0400 (Thu, 24 Jun 2010) New Revision: 3474 Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml Log: GTNWSRP-46: Disable starting cargo or creating the test archives if maven.test.skip is set. Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-24 16:09:13 UTC (rev 3473) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-24 19:08:32 UTC (rev 3474) @@ -122,6 +122,109 @@ </plugins> </build> </profile> + <profile> + <id>integration-tests-enabled</id> + <activation> + <property> + <name>!maven.test.skip</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>1.0.1</version> + <executions> + <execution> + <id>pre-integration-start-server</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + </execution> + <execution> + <id>post-integration-stop-server</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>test</finalName> + <appendAssemblyId>true</appendAssemblyId> + <!-- we don't want to add these archives into the repo --> + <attach>false</attach> + <outputDirectory>${project.build.directory}/test-archives</outputDirectory> + <descriptors> + <descriptor>src/test/assembly/test-producer.xml</descriptor> + <descriptor>src/test/assembly/test-markup-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-renderparam-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-session-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-basic-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-dispatcher-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-getlocales-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-encodeurl-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-usercontext-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-multivalued-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-implicitcloning-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-resource-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-resourcenoencodeurl-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-applicationscope-portlet.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>assemble</id> + <!-- note that package phase happens after the test phase and before the integration test phase --> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-packaging-maven-plugin</artifactId> + <version>2.1.1</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <!-- Copy Google Portlet samples from PC module to test-archives so that they can be used in tests --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>copy</id> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-samples</artifactId> + <version>2.1.1-GA</version> + <classifier>google-portlet</classifier> + <type>war</type> + <destFileName>google-portlet.war</destFileName> + <outputDirectory>${project.build.directory}/test-archives</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> <dependencies> @@ -296,77 +399,7 @@ </executions> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>test</finalName> - <appendAssemblyId>true</appendAssemblyId> - <!-- we don't want to add these archives into the repo --> - <attach>false</attach> - <outputDirectory>${project.build.directory}/test-archives</outputDirectory> - <descriptors> - <descriptor>src/test/assembly/test-producer.xml</descriptor> - <descriptor>src/test/assembly/test-markup-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-renderparam-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-session-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-basic-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-dispatcher-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-getlocales-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-encodeurl-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-usercontext-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-multivalued-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-implicitcloning-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-resource-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-resourcenoencodeurl-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-applicationscope-portlet.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>assemble</id> - <!-- note that package phase happens after the test phase and before the integration test phase --> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-packaging-maven-plugin</artifactId> - <version>2.1.1</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <!-- Copy Google Portlet samples from PC module to test-archives so that they can be used in tests --> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <id>copy</id> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-samples</artifactId> - <version>2.1.1-GA</version> - <classifier>google-portlet</classifier> - <type>war</type> - <destFileName>google-portlet.war</destFileName> - <outputDirectory>${project.build.directory}/test-archives</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>true</skip> @@ -440,22 +473,6 @@ </configfiles> </configuration> </configuration> - <executions> - <execution> - <id>pre-integration-start-server</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start</goal> - </goals> - </execution> - <execution> - <id>post-integration-stop-server</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> </plugin> </plugins> <testResources>