Author: thomas.diesler(a)jboss.com Date: 2008-02-29 11:35:57 -0500 (Fri, 29 Feb 2008) New Revision: 5870 Modified: stack/native/trunk/ant-import/build-setup.xml stack/native/trunk/ant-import/build-thirdparty.xml Log: Enforce container specific libraries (jbossxb,remoting) Modified: stack/native/trunk/ant-import/build-setup.xml =================================================================== --- stack/native/trunk/ant-import/build-setup.xml 2008-02-29 15:02:05 UTC (rev 5869) +++ stack/native/trunk/ant-import/build-setup.xml 2008-02-29 16:35:57 UTC (rev 5870) @@ -84,37 +84,6 @@ </or> </condition> - <!-- switch jbossxb dependening on container --> - <condition property="container-dependent.jbossxb.version" value="${jboss-jbossxb-jboss42}"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </or> - </condition> - <condition property="container-dependent.jbossxb.version" value="${jboss-jbossxb-jboss50}"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> - - <!-- switch remoting dependening on container --> - <condition property="container-dependent.remoting.version" value="${jboss-remoting-jboss42}"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </or> - </condition> - <condition property="container-dependent.remoting.version" value="${jboss-remoting-jboss50}"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> - - <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> <!-- JDK Detection --> Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-29 15:02:05 UTC (rev 5869) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-29 16:35:57 UTC (rev 5870) @@ -44,9 +44,14 @@ <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries"> - <echo>JBossXB: ${container-dependent.jbossxb.version}</echo> - <echo>Remoting: ${container-dependent.remoting.version}</echo> - + <!-- + Note, the jboss-xml-binding and jboss-remoting jars are downloaded in the versions that are actually deployed. + Currently only jboss-xml-binding is deployed. Remoting should be downloaded in the version of the oldest supported target container. + + It is a mistake to switch the download version dependent on the target container, + in which case it is random which version is used by the deploy targets. + --> + <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> @@ -85,8 +90,8 @@ <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" 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/${container-dependent.jbossxb.version}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${container-dependent.jbossxb.version}/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-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/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"/> @@ -95,8 +100,8 @@ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/remoting/${container-dependent.remoting.version}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/remoting/${container-dependent.remoting.version}/lib/jboss-remoting-src.jar" dest="${thirdparty.dir}/jboss-remoting-src.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/remoting/${jboss-remoting-jboss42}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/remoting/${jboss-remoting-jboss42}/lib/jboss-remoting-src.jar" dest="${thirdparty.dir}/jboss-remoting-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx.jar" dest="${thirdparty.dir}/jbosssx.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/>