Author: thomas.diesler(a)jboss.com Date: 2007-05-09 15:05:56 -0400 (Wed, 09 May 2007) New Revision: 3022 Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/etc/ant-import/build-thirdparty.xml projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml Log: Fix path to jbossws-spi Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/etc/ant-import/build-thirdparty.xml =================================================================== --- projects/wsintegration/jbws-jboss42/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-09 18:16:36 UTC (rev 3021) +++ projects/wsintegration/jbws-jboss42/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-09 19:05:56 UTC (rev 3022) @@ -17,9 +17,42 @@ <!-- Libraries --> <!-- ========= --> - <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> + <target name="thirdparty" depends="prepare,jbossws-spi-get,jbossws-core-get,thirdparty-get,thirdparty-classpath"> </target> + <!-- + jbossws-spi-get + --> + <target name="jbossws-spi-get" if="force.thirdparty.get" + description="Gets the jbossws-core libraries"> + + <mkdir dir="${thirdparty.dir}/jbossws-spi"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + + </target> + + <!-- + jbossws-core-get + --> + <target name="jbossws-core-get" if="force.thirdparty.get" + description="Gets the jbossws-core libraries"> + + <mkdir dir="${thirdparty.dir}/jbossws-core"/> + <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-core/jbossws-client.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-core.jar" dest="${thirdparty.dir}/jbossws-core/jbossws-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-resources.zip" dest="${thirdparty.dir}/jbossws-core/jbossws-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jbossws-core/jboss-saaj.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar" usetimestamp="true" verbose="true"/> + + <mkdir dir="${thirdparty.dir}/jbossws-resources"/> + <unzip dest="${thirdparty.dir}/jbossws-resources" src="${thirdparty.dir}/jbossws-core/jbossws-resources.zip"/> + + </target> + + <!-- + thirdpartry-get + --> <target name="thirdparty-get" if="force.thirdparty.get" description="Gets the thirdparty libraries"> @@ -32,13 +65,6 @@ <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> <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/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-client.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-core.jar" dest="${thirdparty.dir}/jbossws-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-resources.zip" dest="${thirdparty.dir}/jbossws-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jboss-saaj.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jboss-jaxws.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> @@ -51,15 +77,17 @@ <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-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.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"/> - - <mkdir dir="${thirdparty.dir}/jbossws-resources"/> - <unzip dest="${thirdparty.dir}/jbossws-resources" src="${thirdparty.dir}/jbossws-resources.zip"/> </target> <target name="thirdparty-classpath" > <!-- The compile classpath for jboss42 integration --> <path id="jboss42.integration.classpath"> + <pathelement location="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-core/jbossws-core.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-core/jboss-saaj.jar"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> @@ -74,32 +102,12 @@ <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/> - <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> - <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-core.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> </path> - <!-- The compile classpath for jboss40 integration --> - <path id="jboss40.integration.classpath"> - <pathelement location="${jboss40.lib}/jboss-jmx.jar"/> - <pathelement location="${jboss40.lib}/jboss-system.jar"/> - <pathelement location="${jboss40.server.lib}/jboss.jar"/> - <pathelement location="${jboss40.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> - </path> - - <!-- The compile classpath for tomcat integration --> - <path id="tomcat.integration.classpath"> - </path> - </target> </project> Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-09 18:16:36 UTC (rev 3021) +++ projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-09 19:05:56 UTC (rev 3022) @@ -17,10 +17,21 @@ <!-- Libraries --> <!-- ========= --> - <target name="thirdparty" depends="jbossws-core-get,jbossws-spi-get,thirdparty-get,thirdparty-classpath"> + <target name="thirdparty" depends="prepare,jbossws-spi-get,jbossws-core-get,thirdparty-get,thirdparty-classpath"> </target> <!-- + jbossws-spi-get + --> + <target name="jbossws-spi-get" if="force.thirdparty.get" + description="Gets the jbossws-core libraries"> + + <mkdir dir="${thirdparty.dir}/jbossws-spi"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + + </target> + + <!-- jbossws-core-get --> <target name="jbossws-core-get" if="force.thirdparty.get" @@ -40,17 +51,6 @@ </target> <!-- - jbossws-spi-get - --> - <target name="jbossws-spi-get" if="force.thirdparty.get" - description="Gets the jbossws-core libraries"> - - <mkdir dir="${thirdparty.dir}/jbossws-spi"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar" usetimestamp="true" verbose="true"/> - - </target> - - <!-- thirdpartry-get --> <target name="thirdparty-get" if="force.thirdparty.get" @@ -87,12 +87,10 @@ <!-- The compile classpath for jboss50 integration --> <path id="jboss50.integration.classpath"> <pathelement location="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-core/jbossws-core.jar"/> <pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar"/> <pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar"/> <pathelement location="${thirdparty.dir}/jbossws-core/jboss-saaj.jar"/> - <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/>