Author: thomas.diesler(a)jboss.com Date: 2007-10-02 08:32:06 -0400 (Tue, 02 Oct 2007) New Revision: 4664 Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/ant-import/macros-deploy-xfire.xml stack/cxf/trunk/version.properties Log: Remove dependency on jbossws-jboss42.jar Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/cxf/trunk/ant-import/build-bin-dist.xml 2007-10-02 12:18:33 UTC (rev 4663) +++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2007-10-02 12:32:06 UTC (rev 4664) @@ -100,7 +100,6 @@ <include name="jbossws-xfire50.sar"/> </fileset> <fileset dir="${thirdparty.dir}"> - <include name="jbossws-jboss42.jar"/> <include name="juddi-service.sar"/> <include name="cxf-${cxf.version}.jar"/> <include name="geronimo-javamail_${cxf.geronimo.javamail}.jar"/> Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-10-02 12:18:33 UTC (rev 4663) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-10-02 12:32:06 UTC (rev 4664) @@ -50,8 +50,6 @@ <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xml-commons/${apache-xml-commons}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> Modified: stack/cxf/trunk/ant-import/macros-deploy-xfire.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-xfire.xml 2007-10-02 12:18:33 UTC (rev 4663) +++ stack/cxf/trunk/ant-import/macros-deploy-xfire.xml 2007-10-02 12:32:06 UTC (rev 4664) @@ -94,7 +94,6 @@ <!-- CLIENT JARS --> <copy todir="${jboss42.home}/client" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-jboss42.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -110,12 +109,6 @@ </copy> <!--SERVER JARS --> - <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-jboss42.jar"/> - </fileset> - </copy> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src=&quot;(a){stacklibs}/jbossws-xfire42.sar&quot;/&gt; <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> @@ -127,17 +120,10 @@ <macrodef name="macro-undeploy-xfire42"> <sequential> <delete> - <!-- CLIENT JARS --> <fileset dir="${jboss42.home}/client"> <include name="jbossws-spi.jar"/> - <include name="jbossws-jboss42.jar"/> </fileset> - - <!--SERVER JARS --> - <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-jboss42.jar"/> - </fileset> </delete> <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2007-10-02 12:18:33 UTC (rev 4663) +++ stack/cxf/trunk/version.properties 2007-10-02 12:32:06 UTC (rev 4664) @@ -34,8 +34,6 @@ jbossws-framework=2.0.1.GA jbossws-common=1.0.0.GA jbossws-spi=1.0.0.GA -jbossws-jboss50=2.0.1.GA -jbossws-jboss42=2.0.1.GA apache-xml-commons=1.2 ibm-wsdl4j=1.6.2