Author: julien_viet
Date: 2011-08-13 17:43:05 -0400 (Sat, 13 Aug 2011)
New Revision: 7075
Modified:
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
more DRY
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-08-13 21:24:50 UTC (rev 7074)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-08-13 21:43:05 UTC (rev 7075)
@@ -19,105 +19,6 @@
</dependencies>
- <profiles>
- <!--By default Annotation Processing Tool related classes need to be
disabled-->
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>org/gatein/pc/test/unit/reports/*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>apt</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
-
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
- <force>true</force>
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- <!--On MacOSX the tools.jar should be already in the classpath-->
- <profile>
- <id>apt-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
-
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
- <force>true</force>
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>cargo.debug</id>
- <properties>
- <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug>
- </properties>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-08-13 21:24:50 UTC (rev 7074)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-08-13 21:43:05 UTC (rev 7075)
@@ -18,105 +18,6 @@
</dependencies>
- <profiles>
- <!--By default Annotation Processing Tool related classes need to be
disabled-->
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>org/gatein/pc/test/unit/reports/*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>apt</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
-
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
- <force>true</force>
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- <!--On MacOSX the tools.jar should be already in the classpath-->
- <profile>
- <id>apt-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
-
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
- <force>true</force>
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>cargo.debug</id>
- <properties>
- <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug>
- </properties>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
Modified: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml 2011-08-13 21:24:50 UTC (rev 7074)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-08-13 21:43:05 UTC (rev 7075)
@@ -18,105 +18,6 @@
</dependencies>
- <profiles>
- <!--By default Annotation Processing Tool related classes need to be
disabled-->
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>org/gatein/pc/test/unit/reports/*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>apt</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
-
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
- <force>true</force>
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- <!--On MacOSX the tools.jar should be already in the classpath-->
- <profile>
- <id>apt-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
-
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
- <force>true</force>
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>cargo.debug</id>
- <properties>
- <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug>
- </properties>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-08-13 21:24:50 UTC (rev 7074)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-08-13 21:43:05 UTC (rev 7075)
@@ -25,105 +25,6 @@
</dependencies>
- <profiles>
- <!--By default Annotation Processing Tool related classes need to be
disabled-->
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>org/gatein/pc/test/unit/reports/*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>apt</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
-
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
- <force>true</force>
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- <!--On MacOSX the tools.jar should be already in the classpath-->
- <profile>
- <id>apt-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
-
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
- <force>true</force>
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>cargo.debug</id>
- <properties>
- <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug>
- </properties>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-08-13 21:24:50 UTC (rev 7074)
+++ components/pc/trunk/test/servers/pom.xml 2011-08-13 21:43:05 UTC (rev 7075)
@@ -204,7 +204,15 @@
</dependencies>
+ <build>
+
+ </build>
+
<profiles>
+
+ <!-- ***************************************************************** -->
+ <!-- * Server profiles * -->
+ <!-- ***************************************************************** -->
<profile>
<id>default-servers</id>
<activation>
@@ -280,6 +288,79 @@
<module>jetty6</module>
</modules>
</profile>
+
+
+ <!-- ***************************************************************** -->
+ <!-- * APT related stuff * -->
+ <!-- ***************************************************************** -->
+ <profile>
+ <id>apt</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>maven-apt-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
+ <force>true</force>
+ <target>1.5</target>
+ <nocompile>true</nocompile>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ <goals>
+ <goal>testExecute</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ <!--On MacOSX the tools.jar should be already in the classpath-->
+ <profile>
+ <id>apt-mac</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>maven-apt-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
+ <force>true</force>
+ <target>1.5</target>
+ <nocompile>true</nocompile>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ <goals>
+ <goal>testExecute</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>cargo.debug</id>
+ <properties>
+ <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug>
+ </properties>
+ </profile>
</profiles>
</project>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-08-13 21:24:50 UTC (rev 7074)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-08-13 21:43:05 UTC (rev 7075)
@@ -18,105 +18,6 @@
</dependencies>
- <profiles>
- <!--By default Annotation Processing Tool related classes need to be
disabled-->
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>org/gatein/pc/test/unit/reports/*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>apt</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
-
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
- <force>true</force>
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- <!--On MacOSX the tools.jar should be already in the classpath-->
- <profile>
- <id>apt-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
-
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
- <force>true</force>
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>cargo.debug</id>
- <properties>
- <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug>
- </properties>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-08-13 21:24:50 UTC (rev 7074)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-08-13 21:43:05 UTC (rev 7075)
@@ -18,105 +18,6 @@
</dependencies>
- <profiles>
- <!--By default Annotation Processing Tool related classes need to be
disabled-->
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>org/gatein/pc/test/unit/reports/*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>apt</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
-
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
- <force>true</force>
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- <!--On MacOSX the tools.jar should be already in the classpath-->
- <profile>
- <id>apt-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
-
<factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
- <force>true</force>
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>cargo.debug</id>
- <properties>
- <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug>
- </properties>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>