Author: thomas.diesler(a)jboss.com Date: 2008-03-11 15:51:05 -0400 (Tue, 11 Mar 2008) New Revision: 5922 Modified: stack/native/trunk/ant-import/build-deploy.xml Log: Create jbossws-deploy.conf Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2008-03-11 19:42:39 UTC (rev 5921) +++ stack/native/trunk/ant-import/build-deploy.xml 2008-03-11 19:51:05 UTC (rev 5922) @@ -18,20 +18,12 @@ <!-- ================================================================== --> <target name="deploy-structure-jboss42" depends="prepare-deploy"> - - <!-- Create the deployment structure --> <antcall target="deploy-jbossws-native42" inheritall="false"> <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/> <param name="resourcesdir" value="${deploy.artifacts.dir}/resources/jbossws-jboss42.sar"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> </antcall> - - <!-- Create jbossws-deploy.conf --> - <fileset id="jbossws.deploy.fileset" dir="${deploy.structure.jboss42}" excludes="**/jbossws.sar/**"/> - <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> - <property name="jbossws.sar.dir" value="${deploy.structure.jboss42}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/> - <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/> + <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> </target> <!-- ================================================================== --> @@ -102,19 +94,11 @@ <!-- ================================================================== --> <target name="deploy-structure-jboss50" depends="prepare-deploy"> - - <!-- Create the deployment structure --> <antcall target="deploy-jbossws-native50" inheritall="false"> <param name="installserver" value="${deploy.structure.jboss50}/server/${jboss.server.instance}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> </antcall> - - <!-- Create jbossws-deploy.conf --> - <fileset id="jbossws.deploy.fileset" dir="${deploy.structure.jboss50}" excludes="**/jbossws.sar/**"/> - <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> - <property name="jbossws.sar.dir" value="${deploy.structure.jboss50}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/> - <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/> + <macro-create-deploy-conf deploystructure="${deploy.structure.jboss50}"/> </target> <!-- ================================================================== --> @@ -151,4 +135,19 @@ <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target> + <!-- ================================================================== --> + <!-- Create jbossws-deploy.conf --> + <!-- ================================================================== --> + + <macrodef name="macro-create-deploy-conf"> + <attribute name="deploystructure"/> + <sequential> + <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/> + <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> + <property name="jbossws.sar.dir" value=&quot;(a){deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; + <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/> + <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/> + </sequential> + </macrodef> + </project>