Author: heiko.braun(a)jboss.com Date: 2007-06-21 05:29:06 -0400 (Thu, 21 Jun 2007) New Revision: 3669 Modified: trunk/integration/native/ant-import/build-bin-dist.xml trunk/integration/native/ant-import/macros-deploy-native.xml trunk/integration/spi/ant-import/build-thirdparty.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/jbossws-core/ant-import/build-thirdparty.xml Log: Fix dependencies upon stax libraries Modified: trunk/integration/native/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-20 17:35:10 UTC (rev 3668) +++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-21 09:29:06 UTC (rev 3669) @@ -103,9 +103,6 @@ <include name="jbossws-spi.jar"/> <include name="jbossws-spi-scripts.zip"/> </fileset> - <fileset dir="${spi.dir}/thirdparty"> - <include name="getopt.jar"/> - </fileset> <fileset dir="${int.jboss50.dir}/output/lib"> <include name="jbossws-jboss50.jar"/> </fileset> @@ -131,15 +128,18 @@ <include name="jbossws-native50-deployer.zip"/> </fileset> <fileset dir="${core.dir}/thirdparty"> + <include name="juddi-service.sar"/> + <include name="policy.jar"/> + <include name="getopt.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="juddi-service.sar"/> - <include name="policy.jar"/> <include name="stax-api.jar"/> - <include name="wsdl4j.jar"/> + <include name="wsdl4j.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> </fileset> </copy> Modified: trunk/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-20 17:35:10 UTC (rev 3668) +++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-21 09:29:06 UTC (rev 3669) @@ -41,14 +41,16 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> - <fileset dir="@{thirdpartylibs}"> + <fileset dir="@{thirdpartylibs}"> + <include name="policy.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="policy.jar"/> <include name="wsdl4j.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> </fileset> </copy> <copy todir="${jboss50.home}/lib" overwrite="true"> @@ -100,6 +102,8 @@ <include name="jaxb-xjc.jar"/> <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> @@ -150,14 +154,16 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> - <fileset dir="@{thirdpartylibs}"> + <fileset dir="@{thirdpartylibs}"> + <include name="policy.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"/> - <include name="policy.jar"/> + <include name="wsdl4j.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> </fileset> </copy> @@ -195,6 +201,8 @@ <include name="jaxb-xjc.jar"/> <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> @@ -250,15 +258,17 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> - <fileset dir="@{thirdpartylibs}"> + <fileset dir="@{thirdpartylibs}"> + <include name="policy.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="policy.jar"/> + <include name="wsdl4j.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> <include name="stax-api.jar"/> - <include name="wsdl4j.jar"/> </fileset> </copy> @@ -317,6 +327,8 @@ <include name="jaxb-xjc.jar"/> <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> Modified: trunk/integration/spi/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-06-20 17:35:10 UTC (rev 3668) +++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-06-21 09:29:06 UTC (rev 3669) @@ -67,7 +67,9 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <checksum file="${build.dir}/version.properties" fileext=".md5"/> </target> Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-20 17:35:10 UTC (rev 3668) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-21 09:29:06 UTC (rev 3669) @@ -40,6 +40,8 @@ <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> <include name="jaxws-api.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> <include name="jsr181-api.jar"/> <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> @@ -85,6 +87,8 @@ <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> <include name="jaxws-api.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> <include name="jsr181-api.jar"/> <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> @@ -125,6 +129,8 @@ <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> <include name="jaxws-api.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> <include name="jsr181-api.jar"/> <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> @@ -160,6 +166,8 @@ <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> <include name="jaxws-api.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> <include name="jsr181-api.jar"/> <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-06-20 17:35:10 UTC (rev 3668) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-06-21 09:29:06 UTC (rev 3669) @@ -95,7 +95,8 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-tools.jar" dest="${thirdparty.dir}/jaxws-tools.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>