[jbossws-commits] JBossWS SVN: r3661 - in branches/jbossws-2.0: integration/spi/ant-import and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Jun 20 08:40:39 EDT 2007
Author: heiko.braun at jboss.com
Date: 2007-06-20 08:40:39 -0400 (Wed, 20 Jun 2007)
New Revision: 3661
Modified:
branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml
branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml
branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh
branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh
branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml
Log:
Include stax-ex.jar and streambuffer.jar in distribution. wsconsule and wsprovide depend on them in certain cases (I.e. addressing extension to a WSDL)
Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-20 11:49:40 UTC (rev 3660)
+++ branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-20 12:40:39 UTC (rev 3661)
@@ -96,9 +96,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>
@@ -124,15 +121,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="streambuffer.jar"/>
+ <include name="stax-ex.jar"/>
</fileset>
</copy>
Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-20 11:49:40 UTC (rev 3660)
+++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-20 12:40:39 UTC (rev 3661)
@@ -42,13 +42,15 @@
<include name="jbossws-client.jar"/>
</fileset>
<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"/>
@@ -151,13 +155,15 @@
<include name="jbossws-client.jar"/>
</fileset>
<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>
@@ -196,6 +202,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"/>
@@ -252,14 +260,15 @@
<include name="jbossws-client.jar"/>
</fileset>
<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="stax-api.jar"/>
<include name="wsdl4j.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="stax-ex.jar"/>
</fileset>
</copy>
@@ -319,6 +328,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: branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-20 11:49:40 UTC (rev 3660)
+++ branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-20 12:40:39 UTC (rev 3661)
@@ -67,6 +67,8 @@
<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-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"/>
Modified: branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh 2007-06-20 11:49:40 UTC (rev 3660)
+++ branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh 2007-06-20 12:40:39 UTC (rev 3661)
@@ -93,6 +93,8 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-api.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-impl.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-xjc.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/streambuffer.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-ex.jar"
# stack specific dependencies
if [ "x$JBOSSWS_NATIVE" = "x" ]; then
Modified: branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh 2007-06-20 11:49:40 UTC (rev 3660)
+++ branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh 2007-06-20 12:40:39 UTC (rev 3661)
@@ -93,6 +93,8 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-xjc.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-tools.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-rt.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/streambuffer.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-ex.jar"
# stack specific dependencies
if [ "x$JBOSSWS_NATIVE" = "x" ]; then
Modified: branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml 2007-06-20 11:49:40 UTC (rev 3660)
+++ branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml 2007-06-20 12:40:39 UTC (rev 3661)
@@ -95,6 +95,7 @@
<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-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"/>
More information about the jbossws-commits
mailing list