Author: thomas.diesler(a)jboss.com Date: 2006-12-21 05:11:41 -0500 (Thu, 21 Dec 2006) New Revision: 1681 Modified: branches/tdiesler/jbossws-1.0/.classpath branches/tdiesler/jbossws-1.0/src/ant/build-thirdparty.xml branches/tdiesler/jbossws-1.0/version.properties Log: update dependencies to jboss-4.2.x Modified: branches/tdiesler/jbossws-1.0/.classpath =================================================================== --- branches/tdiesler/jbossws-1.0/.classpath 2006-12-21 10:08:10 UTC (rev 1680) +++ branches/tdiesler/jbossws-1.0/.classpath 2006-12-21 10:11:41 UTC (rev 1681) @@ -24,11 +24,6 @@ <classpathentry kind="lib" path="thirdparty/stax-api-1.0.jar"/> <classpathentry kind="lib" path="thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="thirdparty/ant.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss.jar" sourcepath="/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/server/src/main"/> - <classpathentry kind="lib" path="thirdparty/jboss-j2ee.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-jmx.jar"/> - <classpathentry kind="lib" path="thirdparty/jbosssx.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-system.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-common.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-remoting.jar"/> <classpathentry kind="lib" path="thirdparty/wsdl4j.jar"/> Modified: branches/tdiesler/jbossws-1.0/src/ant/build-thirdparty.xml =================================================================== --- branches/tdiesler/jbossws-1.0/src/ant/build-thirdparty.xml 2006-12-21 10:08:10 UTC (rev 1680) +++ branches/tdiesler/jbossws-1.0/src/ant/build-thirdparty.xml 2006-12-21 10:11:41 UTC (rev 1681) @@ -36,11 +36,6 @@ <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jbossas/core-libs/${jbossas}/lib/jboss.jar" dest="${thirdparty.dir}/jboss.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jbossas/core-libs/${jbossas}/lib/jbosssx.jar" dest="${thirdparty.dir}/jbosssx.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jbossas/core-libs/${jbossas}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jbossas/core-libs/${jbossas}/lib/jboss-jmx.jar" dest="${thirdparty.dir}/jboss-jmx.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jbossas/core-libs/${jbossas}/lib/jboss-system.jar" dest="${thirdparty.dir}/jboss-system.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.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"/> @@ -74,7 +69,6 @@ <pathelement location="${thirdparty.dir}/jboss-common.jar"/> <pathelement location="${thirdparty.dir}/jboss-container.jar"/> <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> @@ -95,20 +89,21 @@ <!-- The classpath for the jbossws core --> <path id="jboss.core.classpath"> + <pathelement location="${jboss.server.lib}/jboss-j2ee.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> </path> <!-- The classpath for the jboss integration --> <path id="jboss.integration.classpath"> - <pathelement location="${thirdparty.dir}/jboss.jar"/> - <pathelement location="${thirdparty.dir}/jbosssx.jar"/> - <pathelement location="${thirdparty.dir}/jboss-jmx.jar"/> - <pathelement location="${thirdparty.dir}/jboss-system.jar"/> - <pathelement location="${jboss.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss.server.deploy}/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar"/> + <pathelement location="${jboss.lib}/jboss-jmx.jar"/> + <pathelement location="${jboss.lib}/jboss-system.jar"/> + <pathelement location="${jboss.server.lib}/jboss.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${jboss.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss.server.deploy}/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar"/> </path> </target> Modified: branches/tdiesler/jbossws-1.0/version.properties =================================================================== --- branches/tdiesler/jbossws-1.0/version.properties 2006-12-21 10:08:10 UTC (rev 1680) +++ branches/tdiesler/jbossws-1.0/version.properties 2006-12-21 10:11:41 UTC (rev 1681) @@ -31,7 +31,6 @@ apache-xerces=2.7.1 jboss-backport-concurrent=2.1.0.GA jboss-jbossretro=1.0.2.GA -jbossas=4.0.4.GA jbpm-bpel=1.1.Beta2 junit=3.8.1 oswego-concurrent=1.3.4