Author: heiko.braun(a)jboss.com Date: 2007-06-01 07:50:51 -0400 (Fri, 01 Jun 2007) New Revision: 3360 Added: trunk/integration/spi/ant-import/macros-deploy-spi.xml Removed: trunk/integration/spi/ant-import/build-deploy.xml Modified: trunk/integration/native/ant-import/build-deploy.xml trunk/integration/native/ant-import/macros-deploy-native.xml trunk/integration/spi/build.xml trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml Log: Move SPI target to macro Modified: trunk/integration/native/ant-import/build-deploy.xml =================================================================== --- trunk/integration/native/ant-import/build-deploy.xml 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/native/ant-import/build-deploy.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -12,46 +12,57 @@ <!-- $Id$ --> <project> - - <import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/> - - <!-- ================================================================== --> - <!-- Deployment JBoss50 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws to jboss50 --> - <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to jboss50"> - <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <ant antfile="${spi.dir}/build.xml" target="deploy-jboss50" inheritall="false"/> - <macro-deploy-native50 - spilibs="${spi.dir}/output/lib" - jbosslibs="${int.jboss50.dir}/output/lib" - corelibs="${core.dir}/output/lib" - stacklibs="${int.native.dir}/output/lib" - thirdpartylibs="${core.dir}/thirdparty"/> - </target> - - <!-- Remove jbossws from jboss50 --> - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> - <ant antfile="${spi.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <macro-undeploy-native50/> - </target> - - <!-- Deploy jbossws to jboss42 --> - <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws to jboss42"> - <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> - <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> - <macro-deploy-native42 - spilibs="${spi.dir}/output/lib" - jbosslibs="${int.jboss42.dir}/output/lib" - corelibs="${core.dir}/output/lib" - stacklibs="${int.native.dir}/output/lib" - thirdpartylibs="${core.dir}/thirdparty"/> - </target> - - <!-- Remove jbossws from jboss42 --> - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> - <macro-undeploy-native42/> - </target> + + <import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/> + <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/> + + <!-- ================================================================== --> + <!-- Deployment JBoss50 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws to jboss50 --> + <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to jboss50"> + <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <macro-deploy-native50 + spilibs="${spi.dir}/output/lib" + jbosslibs="${int.jboss50.dir}/output/lib" + corelibs="${core.dir}/output/lib" + stacklibs="${int.native.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${spi.dir}/output/lib" + spiscripts="${spi.dir}/etc" + thirdpartylibs="${spi.dir}/thirdparty"/> + </target> + + <!-- Remove jbossws from jboss50 --> + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> + <macro-undeploy-native50/> + <macro-undeploy-spi/> + </target> + + <!-- Deploy jbossws to jboss42 --> + <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws to jboss42"> + <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <macro-deploy-native42 + spilibs="${spi.dir}/output/lib" + jbosslibs="${int.jboss42.dir}/output/lib" + corelibs="${core.dir}/output/lib" + stacklibs="${int.native.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${spi.dir}/output/lib" + spiscripts="${spi.dir}/etc" + thirdpartylibs="${spi.dir}/thirdparty"/> + </target> + + <!-- Remove jbossws from jboss42 --> + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-spi/> + </target> </project> Modified: trunk/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -27,10 +27,7 @@ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> <!-- CLIENT JARS --> - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> + <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss50.jar"/> </fileset> @@ -59,9 +56,6 @@ <!-- SERVER JARS --> <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss50.jar"/> </fileset> @@ -99,8 +93,7 @@ <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> - <include name="jbossws-jboss50.jar"/> - <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss50.jar"/> <include name="policy.jar"/> <include name="wsdl4j.jar"/> <!-- remove only, do not deploy --> @@ -108,8 +101,7 @@ </fileset> <!-- SERVER JARS --> - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-spi.jar"/> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> <include name="jbossws-jboss50.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -132,10 +124,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> + <copy todir="${jboss42.home}/client" overwrite="true"> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss42.jar"/> </fileset> @@ -156,13 +145,7 @@ <include name="policy.jar"/> </fileset> </copy> - <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss42.jar"/> - </fileset> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{corelibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -193,8 +176,7 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> <include name="jbossws-integration-tools.jar"/> - <include name="jbossws-jboss42.jar"/> - <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss42.jar"/> <include name="policy.jar"/> <include name="wsdl4j.jar"/> <!-- remove only, do not deploy --> @@ -204,8 +186,7 @@ <!-- remove only, do not deploy --> <include name="jbossws-integration.jar"/> </fileset> - <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-spi.jar"/> + <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> <include name="jbossws-jboss42.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> Deleted: trunk/integration/spi/ant-import/build-deploy.xml =================================================================== --- trunk/integration/spi/ant-import/build-deploy.xml 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/spi/ant-import/build-deploy.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- ================================================================== --> - <!-- Deployment JBoss50 --> - <!-- ================================================================== --> - - <target name="_deploy-common"> - <copy todir="${jboss50.home}/client"> - <fileset dir="${spi.dir}/output/lib/"> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <fileset dir="${spi.dir}/output/lib/"> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/bin" overwrite="true"> - <fileset dir="${spi.dir}/etc"> - <include name="wsconsume.bat"/> - <include name="wsconsume.sh"/> - <include name="wsprovide.bat"/> - <include name="wsprovide.sh"/> - </fileset> - </copy> - - <chmod dir="${jboss50.home}/bin" perm="+x" includes="**/*.sh"/> - </target> - - <target name="_undeploy-common"> - <delete> - - <fileset dir="${jboss50.home}/client"> - <include name="jbossws-spi.jar"/> - </fileset> - - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - - <!--include name="jbossws-spi.jar"/--> - <fileset dir="${jboss50.home}/bin"> - <include name="ws*.sh"/> - <include name="ws*.bat"/> - </fileset> - </delete> - </target> - - <!-- Deploy jbossws to jboss50 --> - <target name="deploy-jboss50" description="Deploy jbossws to jboss50"> - <antcall target="_deploy-common"/> - </target> - - <!-- Remove jbossws from jboss50 --> - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> - <antcall target="_undeploy-common"/> - </target> - - <!-- Deploy jbossws to jboss42 --> - <target name="deploy-jboss42" description="Deploy jbossws to jboss42"> - <antcall target="_deploy-common"/> - </target> - - <!-- Remove jbossws from jboss42 --> - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> - <antcall target="_undeploy-common"/> - </target> - -</project> Added: trunk/integration/spi/ant-import/macros-deploy-spi.xml =================================================================== --- trunk/integration/spi/ant-import/macros-deploy-spi.xml (rev 0) +++ trunk/integration/spi/ant-import/macros-deploy-spi.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <macrodef name="macro-deploy-spi"> + <attribute name="spilibs"/> + <attribute name="spiscripts"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + + <copy todir="${jboss50.home}/client"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/bin" overwrite="true"> + <fileset dir="@{spiscripts}"> + <include name="wsconsume.bat"/> + <include name="wsconsume.sh"/> + <include name="wsprovide.bat"/> + <include name="wsprovide.sh"/> + </fileset> + </copy> + + <chmod dir="${jboss50.home}/bin" perm="+x" includes="**/*.sh"/> + </sequential> + </macrodef> + + <!-- Remove jbossws/sunri from jboss50 --> + <macrodef name="macro-undeploy-spi"> + <sequential> + <delete> + + <fileset dir="${jboss50.home}/client"> + <include name="jbossws-spi.jar"/> + </fileset> + + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + + <!--include name="jbossws-spi.jar"/--> + <fileset dir="${jboss50.home}/bin"> + <include name="wsconsume.bat"/> + <include name="wsconsume.sh"/> + <include name="wsprovide.bat"/> + <include name="wsprovide.sh"/> + </fileset> + </delete> + </sequential> + </macrodef> + +</project> \ No newline at end of file Property changes on: trunk/integration/spi/ant-import/macros-deploy-spi.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/spi/build.xml =================================================================== --- trunk/integration/spi/build.xml 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/spi/build.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -14,8 +14,7 @@ <project default="main" basedir="../.."> <import file="${basedir}/build/ant-import/build-setup.xml"/> - - <import file="${spi.dir}/ant-import/build-deploy.xml"/> + <import file="${spi.dir}/ant-import/build-release.xml"/> <import file="${spi.dir}/ant-import/build-thirdparty.xml"/> Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2007-06-01 11:50:51 UTC (rev 3360) @@ -161,7 +161,8 @@ private ClassLoader getClasspathLoader(ClassLoader parent) { - return new AntClassLoader(parent, getProject(), classpath, false); + AntClassLoader loader = new AntClassLoader(parent, getProject(), classpath, false); + return loader; } public void executeNonForked() Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -13,44 +13,55 @@ <project> - <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/> - - <!-- ================================================================== --> - <!-- Deployment --> - <!-- ================================================================== --> - - <!-- Deploy to jboss50 --> - <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <ant antfile="${spi.dir}/build.xml" target="deploy-jboss50" inheritall="false"/> - <macro-deploy-sunri50 - spilibs="${spi.dir}/output/lib" - jbosslibs="${int.jboss50.dir}/output/lib" - stacklibs="${int.sunri.dir}/output/lib" - thirdpartylibs="${int.sunri.dir}/thirdparty"/> - </target> - - <!-- Remove from jboss50 --> - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> - <ant antfile="${spi.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <macro-undeploy-sunri50/> - </target> - - <!-- Deploy to jboss42 --> - <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/sunri to jboss42"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> - <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> - <macro-deploy-sunri42 - spilibs="${spi.dir}/output/lib" - jbosslibs="${int.jboss42.dir}/output/lib" - stacklibs="${int.sunri.dir}/output/lib" - thirdpartylibs="${int.sunri.dir}/thirdparty"/> - </target> - - <!-- Remove from jboss42 --> - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> - <macro-undeploy-sunri42/> - </target> - + <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/> + <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/> + + <!-- ================================================================== --> + <!-- Deployment --> + <!-- ================================================================== --> + + <!-- Deploy to jboss50 --> + <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> + <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <macro-deploy-sunri50 + spilibs="${spi.dir}/output/lib" + jbosslibs="${int.jboss50.dir}/output/lib" + stacklibs="${int.sunri.dir}/output/lib" + thirdpartylibs="${int.sunri.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${spi.dir}/output/lib" + spiscripts="${spi.dir}/etc" + thirdpartylibs="${spi.dir}/thirdparty"/> + </target> + + <!-- Remove from jboss50 --> + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> + <macro-undeploy-sunri50/> + <macro-undeploy-spi/> + </target> + + <!-- Deploy to jboss42 --> + <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/sunri to jboss42"> + <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <macro-deploy-sunri42 + spilibs="${spi.dir}/output/lib" + jbosslibs="${int.jboss42.dir}/output/lib" + stacklibs="${int.sunri.dir}/output/lib" + thirdpartylibs="${int.sunri.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${spi.dir}/output/lib" + spiscripts="${spi.dir}/etc" + thirdpartylibs="${spi.dir}/thirdparty"/> + </target> + + <!-- Remove from jboss42 --> + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> + <macro-undeploy-sunri42/> + <macro-undeploy-spi/> + </target> + </project> Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -27,9 +27,6 @@ <!-- CLIENT JARS --> <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss50.jar"/> </fileset> @@ -92,8 +89,7 @@ <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> - <include name="jbossws-jboss50.jar"/> - <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss50.jar"/> <include name="jbossws-sunri-client.jar"/> </fileset> @@ -115,10 +111,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> + <copy todir="${jboss42.home}/client" overwrite="true"> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss42.jar"/> </fileset> @@ -171,8 +164,7 @@ <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> - <include name="jbossws-jboss42.jar"/> - <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss42.jar"/> <include name="jbossws-sunri-client.jar"/> </fileset> <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">