[jbossws-commits] JBossWS SVN: r4752 - stack/native/tags/jbossws-native-2.0.1.SP2/ant-import.

Author: thomas.diesler(a)jboss.com Date: 2007-10-13 04:00:20 -0400 (Sat, 13 Oct 2007) New Revision: 4752 Modified: stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-deploy.xml stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-thirdparty.xml stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/macros-deploy-native.xml Log: Do not deploy jbossxb to AS42 Modified: stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-deploy.xml =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-deploy.xml 2007-10-12 12:22:10 UTC (rev 4751) +++ stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-deploy.xml 2007-10-13 08:00:20 UTC (rev 4752) @@ -28,11 +28,6 @@ <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss50.home}"/> - - <!-- [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"> @@ -60,12 +55,6 @@ <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss42.home}"/> - - <!-- [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"> Modified: stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-thirdparty.xml =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-thirdparty.xml 2007-10-12 12:22:10 UTC (rev 4751) +++ stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-thirdparty.xml 2007-10-13 08:00:20 UTC (rev 4752) @@ -83,8 +83,8 @@ <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss40}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss40}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jaxbintros/${jaxbintros}/lib/jboss-jaxb-intros.jar" dest="${thirdparty.dir}/jboss-jaxb-intros.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/macros-deploy-native.xml 2007-10-12 12:22:10 UTC (rev 4751) +++ stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/macros-deploy-native.xml 2007-10-13 08:00:20 UTC (rev 4752) @@ -140,7 +140,6 @@ <include name="jaxb-xjc.jar"/> <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> - <include name="jboss-xml-binding.jar"/> <include name="policy.jar"/> <include name="stax-ex.jar"/> <include name="streambuffer.jar"/> @@ -149,12 +148,6 @@ </copy> <!-- SERVER JARS --> - <copy todir="${jboss42.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jboss-xml-binding.jar"/> - </fileset> - </copy> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> @@ -257,7 +250,6 @@ <include name="jboss-xml-binding.jar"/> </fileset> </copy> - <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{stacklibs}"> <include name="jboss-jaxrpc.jar"/>