[gatein-commits] gatein SVN: r7073 - in components/pc/trunk/test: servers and 12 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sat Aug 13 16:51:25 EDT 2011
Author: julien_viet
Date: 2011-08-13 16:51:25 -0400 (Sat, 13 Aug 2011)
New Revision: 7073
Removed:
components/pc/trunk/test/servers/src/
Modified:
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss42/src/test/build.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss51/src/test/build.xml
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jboss6/src/test/build.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/jetty6/src/test/build.xml
components/pc/trunk/test/servers/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat6/src/test/build.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
components/pc/trunk/test/servers/tomcat7/src/test/build.xml
Log:
improve bundling of common.xml for tested servers
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/core/pom.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -294,6 +294,30 @@
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.4</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>src/main/resources/common.xml</file>
+ <type>xml</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta04-SNAPSHOT</version>
+ <version>2.3.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss42</artifactId>
@@ -167,6 +167,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ </dependency>
+
<!-- JSTL for Tomcat -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -305,18 +312,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-common-build.xml</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.5</version>
@@ -383,10 +378,6 @@
</not>
</condition>
- <!-- location of common.xml shared between the different server's build.xml -->
- <!-- for now hardcode like that, it should be probably moved to the test-core package -->
- <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml"/>
-
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests"/>
</ant>
Modified: components/pc/trunk/test/servers/jboss42/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/src/test/build.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/jboss42/src/test/build.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project name="tomcat-integration-test" default="tests">
- <import file="${common.xml.file}"/>
+ <import file="${org.gatein.pc:pc-test-core:xml}"/>
<!-- SYSTEM PROPERTIES -->
<property environment="env"/>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -166,6 +166,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ </dependency>
+
<!-- JSTL for Tomcat -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -310,18 +317,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-common-build.xml</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.5</version>
@@ -388,10 +383,6 @@
</not>
</condition>
- <!-- location of common.xml shared between the different server's build.xml -->
- <!-- for now hardcode like that, it should be probably moved to the test-core package -->
- <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml" />
-
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests" />
</ant>
Modified: components/pc/trunk/test/servers/jboss51/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/src/test/build.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/jboss51/src/test/build.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project name="tomcat-integration-test" default="tests">
- <import file="${common.xml.file}"/>
+ <import file="${org.gatein.pc:pc-test-core:xml}"/>
<!-- SYSTEM PROPERTIES -->
<property environment="env"/>
Modified: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -166,6 +166,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ </dependency>
+
<!-- JSTL for Tomcat -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -310,18 +317,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-common-build.xml</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.5</version>
@@ -388,10 +383,6 @@
</not>
</condition>
- <!-- location of common.xml shared between the different server's build.xml -->
- <!-- for now hardcode like that, it should be probably moved to the test-core package -->
- <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml" />
-
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests" />
</ant>
Modified: components/pc/trunk/test/servers/jboss6/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/build.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/jboss6/src/test/build.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project name="jboss-6-integration-test" default="tests">
- <import file="${common.xml.file}"/>
+ <import file="${org.gatein.pc:pc-test-core:xml}"/>
<!-- SYSTEM PROPERTIES -->
<property environment="env"/>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -172,6 +172,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ </dependency>
+
<!-- JSTL for Tomcat -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -310,18 +317,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-common-build.xml</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.5</version>
@@ -388,10 +383,6 @@
</not>
</condition>
- <!-- location of common.xml shared between the different server's build.xml -->
- <!-- for now hardcode like that, it should be probably moved to the test-core package -->
- <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml" />
-
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests" />
</ant>
Modified: components/pc/trunk/test/servers/jetty6/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/src/test/build.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/jetty6/src/test/build.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project name="tomcat-integration-test" default="tests">
- <import file="${common.xml.file}"/>
+ <import file="${org.gatein.pc:pc-test-core:xml}"/>
<!-- SYSTEM PROPERTIES -->
<property environment="env"/>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/pom.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -9,53 +9,6 @@
<packaging>pom</packaging>
<name>GateIn - Portlet Container (test - servers)</name>
- <properties>
- <test.common.xml>${project.build.directory}/common/common.xml</test.common.xml>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.4</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>generate-resources</phase>
- <configuration>
- <artifacts>
- <artifact>
- <file>src/common/resources/common.xml</file>
- <type>xml</type>
- </artifact>
- </artifacts>
- </configuration>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-test-servers</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <outputDirectory>${project.build.directory}/common</outputDirectory>
- <destFileName>common.xml</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>default-servers</id>
@@ -64,7 +17,7 @@
</activation>
<modules>
<module>tomcat6</module>
- <!--<module>tomcat7</module>-->
+ <module>tomcat7</module>
<module>jboss51</module>
<module>jboss6</module>
<module>jetty6</module>
@@ -77,6 +30,7 @@
<module>tomcat7</module>
<module>jboss42</module>
<module>jboss51</module>
+ <module>jboss6</module>
<module>jetty6</module>
</modules>
</profile>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -166,6 +166,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ </dependency>
+
<!-- JSTL for Tomcat -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -304,18 +311,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-common-build.xml</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.5</version>
@@ -382,10 +377,6 @@
</not>
</condition>
- <!-- location of common.xml shared between the different server's build.xml -->
- <!-- for now hardcode like that, it should be probably moved to the test-core package -->
- <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml" />
-
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests" />
</ant>
Modified: components/pc/trunk/test/servers/tomcat6/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project name="tomcat-integration-test" default="tests">
- <import file="${common.xml.file}"/>
+ <import file="${org.gatein.pc:pc-test-core:xml}"/>
<!-- SYSTEM PROPERTIES -->
<property environment="env"/>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -167,6 +167,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ </dependency>
+
<!-- JSTL for Tomcat -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -305,18 +312,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-common-build.xml</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.5</version>
@@ -383,10 +378,6 @@
</not>
</condition>
- <!-- location of common.xml shared between the different server's build.xml -->
- <!-- for now hardcode like that, it should be probably moved to the test-core package -->
- <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml" />
-
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests" />
</ant>
Modified: components/pc/trunk/test/servers/tomcat7/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/src/test/build.xml 2011-08-13 19:30:27 UTC (rev 7072)
+++ components/pc/trunk/test/servers/tomcat7/src/test/build.xml 2011-08-13 20:51:25 UTC (rev 7073)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project name="tomcat-integration-test" default="tests">
- <import file="${common.xml.file}"/>
+ <import file="${org.gatein.pc:pc-test-core:xml}"/>
<!-- SYSTEM PROPERTIES -->
<property environment="env"/>
More information about the gatein-commits
mailing list