Author: thomas.diesler(a)jboss.com Date: 2007-06-25 05:49:01 -0400 (Mon, 25 Jun 2007) New Revision: 3710 Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml Log: [JBWS-1617] JAXRPC doc/literal trims empty string. Try the snapshots Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-24 08:31:24 UTC (rev 3709) +++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-25 09:49:01 UTC (rev 3710) @@ -32,7 +32,12 @@ spilibs="${spi.dir}/output/lib" thirdpartylibs="${spi.dir}/thirdparty" jbosshome="${jboss50.home}"/> - </target> + + <!-- [JBWS-1617] JAXRPC doc/literal trims empty string + <copy tofile="${jboss50.home}/client/jboss-xml-binding.jar" file="${core.dir}/thirdparty/jbossxb-2.0.0-20070620.094346-1.jar" overwrite="true"/> + <copy tofile="${jboss50.home}/lib/jboss-xml-binding.jar" file="${core.dir}/thirdparty/jbossxb-2.0.0-20070620.094346-1.jar" overwrite="true"/> + --> + </target> <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed @@ -63,7 +68,13 @@ spilibs="${spi.dir}/output/lib" thirdpartylibs="${spi.dir}/thirdparty" jbosshome="${jboss42.home}"/> - </target> + + <!-- [JBWS-1617] JAXRPC doc/literal trims empty string + <copy tofile="${jboss42.home}/client/jboss-xml-binding.jar" file="${core.dir}/thirdparty/jbossxb-1.0.0-20070620.100638-1.jar" overwrite="true"/> + <copy tofile="${jboss42.home}/lib/jboss-xml-binding.jar" file="${core.dir}/thirdparty/jbossxb-1.0.0-20070620.100638-1.jar" overwrite="true"/> + --> + + </target> <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed 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-24 08:31:24 UTC (rev 3709) +++ branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-25 09:49:01 UTC (rev 3710) @@ -12,13 +12,13 @@ <!-- $Id$ --> <project> - + <property file="${core.dir}/version.properties"/> - + <!-- ========= --> <!-- Libraries --> <!-- ========= --> - + <target name="thirdparty-init" depends="prepare"> <property name="thirdparty.dir" value="${spi.dir}/thirdparty"/> @@ -35,9 +35,8 @@ <echo message="checksum.ok = ${checksum.ok}"/> </target> - <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" - description="Gets the thirdparty libraries"> - + <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries"> + <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> @@ -64,22 +63,22 @@ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> - <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/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-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> <target name="thirdparty-classpath" depends="thirdparty-get"> - - <!-- The compile classpath for jbossws spi --> + + <!-- The compile classpath for jbossws spi --> <path id="spi.thirdparty.classpath"> - <pathelement location="${thirdparty.dir}/ant.jar"/> - <pathelement location="${thirdparty.dir}/activation.jar"/> + <pathelement location="${thirdparty.dir}/ant.jar"/> + <pathelement location="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/getopt.jar"/> <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> @@ -91,10 +90,10 @@ <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> - <pathelement location="${thirdparty.dir}/junit.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${thirdparty.dir}/junit.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> </path> - + </target> - -</project> + +</project> \ No newline at end of file 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-24 08:31:24 UTC (rev 3709) +++ branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml 2007-06-25 09:49:01 UTC (rev 3710) @@ -105,6 +105,9 @@ <unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/> <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/> + <get src="http://snapshots.jboss.org/maven2/org/jboss/jbossxb/2.0.0-SNAPS... dest="${thirdparty.dir}/jbossxb-2.0.0-20070620.094346-1.jar" usetimestamp="true" verbose="true"/> + <get src="http://snapshots.jboss.org/maven2/jboss/jbossxb/jbossxb/1.0.0-S... dest="${thirdparty.dir}/jbossxb-1.0.0-20070620.100638-1.jar" usetimestamp="true" verbose="true"/> + <checksum file="${core.dir}/version.properties" fileext=".md5"/> </target>