Author: mwringe Date: 2009-11-03 18:12:36 -0500 (Tue, 03 Nov 2009) New Revision: 484 Modified: components/wci/trunk/test/servers/jboss42/pom.xml components/wci/trunk/test/servers/jboss51/pom.xml components/wci/trunk/test/servers/jetty6/pom.xml components/wci/trunk/test/servers/pom.xml components/wci/trunk/test/servers/tomcat6/pom.xml components/wci/trunk/test/servers/tomcat6/src/integration-tests/build.xml Log: Fix issue with tests not passing with a clean maven repo. Modified: components/wci/trunk/test/servers/jboss42/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/pom.xml 2009-11-03 22:49:06 UTC (rev 483) +++ components/wci/trunk/test/servers/jboss42/pom.xml 2009-11-03 23:12:36 UTC (rev 484) @@ -160,6 +160,18 @@ <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-assembly-plugin</artifactId> <configuration> <finalName>test</finalName> Modified: components/wci/trunk/test/servers/jboss51/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/pom.xml 2009-11-03 22:49:06 UTC (rev 483) +++ components/wci/trunk/test/servers/jboss51/pom.xml 2009-11-03 23:12:36 UTC (rev 484) @@ -160,6 +160,18 @@ <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-assembly-plugin</artifactId> <configuration> <finalName>test</finalName> Modified: components/wci/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/pom.xml 2009-11-03 22:49:06 UTC (rev 483) +++ components/wci/trunk/test/servers/jetty6/pom.xml 2009-11-03 23:12:36 UTC (rev 484) @@ -167,6 +167,18 @@ <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-assembly-plugin</artifactId> <configuration> <finalName>test</finalName> Modified: components/wci/trunk/test/servers/pom.xml =================================================================== --- components/wci/trunk/test/servers/pom.xml 2009-11-03 22:49:06 UTC (rev 483) +++ components/wci/trunk/test/servers/pom.xml 2009-11-03 23:12:36 UTC (rev 484) @@ -8,14 +8,7 @@ <artifactId>wci-test-server-parent</artifactId> <packaging>pom</packaging> <name>GateIn - WCI test server parent</name> -<!-- - <modules> - <module>tomcat6</module> - <module>jboss42</module> - <module>jboss51</module> - <module>jetty6</module> - </modules> ---> + <properties> <test.common.xml>${project.build.directory}/common/common.xml</test.common.xml> </properties> @@ -25,12 +18,12 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.3</version> + <version>1.4</version> <inherited>false</inherited> <executions> <execution> - <id>attach-artifact</id> - <phase>package</phase> + <id>attach-artifacts</id> + <phase>generate-resources</phase> <configuration> <artifacts> <artifact> @@ -47,27 +40,18 @@ </plugin> <plugin> <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-common-build.xml</id> - <phase>generate-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-test-server-parent</artifactId> - <version>${project.version}</version> - <type>xml</type> - <outputDirectory>${project.build.directory}/common</outputDirectory> - <destFileName>common.xml</destFileName> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-server-parent</artifactId> + <version>${project.version}</version> + <type>xml</type> + <outputDirectory>${project.build.directory}/common</outputDirectory> + <destFileName>common.xml</destFileName> + </artifactItem> + </artifactItems> + </configuration> </plugin> </plugins> </build> Modified: components/wci/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/pom.xml 2009-11-03 22:49:06 UTC (rev 483) +++ components/wci/trunk/test/servers/tomcat6/pom.xml 2009-11-03 23:12:36 UTC (rev 484) @@ -160,6 +160,18 @@ <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-assembly-plugin</artifactId> <configuration> <finalName>test</finalName> Modified: components/wci/trunk/test/servers/tomcat6/src/integration-tests/build.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/integration-tests/build.xml 2009-11-03 22:49:06 UTC (rev 483) +++ components/wci/trunk/test/servers/tomcat6/src/integration-tests/build.xml 2009-11-03 23:12:36 UTC (rev 484) @@ -49,7 +49,6 @@ <property name="cargo.logging" value="high"/> <property name="cargo.jvmargs" value="${cargo.debug}"/> - <file file="${test.temp.lib}/manager" todir="webapps/manager"/> --> <file file="${target.dir}/test-classes/config/server/tomcat-users.xml" tofile="conf/tomcat-users.xml"/> <deployable type="war" file="${cargo.war}"> <property name="context" value="${cargo.war.context}"/>