Author: jramos
Date: Wed Oct 28 18:34:51 2009
New Revision: 830715
URL: http://svn.apache.org/viewvc?rev=830715&view=rev
Log:
Update itest pom.xml so that an assemblyId is required to run the tests. Default is to just build so that we can integrate with the main wink pom.xml
Modified:
incubator/wink/trunk/wink-itests/wink-itest/pom.xml
Modified: incubator/wink/trunk/wink-itests/wink-itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/pom.xml?rev=830715&r1=830714&r2=830715&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/pom.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/pom.xml Wed Oct 28 18:34:51 2009
@@ -169,215 +169,6 @@
</executions>
</plugin>
</plugins>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <resourcesDir>${project.build.outputDirectory}
- </resourcesDir>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${project.build.directory}/${artifactId}-${version}/WEB-INF/web.servlet.xml</webXml>
- <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
- <webResources>
- <resource>
- <directory>${project.basedir}/src/main/webapp
- </directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>${project.build.outputDirectory}
- </directory>
- <includes>
- <include>META-INF/LICENSE</include>
- <include>META-INF/NOTICE</include>
- <include>META-INF/DEPENDENCIES</include>
- <include>META-INF/DISCLAIMER</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
- <!--
- NOTE: This horrible looking configuration sets up
- the surefire plugin to not run tests during 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>
- <systemProperties>
- <property>
- <name>wink-test-context-root</name>
- <value>${artifactId}</value>
- </property>
- <property>
- <name>wink-test-hostname</name>
- <value>${wink.server.hostname}</value>
- </property>
- <property>
- <name>wink-test-port</name>
- <value>${wink.server.port}</value>
- </property>
- <property>
- <name>wink-test-work-dir</name>
- <value>${project.build.directory}</value>
- </property>
- <property>
- <name>wink-test-container</name>
- <value>${assemblyId}</value>
- </property>
- <property>
- <name>wink-rest-filter-used</name>
- <value>${wink.rest.filter.used}</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <configuration>
- <reporters>
- <reporter
- implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
- <reportsDirectory>${project.build.directory}/surefire-reports
- </reportsDirectory>
- </reporter>
- </reporters>
-
- <assemblies>
- <assembly>
- <id>jetty</id>
- <groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-jetty6-javaee5</artifactId>
- <version>2.1.4</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </assembly>
-
- <assembly>
- <id>jetty-minimal</id>
- <groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-jetty6-minimal</artifactId>
- <version>2.1.4</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </assembly>
-
- <assembly>
- <id>tomcat</id>
- <groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-tomcat6-javaee5</artifactId>
- <version>2.1.4</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </assembly>
-
- <assembly>
- <id>tomcat-minimal</id>
- <groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-tomcat6-minimal</artifactId>
- <version>2.1.4</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </assembly>
-
- <assembly>
- <id>framework</id>
- <groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-framework</artifactId>
- <version>2.1.4</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </assembly>
- </assemblies>
-
- <defaultAssemblyId>tomcat</defaultAssemblyId>
-
- <optionSets>
- <optionSet>
- <id>morememory</id>
- <options>
- <option>-Xmx512m</option>
- <option>-XX:MaxPermSize=128m</option>
- </options>
- </optionSet>
-
- <optionSet>
- <id>debug</id>
- <options>
- <option>-Xdebug</option>
- <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
- </options>
- </optionSet>
- </optionSets>
- </configuration>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${artifactId}-${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>${groupId}/${artifactId}/${version}/war
- </moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<profiles>
@@ -535,82 +326,304 @@
</build>
</profile>
-
<profile>
- <id>default-testsuite-with-geronimo-tomcat</id>
+ <id>noexecution-plugin-management</id>
<activation>
<property>
<name>!assemblyId</name>
</property>
</activation>
- <properties>
- <assemblyId>tomcat</assemblyId>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-server</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
<build>
- <plugins>
- <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>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <resourcesDir>${project.build.outputDirectory}
+ </resourcesDir>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>${project.build.directory}/${artifactId}-${version}/WEB-INF/web.servlet.xml</webXml>
+ <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
+ <webResources>
+ <resource>
+ <directory>${project.basedir}/src/main/webapp
+ </directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.outputDirectory}
+ </directory>
+ <includes>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
+ <include>META-INF/DEPENDENCIES</include>
+ <include>META-INF/DISCLAIMER</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
+ <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>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+
+ <profile>
+ <id>execution-plugin-management</id>
+ <activation>
+ <property>
+ <name>assemblyId</name>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <resourcesDir>${project.build.outputDirectory}
+ </resourcesDir>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>${project.build.directory}/${artifactId}-${version}/WEB-INF/web.servlet.xml</webXml>
+ <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
+ <webResources>
+ <resource>
+ <directory>${project.basedir}/src/main/webapp
+ </directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.outputDirectory}
+ </directory>
+ <includes>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
+ <include>META-INF/DEPENDENCIES</include>
+ <include>META-INF/DISCLAIMER</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
+ <!--
+ NOTE: This horrible looking configuration sets up
+ the surefire plugin to not run tests during 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>
+ <systemProperties>
+ <property>
+ <name>wink-test-context-root</name>
+ <value>${artifactId}</value>
+ </property>
+ <property>
+ <name>wink-test-hostname</name>
+ <value>${wink.server.hostname}</value>
+ </property>
+ <property>
+ <name>wink-test-port</name>
+ <value>${wink.server.port}</value>
+ </property>
+ <property>
+ <name>wink-test-work-dir</name>
+ <value>${project.build.directory}</value>
+ </property>
+ <property>
+ <name>wink-test-container</name>
+ <value>${assemblyId}</value>
+ </property>
+ <property>
+ <name>wink-rest-filter-used</name>
+ <value>${wink.rest.filter.used}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <configuration>
+ <reporters>
+ <reporter
+ implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
+ <reportsDirectory>${project.build.directory}/surefire-reports
+ </reportsDirectory>
+ </reporter>
+ </reporters>
+
+ <assemblies>
+ <assembly>
+ <id>jetty</id>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-jetty6-javaee5</artifactId>
+ <version>2.1.4</version>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </assembly>
+
+ <assembly>
+ <id>jetty-minimal</id>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-jetty6-minimal</artifactId>
+ <version>2.1.4</version>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </assembly>
+
+ <assembly>
+ <id>tomcat</id>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-tomcat6-javaee5</artifactId>
+ <version>2.1.4</version>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </assembly>
+
+ <assembly>
+ <id>tomcat-minimal</id>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-tomcat6-minimal</artifactId>
+ <version>2.1.4</version>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </assembly>
+
+ <assembly>
+ <id>framework</id>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-framework</artifactId>
+ <version>2.1.4</version>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </assembly>
+ </assemblies>
+
+ <defaultAssemblyId>tomcat</defaultAssemblyId>
+
+ <optionSets>
+ <optionSet>
+ <id>morememory</id>
+ <options>
+ <option>-Xmx512m</option>
+ <option>-XX:MaxPermSize=128m</option>
+ </options>
+ </optionSet>
+
+ <optionSet>
+ <id>debug</id>
+ <options>
+ <option>-Xdebug</option>
+ <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
+ </options>
+ </optionSet>
+ </optionSets>
+ </configuration>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${artifactId}-${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>${groupId}/${artifactId}/${version}/war
+ </moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</profile>