Author: ropalka Date: 2012-02-24 09:20:57 -0500 (Fri, 24 Feb 2012) New Revision: 15734 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml Log: Merged revisions 15723,15725,15730 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15723 | alessio.soldano(a)jboss.com | 2012-02-24 11:58:44 +0100 (Fri, 24 Feb 2012) | 2 lines [JBWS-3435] Moving appclient patching to the module that actually needs that only (shared testsuite in cxf stack) and also running the task in pre-integration-test maven phase only to avoid duplicated exections ....... r15725 | ropalka | 2012-02-24 12:05:18 +0100 (Fri, 24 Feb 2012) | 1 line [JBWS-3444] enabling last excluded appclient test in CXF test suite ....... r15730 | ropalka | 2012-02-24 15:11:48 +0100 (Fri, 24 Feb 2012) | 1 line [JBWS-3435] update bin distro to be able to execute appclient tests too ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713,15719 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713,15719,15723-15730 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-24 14:20:13 UTC (rev 15733) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-24 14:20:57 UTC (rev 15734) @@ -90,7 +90,12 @@ <include>resources/jaxws/samples/**</include> </includes> </fileSet> + <!-- Appclient patches --> <fileSet> + <directory>../testsuite/src/test/resources/</directory> + <outputDirectory>jbossws-cxf-bin-dist/tests/etc/appclient</outputDirectory> + </fileSet> + <fileSet> <directory>../testsuite/cxf-tests/scripts</directory> <outputDirectory>jbossws-cxf-bin-dist/tests/ant-import</outputDirectory> <includes> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-24 14:20:13 UTC (rev 15733) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-24 14:20:57 UTC (rev 15734) @@ -1346,10 +1346,6 @@ <!-- # TODO: JAXR not available --> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - - <!-- # TODO: remote JNDI support (non EJB objects) --> - <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude> - </excludes> </configuration> </plugin> @@ -1399,61 +1395,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/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-02-24 14:20:13 UTC (rev 15733) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-02-24 14:20:57 UTC (rev 15734) @@ -132,6 +132,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> <plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run -->