[jbossws-commits] JBossWS SVN: r15269 - in stack/cxf/trunk/modules: resources/src/main/resources/resources and 1 other directories.

Author: alessio.soldano(a)jboss.com Date: 2011-11-16 08:38:37 -0500 (Wed, 16 Nov 2011) New Revision: 15269 Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3381] Fixing spring testsuite Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-11-16 12:05:21 UTC (rev 15268) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-11-16 13:38:37 UTC (rev 15269) @@ -126,7 +126,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss70x,check-spring,install-spring-module" description="Deploy jbossws to jboss700"> + <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss70x,check-spring,install-spring-module70x" description="Deploy jbossws to jboss700"> <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/> <copy todir="${jboss700.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"> @@ -155,7 +155,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss701" depends="undeploy-jboss701,deploy-structure-jboss70x,check-spring,install-spring-module" description="Deploy jbossws to jboss701"> + <target name="deploy-jboss701" depends="undeploy-jboss701,deploy-structure-jboss70x,check-spring,install-spring-module70x" description="Deploy jbossws to jboss701"> <fail message="Not available: ${jboss701.available.file}" unless="jboss701.available"/> <copy todir="${jboss701.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"> @@ -184,7 +184,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss702" depends="undeploy-jboss702,deploy-structure-jboss70x,check-spring,install-spring-module" description="Deploy jbossws to jboss702"> + <target name="deploy-jboss702" depends="undeploy-jboss702,deploy-structure-jboss70x,check-spring,install-spring-module70x" description="Deploy jbossws to jboss702"> <fail message="Not available: ${jboss702.available.file}" unless="jboss702.available"/> <copy todir="${jboss702.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"> @@ -235,7 +235,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss710,check-spring,install-spring-module" description="Deploy jbossws to jboss710"> + <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss710,check-spring,install-spring-module71x" description="Deploy jbossws to jboss710"> <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> <copy todir="${jboss710.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"> @@ -273,14 +273,22 @@ </antcall> </target> - <target name="install-spring-module" if="spring-required"> + <target name="install-spring-module70x" if="spring-required"> <antcall target="deploy-spring-module" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> + <param name="modules-jbossid" value="jboss700"/> </antcall> </target> + <target name="install-spring-module71x" if="spring-required"> + <antcall target="deploy-spring-module" inheritall="false"> + <param name="installserver" value="${deploy.structure}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="modules-jbossid" value="jboss710"/> + </antcall> + </target> + <!-- ================================================================== --> <!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf --> <!-- ================================================================== --> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-11-16 12:05:21 UTC (rev 15268) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-11-16 13:38:37 UTC (rev 15269) @@ -450,7 +450,7 @@ <macrodef name="macro-install-spring-modules"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> - <attribute name="jbossid"/> + <attribute name="modules-jbossid"/> <sequential> <!-- libraries --> <copy todir="@{targetdir}/org/springframework/spring/main" flatten="false" overwrite="true"> @@ -460,7 +460,7 @@ </copy> <!-- module.xml files --> <installModules targetDir="@{targetdir}"> - <fileset dir="@{thirdpartydir}/modules/@{jbossid}"> + <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}"> <include name="**/spring/**/module.xml"/> </fileset> </installModules> @@ -488,7 +488,7 @@ <target name="deploy-spring-module"> <fail message="installserver must be specified" unless="installserver"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> - <macro-install-spring-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-install-spring-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" modules-jbossid="${modules-jbossid}"/> </target> <!-- ================================================================== --> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-16 12:05:21 UTC (rev 15268) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-16 13:38:37 UTC (rev 15269) @@ -1256,6 +1256,7 @@ <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude> <!-- @WebServiceRef / webserviceref not implemented / ready yet on AS7.0.x --> + <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude> @@ -1443,6 +1444,7 @@ <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude> <!-- @WebServiceRef / webserviceref not implemented / ready yet on AS7.0.x --> + <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>