Author: alessio.soldano(a)jboss.com Date: 2011-02-04 06:13:54 -0500 (Fri, 04 Feb 2011) New Revision: 13672 Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: [JBWS-3206] Minor changes Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-02-04 11:02:29 UTC (rev 13671) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-02-04 11:13:54 UTC (rev 13672) @@ -5,8 +5,9 @@ # Optional JBoss Home jboss600.home=(a)jboss600.home@ jboss601.home=(a)jboss601.home@ +jboss700.home=(a)jboss700.home@ -# The JBoss server under test. This can be [jboss600|jboss601] +# The JBoss server under test. This can be [jboss600|jboss601|jboss700] jbossws.integration.target=jboss601 # The JBoss settings Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-02-04 11:02:29 UTC (rev 13671) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-02-04 11:13:54 UTC (rev 13672) @@ -102,11 +102,11 @@ <target name="deploy-structure-jboss700" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <path id="jbossws-common.path"> + <path id="jbossws-common.path"> <fileset dir="${deploy.artifacts.dir}"> <include name="**/jbossws-common.jar"/> </fileset> - </path> + </path> <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> @@ -132,7 +132,7 @@ </fileset> </copy> <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS --> - <installModules targetDir="${jboss700.home}/modules"> + <installModules targetDir="${jboss700.home}/modules"> <fileset dir="${deploy.structure}/modules"> <include name="**/jboss/as/webservices/**/module.xml"/> </fileset> 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-02-04 11:02:29 UTC (rev 13671) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-02-04 11:13:54 UTC (rev 13672) @@ -324,7 +324,7 @@ <macrodef name="macro-deploy-jbossws-modules"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> - <sequential> + <sequential> <!-- libraries --> <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-client/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib">