Author: thomas.diesler(a)jboss.com Date: 2008-02-27 12:06:32 -0500 (Wed, 27 Feb 2008) New Revision: 5826 Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml stack/cxf/trunk/ant-import/build-deploy.xml stack/cxf/trunk/ant-import/macros-deploy-cxf.xml stack/cxf/trunk/src/main/distro/bin-dist-build.xml stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml Log: Fix bin-dist deployment. Fix chmod of deployed *.sh files Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-02-27 16:59:27 UTC (rev 5825) +++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-02-27 17:06:32 UTC (rev 5826) @@ -47,7 +47,7 @@ <!-- build --> <copy todir="${bindist.build.dir}"> <fileset dir="${cxf.dir}/ant-import"> - <include name="macros-deploy-framework.xml"/> + <include name="jbossws.default.undeploy.files"/> <include name="macros-deploy-cxf.xml"/> </fileset> </copy> Modified: stack/cxf/trunk/ant-import/build-deploy.xml =================================================================== --- stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-27 16:59:27 UTC (rev 5825) +++ stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-27 17:06:32 UTC (rev 5826) @@ -15,12 +15,14 @@ <import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml"/> + <property name="deploy.dir" value="${int.cxf.dir}/output/deploy"/> + <property name="jbossws.default.undeploy.files" value="${int.cxf.dir}/ant-import/jbossws.default.undeploy.files"/> + <!-- ================================================================== --> <!-- Deployment JBoss422 --> <!-- ================================================================== --> <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/cxf to jboss42"> - <macro-deploy-framework thirdpartylibs="${int.cxf.dir}/thirdparty"/> <macro-deploy-cxf422 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> </target> @@ -33,7 +35,6 @@ <!-- ================================================================== --> <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/cxf to jboss42"> - <macro-deploy-framework thirdpartylibs="${int.cxf.dir}/thirdparty"/> <macro-deploy-cxf423 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> </target> @@ -46,7 +47,6 @@ <!-- ================================================================== --> <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss50"> - <macro-deploy-framework thirdpartylibs="${int.cxf.dir}/thirdparty"/> <macro-deploy-cxf500 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> </target> @@ -59,7 +59,6 @@ <!-- ================================================================== --> <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/cxf to jboss50"> - <macro-deploy-framework thirdpartylibs="${int.cxf.dir}/thirdparty"/> <macro-deploy-cxf501 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> </target> Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-27 16:59:27 UTC (rev 5825) +++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-27 17:06:32 UTC (rev 5826) @@ -44,18 +44,17 @@ <sequential> <!-- BIN SCRIPTS --> - <unzip dest="${cxf.output.deploy.dir}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; - <chmod dir="${cxf.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> + <unzip dest="${deploy.dir}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; <!-- CLIENT JARS--> - <copy todir="${cxf.output.deploy.dir}/client"> + <copy todir="${deploy.dir}/client"> <fileset dir="@{thirdpartylibs}"> <patternset refid="client.patternset"/> </fileset> </copy> <!-- SERVER LIB JARS--> - <copy todir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib"> + <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib"> <fileset dir="@{thirdpartylibs}"> <patternset refid="server.lib.patternset"/> </fileset> @@ -81,16 +80,17 @@ <unzip dest=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot; src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; <!-- Deploy the jars --> - <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deployed.files"/> + <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws.deployed.files"/> <copy todir="@{jbosshome}" overwrite="true"> <fileset refid="jbossws.deploy.files"/> </copy> + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> <!-- Write jbossws.deployed.files --> <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${cxf.output.deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> - <replace file="${cxf.output.deploy.dir}/jbossws.deployed.files" token=";" value=" "/> - <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; file="${cxf.output.deploy.dir}/jbossws.deployed.files" overwrite="true"/> + <echo file="${deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> + <replace file="${deploy.dir}/jbossws.deployed.files" token=";" value=" "/> + <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; file="${deploy.dir}/jbossws.deployed.files" overwrite="true"/> </sequential> </macrodef> @@ -103,10 +103,10 @@ <attribute name="jbosshome"/> <sequential> - <delete dir="${cxf.output.deploy.dir}"/> + <delete dir="${deploy.dir}"/> <loadfile property="jbossws.undeploy.files" srcfile=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files&quot; failonerror="false"/> - <loadfile property="jbossws.undeploy.files" srcfile="${int.cxf.dir}/ant-import/jbossws.default.undeploy.files" failonerror="false"/> + <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/> <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot;/&gt; <delete> @@ -126,8 +126,8 @@ <sequential> <!-- CLIENT JARS --> - <mkdir dir="${cxf.output.deploy.dir}/client"/> - <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> + <mkdir dir="${deploy.dir}/client"/> + <copy todir="${deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="client.patternset"/> </fileset> @@ -137,8 +137,8 @@ </copy> <!-- LIB JARS --> - <mkdir dir="${cxf.output.deploy.dir}/lib"/> - <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true"> + <mkdir dir="${deploy.dir}/lib"/> + <copy todir="${deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <patternset refid="lib.patternset"/> </fileset> @@ -156,6 +156,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-cxf42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss422.home}" sarname="jbossws-cxf42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -178,6 +179,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-cxf42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss423.home}" sarname="jbossws-cxf42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -201,8 +203,8 @@ <sequential> <!-- CLIENT JARS --> - <mkdir dir="${cxf.output.deploy.dir}/client"/> - <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> + <mkdir dir="${deploy.dir}/client"/> + <copy todir="${deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="client.patternset"/> </fileset> @@ -212,15 +214,15 @@ </copy> <!-- LIB JARS --> - <mkdir dir="${cxf.output.deploy.dir}/lib"/> - <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true"> + <mkdir dir="${deploy.dir}/lib"/> + <copy todir="${deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <patternset refid="lib.patternset"/> </fileset> </copy> <!-- SERVER JARS --> - <copy todir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> + <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="server.lib.patternset"/> </fileset> @@ -238,6 +240,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-cxf50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss500.home}" sarname="jbossws-cxf50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -260,6 +263,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-cxf50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss501.home}" sarname="jbossws-cxf50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-02-27 16:59:27 UTC (rev 5825) +++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-02-27 17:06:32 UTC (rev 5826) @@ -19,11 +19,14 @@ <property name="build.dir" value="${basedir}/build"/> <property name="bin.dir" value="${basedir}/bin"/> + <property name="deploy.dir" value="${basedir}/output/deploy"/> <property name="docs.dir" value="${basedir}/docs"/> <property name="lib.dir" value="${basedir}/lib"/> <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${basedir}/output"/> + <property name="jbossws.default.undeploy.files" value="${build.dir}/jbossws.default.undeploy.files"/> + <property file="${basedir}/ant.properties"/> <property file="${basedir}/version.properties"/> @@ -85,7 +88,6 @@ <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> <import file="${basedir}/build/build-deploy.xml"/> - <import file="${basedir}/build/macros-deploy-framework.xml"/> <import file="${basedir}/build/macros-deploy-cxf.xml"/> <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> Modified: stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-27 16:59:27 UTC (rev 5825) +++ stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-27 17:06:32 UTC (rev 5826) @@ -20,20 +20,15 @@ <!-- Deploy jbossws/cxf to jboss422 --> <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/cxf to jboss422"> <macro-deploy-cxf422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss422.home}"/> </target> <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss422.home}" thirdpartylibs="${lib.dir}"/> </target> <!-- Remove jbossws/cxf from jboss422 --> - <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/cxf from jboss422"> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss422"> <macro-undeploy-cxf422/> - <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> - <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> - </target> <!-- ================================================================== --> <!-- Deployment JBoss-4.2.3 --> @@ -42,20 +37,15 @@ <!-- Deploy jbossws/cxf to jboss423 --> <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/cxf to jboss423"> <macro-deploy-cxf423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss423.home}"/> </target> <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss423.home}" thirdpartylibs="${lib.dir}"/> </target> <!-- Remove jbossws/cxf from jboss423 --> - <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/cxf from jboss423"> + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/cxf from jboss423"> <macro-undeploy-cxf423/> - <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> - <target name="undeploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> - </target> <!-- ================================================================== --> <!-- Deployment JBoss-5.0.0 --> @@ -64,7 +54,6 @@ <!-- Deploy jbossws/cxf to jboss500 --> <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/cxf to jboss500"> <macro-deploy-cxf500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss500.home}"/> </target> <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss500.home}" thirdpartylibs="${lib.dir}"/> @@ -73,7 +62,6 @@ <!-- Remove jbossws/cxf from jboss500 --> <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500"> <macro-undeploy-cxf500/> - <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> <!-- ================================================================== --> @@ -83,7 +71,6 @@ <!-- Deploy jbossws/cxf to jboss501 --> <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/cxf to jboss501"> <macro-deploy-cxf501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss501.home}"/> </target> <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss501.home}" thirdpartylibs="${lib.dir}"/> @@ -92,7 +79,6 @@ <!-- Remove jbossws/cxf from jboss501 --> <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/cxf from jboss501"> <macro-undeploy-cxf501/> - <macro-undeploy-framework jbosshome="${jboss501.home}"/> </target> </project>