[jbossws-commits] JBossWS SVN: r15735 - in stack/native/branches/jbossws-native-4.0.x: modules/dist/src/main/scripts and 4 other directories.

Author: ropalka Date: 2012-02-24 09:27:43 -0500 (Fri, 24 Feb 2012) New Revision: 15735 Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml Log: Merged revisions 15726-15727,15731 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15726 | alessio.soldano(a)jboss.com | 2012-02-24 12:23:13 +0100 (Fri, 24 Feb 2012) | 2 lines [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 ....... r15727 | alessio.soldano(a)jboss.com | 2012-02-24 12:24:51 +0100 (Fri, 24 Feb 2012) | 2 lines Leftovers from previous removal of 700 target ....... r15731 | ropalka | 2012-02-24 15:14:42 +0100 (Fri, 24 Feb 2012) | 1 line [JBWS-3435] update bin distro to be able to execute appclient tests too ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731 Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-24 14:20:57 UTC (rev 15734) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-24 14:27:43 UTC (rev 15735) @@ -72,6 +72,11 @@ <include>etc/**</include> </includes> </fileSet> + <!-- Appclient patches --> + <fileSet> + <directory>../testsuite/src/test/resources/</directory> + <outputDirectory>jbossws-native-bin-dist/tests/etc/appclient</outputDirectory> + </fileSet> <!-- test excludes --> <fileSet> <directory>target/exclude-file</directory> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-02-24 14:20:57 UTC (rev 15734) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-02-24 14:27:43 UTC (rev 15735) @@ -43,22 +43,12 @@ <phase>package</phase> <configuration> <excludes> - <exclude>**/jbossws-jboss700/**</exclude> <exclude>**/jbossws-jboss701/**</exclude> <exclude>**/jbossws-jboss702/**</exclude> </excludes> </configuration> </execution> <execution> - <id>jboss700</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss700</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss700/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> <id>jboss701</id> <goals><goal>jar</goal></goals> <phase>package</phase> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-02-24 14:20:57 UTC (rev 15734) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-02-24 14:27:43 UTC (rev 15735) @@ -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/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-24 14:20:57 UTC (rev 15734) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-24 14:27:43 UTC (rev 15735) @@ -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/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-02-24 14:20:57 UTC (rev 15734) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-02-24 14:27:43 UTC (rev 15735) @@ -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>