[jbossws-commits] JBossWS SVN: r5824 - in stack/native/trunk: src/main/distro and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2008-02-27 11:51:51 -0500 (Wed, 27 Feb 2008) New Revision: 5824 Modified: stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/macros-deploy-native.xml stack/native/trunk/src/main/distro/bin-dist-build.xml stack/native/trunk/src/main/distro/bin-dist-deploy.xml Log: Fix bin-dist deployment. Fix chmod of deployed *.sh files Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-27 16:36:37 UTC (rev 5823) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-27 16:51:51 UTC (rev 5824) @@ -48,7 +48,7 @@ <!-- build --> <copy todir="${bindist.build.dir}"> <fileset dir="${core.dir}/ant-import"> - <include name="macros-deploy-framework.xml"/> + <include name="jbossws.default.undeploy.files"/> <include name="macros-deploy-native.xml"/> </fileset> <fileset dir="${core.distro.dir}"> Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2008-02-27 16:36:37 UTC (rev 5823) +++ stack/native/trunk/ant-import/build-deploy.xml 2008-02-27 16:51:51 UTC (rev 5824) @@ -15,13 +15,15 @@ <import file="${core.dir}/ant-import/macros-deploy-native.xml"/> + <property name="deploy.dir" value="${core.dir}/output/deploy"/> + <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws.default.undeploy.files"/> + <!-- ================================================================== --> <!-- Deployment JBoss421 --> <!-- ================================================================== --> <!-- Deploy jbossws to jboss421 --> <target name="deploy-jboss421" depends="jars-jboss42,undeploy-jboss421,deploy-jboss421-endorsed" description="Deploy jbossws to jboss421"> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native421 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> @@ -36,7 +38,6 @@ <!-- Deploy jbossws to jboss422 --> <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws to jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native422 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> @@ -52,7 +53,6 @@ <!-- Deploy jbossws to jboss423 --> <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws to jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native423 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> @@ -67,7 +67,6 @@ <!-- Deploy jbossws to jboss500 --> <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws to jboss500"> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native500 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> @@ -85,7 +84,6 @@ <!-- Deploy jbossws to jboss501 --> <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws to jboss501"> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native501 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> Modified: stack/native/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-27 16:36:37 UTC (rev 5823) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-27 16:51:51 UTC (rev 5824) @@ -69,8 +69,8 @@ <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - <mkdir dir="${core.output.deploy.dir}/lib/endorsed"/> - <copy todir="${core.output.deploy.dir}/lib/endorsed" overwrite="true"> + <mkdir dir="${deploy.dir}/lib/endorsed"/> + <copy todir="${deploy.dir}/lib/endorsed" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <patternset refid="lib.endorsed.patternset"/> </fileset> @@ -90,18 +90,17 @@ <sequential> <!-- BIN SCRIPTS --> - <unzip dest="${core.output.deploy.dir}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; - <chmod dir="${core.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="${core.output.deploy.dir}/client"> + <copy todir="${deploy.dir}/client"> <fileset dir="@{thirdpartylibs}"> <patternset refid="client.patternset"/> </fileset> </copy> <!-- SERVER LIB JARS--> - <copy todir="${core.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> @@ -127,16 +126,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="${core.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="${core.output.deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> - <replace file="${core.output.deploy.dir}/jbossws.deployed.files" token=";" value=" "/> - <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; file="${core.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> @@ -149,10 +149,10 @@ <attribute name="jbosshome"/> <sequential> - <delete dir="${core.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="${core.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> @@ -172,14 +172,15 @@ <sequential> <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> + <!-- BIN SCRIPTS --> - <mkdir dir="${core.output.deploy.dir}/bin"/> - <unzip dest="${core.output.deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> + <mkdir dir="${deploy.dir}/bin"/> + <unzip dest="${deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; <!-- CLIENT JARS --> - <mkdir dir="${core.output.deploy.dir}/client"/> - <copy todir="${core.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"/> <include name="jbossws-jboss421.jar"/> @@ -191,8 +192,8 @@ </copy> <!-- LIB JARS --> - <mkdir dir="${core.output.deploy.dir}/lib"/> - <copy todir="${core.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"/> <include name="jboss-xml-binding.jar"/> @@ -200,8 +201,8 @@ </copy> <!-- SERVER LIB JARS --> - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib"/> - <copy todir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> + <mkdir dir="${deploy.dir}/server/${jboss.server.instance}/lib"/> + <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <include name="jbossws-jboss421.jar"/> </fileset> @@ -229,13 +230,12 @@ <sequential> <!-- BIN SCRIPTS --> - <mkdir dir="${core.output.deploy.dir}/bin"/> - <unzip dest="${core.output.deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> + <mkdir dir="${deploy.dir}/bin"/> + <unzip dest="${deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; <!-- CLIENT JARS --> - <mkdir dir="${core.output.deploy.dir}/client"/> - <copy todir="${core.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> @@ -256,6 +256,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-native42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss422.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -277,6 +278,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-native42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss423.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -299,13 +301,12 @@ <sequential> <!-- BIN SCRIPTS --> - <mkdir dir="${core.output.deploy.dir}/bin"/> - <unzip dest="${core.output.deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> + <mkdir dir="${deploy.dir}/bin"/> + <unzip dest="${deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; <!-- CLIENT JARS --> - <mkdir dir="${core.output.deploy.dir}/client"/> - <copy todir="${core.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> @@ -315,15 +316,15 @@ </copy> <!-- LIB JARS --> - <mkdir dir="${core.output.deploy.dir}/lib"/> - <copy todir="${core.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="${core.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> @@ -341,6 +342,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-native50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss500.home}" sarname="jbossws-native50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -362,6 +364,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-native50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss501.home}" sarname="jbossws-native50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-27 16:36:37 UTC (rev 5823) +++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-27 16:51:51 UTC (rev 5824) @@ -19,12 +19,15 @@ <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="thirdparty.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"/> @@ -96,7 +99,6 @@ <import file="${basedir}/build/build-deploy.xml"/> <import file="${basedir}/build/build-project-gen.xml"/> - <import file="${basedir}/build/macros-deploy-framework.xml"/> <import file="${basedir}/build/macros-deploy-native.xml"/> <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-27 16:36:37 UTC (rev 5823) +++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-27 16:51:51 UTC (rev 5824) @@ -20,58 +20,42 @@ <!-- Deploy jbossws/native to jboss421 --> <target name="deploy-jboss421" depends="undeploy-jboss421,deploy-jboss421-endorsed" description="Deploy jbossws/native to jboss421"> <macro-deploy-native421 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss421.home}"/> </target> <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss421.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> - <target name="undeploy-jboss421" depends="prepare,undeploy-jboss421-endorsed" description="Remove jbossws/native from jboss421"> + <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws/native from jboss421"> <macro-undeploy-native421/> - <macro-undeploy-framework jbosshome="${jboss421.home}"/> </target> - <target name="undeploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss421.home}"/> - </target> <!-- Deploy jbossws/native to jboss422 --> <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/native to jboss422"> <macro-deploy-native422 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}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> - <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/native from jboss422"> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/native from jboss422"> <macro-undeploy-native422/> - <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> <!-- Deploy jbossws/native to jboss423 --> <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/native to jboss423"> <macro-deploy-native423 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}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> - <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/native from jboss423"> + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/native from jboss423"> <macro-undeploy-native423/> - <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> <!-- Deploy jbossws/native to jboss50 --> <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/native to jboss500"> <macro-deploy-native500 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}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> @@ -79,7 +63,6 @@ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/native from jboss500"> <macro-undeploy-native500/> - <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> <!-- ================================================================== --> @@ -89,7 +72,6 @@ <!-- Deploy jbossws/native to jboss501 --> <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/native to jboss501"> <macro-deploy-native501 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}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> @@ -97,7 +79,6 @@ <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> <macro-undeploy-native501/> - <macro-undeploy-framework jbosshome="${jboss501.home}"/> </target> </project>