Author: alessio.soldano(a)jboss.com Date: 2012-02-24 06:23:13 -0500 (Fri, 24 Feb 2012) New Revision: 15726 Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/shared-tests/pom.xml Log: [JBWS-3435] Moving appclient patching to the modules actually using it and also running the task in pre-integration-test maven phase only to avoid duplicated exections Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2012-02-24 11:05:18 UTC (rev 15725) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2012-02-24 11:23:13 UTC (rev 15726) @@ -119,6 +119,24 @@ </tasks> </configuration> </execution> + <execution> + <id>appclient-patch</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy + file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient.xml" + tofile="${jboss.home}/appclient/configuration/appclient.xml" + failonerror="false" + verbose="true" + overwrite="true" + /> + </tasks> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-02-24 11:05:18 UTC (rev 15725) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-02-24 11:23:13 UTC (rev 15726) @@ -1347,61 +1347,6 @@ </properties> </profile> - <profile> - <id>noprepare</id> - <activation> - <property> - <name>!noprepare</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>appclient-patch</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <!-- TODO: I didn't find way how to reference project root directory in maven :( --> - <!-- The ${basedir} value changes depending in which directory the build is executed. --> - <tasks> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXX patching appclient 1-st attempt XXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <copy - file="${basedir}/../src/test/resources/${jbossws.integration.target}/appclient.xml" - tofile="${jboss.home}/appclient/configuration/appclient.xml" - failonerror="false" - verbose="true" - overwrite="true" - /> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXX patching appclient 2-nd attempt XXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <copy - file="${basedir}/src/test/resources/${jbossws.integration.target}/appclient.xml" - tofile="${jboss.home}/appclient/configuration/appclient.xml" - failonerror="false" - verbose="true" - overwrite="true" - /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: stack/native/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/shared-tests/pom.xml 2012-02-24 11:05:18 UTC (rev 15725) +++ stack/native/trunk/modules/testsuite/shared-tests/pom.xml 2012-02-24 11:23:13 UTC (rev 15726) @@ -133,6 +133,24 @@ </tasks> </configuration> </execution> + <execution> + <id>appclient-patch</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy + file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient.xml" + tofile="${jboss.home}/appclient/configuration/appclient.xml" + failonerror="false" + verbose="true" + overwrite="true" + /> + </tasks> + </configuration> + </execution> </executions> </plugin> </plugins>