[jbossws-commits] JBossWS SVN: r3377 - in trunk/integration: spi/ant-import and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-06-01 14:08:07 -0400 (Fri, 01 Jun 2007) New Revision: 3377 Modified: trunk/integration/native/ant-import/build-deploy.xml trunk/integration/spi/ant-import/macros-deploy-spi.xml trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/build-deploy.xml Log: Fix deploy-spi Modified: trunk/integration/native/ant-import/build-deploy.xml =================================================================== --- trunk/integration/native/ant-import/build-deploy.xml 2007-06-01 15:48:48 UTC (rev 3376) +++ trunk/integration/native/ant-import/build-deploy.xml 2007-06-01 18:08:07 UTC (rev 3377) @@ -34,13 +34,14 @@ <macro-deploy-spi spilibs="${spi.dir}/output/lib" spiscripts="${spi.dir}/etc" - thirdpartylibs="${spi.dir}/thirdparty"/> + thirdpartylibs="${spi.dir}/thirdparty" + jbosshome="${jboss50.home}"/> </target> <!-- Remove jbossws from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> <macro-undeploy-native50/> - <macro-undeploy-spi/> + <macro-undeploy-spi jbosshome="${jboss50.home}"/> </target> <!-- Deploy jbossws to jboss42 --> @@ -57,12 +58,13 @@ <macro-deploy-spi spilibs="${spi.dir}/output/lib" spiscripts="${spi.dir}/etc" - thirdpartylibs="${spi.dir}/thirdparty"/> + thirdpartylibs="${spi.dir}/thirdparty" + jbosshome="${jboss42.home}"/> </target> <!-- Remove jbossws from jboss42 --> <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> <macro-undeploy-native42/> - <macro-undeploy-spi/> + <macro-undeploy-spi jbosshome="${jboss42.home}"/> </target> </project> Modified: trunk/integration/spi/ant-import/macros-deploy-spi.xml =================================================================== --- trunk/integration/spi/ant-import/macros-deploy-spi.xml 2007-06-01 15:48:48 UTC (rev 3376) +++ trunk/integration/spi/ant-import/macros-deploy-spi.xml 2007-06-01 18:08:07 UTC (rev 3377) @@ -17,20 +17,19 @@ <attribute name="spilibs"/> <attribute name="spiscripts"/> <attribute name="thirdpartylibs"/> + <attribute name="jbosshome"/> <sequential> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - - <copy todir="${jboss50.home}/client"> + <copy todir="@{jbosshome}/client"> <fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> </fileset> </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; <fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> </fileset> </copy> - <copy todir="${jboss50.home}/bin" overwrite="true"> + <copy todir="@{jbosshome}/bin" overwrite="true"> <fileset dir="@{spiscripts}"> <include name="wsconsume.bat"/> <include name="wsconsume.sh"/> @@ -38,26 +37,21 @@ <include name="wsprovide.sh"/> </fileset> </copy> - - <chmod dir="${jboss50.home}/bin" perm="+x" includes="**/*.sh"/> + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> </sequential> </macrodef> - <!-- Remove jbossws/sunri from jboss50 --> <macrodef name="macro-undeploy-spi"> + <attribute name="jbosshome"/> <sequential> <delete> - - <fileset dir="${jboss50.home}/client"> + <fileset dir="@{jbosshome}/client"> <include name="jbossws-spi.jar"/> </fileset> - - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <fileset dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; <include name="jbossws-spi.jar"/> </fileset> - - <!--include name="jbossws-spi.jar"/--> - <fileset dir="${jboss50.home}/bin"> + <fileset dir="@{jbosshome}/bin"> <include name="wsconsume.bat"/> <include name="wsconsume.sh"/> <include name="wsprovide.bat"/> Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-06-01 15:48:48 UTC (rev 3376) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-06-01 18:08:07 UTC (rev 3377) @@ -33,13 +33,14 @@ <macro-deploy-spi spilibs="${spi.dir}/output/lib" spiscripts="${spi.dir}/etc" - thirdpartylibs="${spi.dir}/thirdparty"/> + thirdpartylibs="${spi.dir}/thirdparty" + jbosshome="${jboss50.home}"/> </target> <!-- Remove from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> <macro-undeploy-sunri50/> - <macro-undeploy-spi/> + <macro-undeploy-spi jbosshome="${jboss50.home}"/> </target> <!-- Deploy to jboss42 --> @@ -55,13 +56,14 @@ <macro-deploy-spi spilibs="${spi.dir}/output/lib" spiscripts="${spi.dir}/etc" - thirdpartylibs="${spi.dir}/thirdparty"/> + thirdpartylibs="${spi.dir}/thirdparty" + jbosshome="${jboss42.home}"/> </target> <!-- Remove from jboss42 --> <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> <macro-undeploy-sunri42/> - <macro-undeploy-spi/> + <macro-undeploy-spi jbosshome="${jboss42.home}"/> </target> </project> Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-06-01 15:48:48 UTC (rev 3376) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-06-01 18:08:07 UTC (rev 3377) @@ -14,6 +14,7 @@ <project> <import file="${int.xfire.dir}/ant-import/macros-deploy-xfire.xml"/> + <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/> <!-- ================================================================== --> <!-- Deployment --> @@ -28,11 +29,18 @@ jbosslibs="${int.jboss50.dir}/output/lib" stacklibs="${int.xfire.dir}/output/lib" thirdpartylibs="${int.xfire.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${spi.dir}/output/lib" + spiscripts="${spi.dir}/etc" + thirdpartylibs="${spi.dir}/thirdparty" + jbosshome="${jboss50.home}"/> </target> <!-- Remove from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> <macro-undeploy-xfire50/> + <macro-undeploy-spi jbosshome="${jboss50.home}"/> </target> <!-- Deploy to jboss42 --> @@ -44,11 +52,18 @@ jbosslibs="${int.jboss42.dir}/output/lib" stacklibs="${int.xfire.dir}/output/lib" thirdpartylibs="${int.xfire.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${spi.dir}/output/lib" + spiscripts="${spi.dir}/etc" + thirdpartylibs="${spi.dir}/thirdparty" + jbosshome="${jboss42.home}"/> </target> <!-- Remove from jboss42 --> <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42"> <macro-undeploy-xfire42/> + <macro-undeploy-spi jbosshome="${jboss42.home}"/> </target> </project>