Author: thomas.diesler(a)jboss.com Date: 2007-06-01 01:41:20 -0400 (Fri, 01 Jun 2007) New Revision: 3353 Modified: trunk/integration/native/ant-import/macros-deploy-native.xml Log: Fix missing jbossws-spi.jar deployment Modified: trunk/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-01 05:17:35 UTC (rev 3352) +++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-01 05:41:20 UTC (rev 3353) @@ -28,6 +28,9 @@ <!-- 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> @@ -41,10 +44,10 @@ <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> <include name="policy.jar"/> + <include name="wsdl4j.jar"/> </fileset> </copy> <copy todir="${jboss50.home}/lib" overwrite="true"> @@ -56,6 +59,9 @@ <!-- 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> @@ -84,24 +90,21 @@ <!-- CLIENT JARS --> <fileset dir="${jboss50.home}/client"> - + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> <include name="jboss-jaxrpc.jar"/> <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="policy.jar"/> - - <include name="jbossws-integration-tools.jar"/> + <include name="wsdl4j.jar"/> + <!-- remove only, do not deploy --> <include name="jbossws-wsconsume-impl.jar"/> - - <include name="jbossws-jboss50.jar"/> - - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> </fileset> <!-- SERVER JARS --> @@ -130,6 +133,9 @@ <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> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss42.jar"/> </fileset> @@ -151,6 +157,9 @@ </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> @@ -174,26 +183,26 @@ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> <delete> <fileset dir="${jboss42.home}/client"> - <!--include name="jbossws-spi.jar"/--> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> - <include name="policy.jar"/> <include name="jbossws-client.jar"/> <include name="jbossws-integration-tools.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - <include name="jbossws-jboss42.jar"/> - - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> + <include name="jbossws-spi.jar"/> + <include name="policy.jar"/> <include name="wsdl4j.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> + <!-- remove only, do not deploy --> + <include name="jbossws-wsconsume-impl.jar"/> </fileset> <fileset dir="${jboss42.home}/lib"> - <include name="jbossws-integration.jar"/> <!-- The old integration jar--> + <!-- 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"/>