[jboss-svn-commits] JBossWS SVN: r672 - trunk

[jboss-svn-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2006-08-03 04:56:30 -0400 (Thu, 03 Aug 2006)
New Revision: 672

Modified:
   trunk/build-thirdparty.xml
   trunk/build.xml
Log:
merge from 1.0.3.DEV

Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml	2006-08-03 08:55:49 UTC (rev 671)
+++ trunk/build-thirdparty.xml	2006-08-03 08:56:30 UTC (rev 672)
@@ -37,6 +37,10 @@
     <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.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}/jbossas/core-libs/${jbossas-core}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
+    <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
+    <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core}/lib/jboss-jmx.jar" dest="${thirdparty.dir}/jboss-jmx.jar" usetimestamp="true" verbose="true"/>
+    <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core}/lib/jboss-system.jar" dest="${thirdparty.dir}/jboss-system.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/>
@@ -80,11 +84,11 @@
 
     <!-- The classpath for the jbossws core -->
     <path id="jboss.core.classpath">
-      <pathelement location="${jboss.lib}/jboss-common.jar"/>
-      <pathelement location="${jboss.lib}/jboss-xml-binding.jar"/>
-      <pathelement location="${jboss.server.lib}/jboss-j2ee.jar"/>
+      <pathelement location="${thirdparty.dir}/jboss-common.jar"/>
+      <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
+      <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
+      <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
       <pathelement location="${jboss.server.lib}/jboss-jaxrpc.jar"/>
-      <pathelement location="${jboss.server.lib}/jboss-remoting.jar"/>
       <pathelement location="${jboss.server.lib}/jboss-saaj.jar"/>
       <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
       <pathelement location="${jboss.server.deploy}/jboss-bean.deployer/jboss-container.jar"/>

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2006-08-03 08:55:49 UTC (rev 671)
+++ trunk/build.xml	2006-08-03 08:56:30 UTC (rev 672)
@@ -441,7 +441,12 @@
   </target>
 
   <!-- Deploy jbossws14 to the server -->
-  <target name="deploy-jbossws14" depends="main,module-jars14" description="Deploy jbossws14">
+  <target name="module-jars14-assert" unless="jboss.jdk14.home">
+     <echo>ERROR: 'jboss.jdk14.home' is not set. </echo>
+     <echo>Make sure to point it to your jboss confiuguration thagt should run under jdk 1.4</echo>
+  </target>
+
+  <target name="deploy-jbossws14" depends="main,module-jars14, module-jars14-assert" description="Deploy jbossws14" if="jboss.jdk14.home">
     <antcall target="deploy-to-server">
       <param name="jboss.deploy.home" value="${jboss.jdk14.home}"/>
       <param name="jbossws" value="jbossws14"/>
@@ -454,6 +459,8 @@
 
   <!-- Deploy to jboss -->
   <target name="deploy-to-server">
+    <copy todir="${jboss.deploy.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
+    <copy todir="${jboss.deploy.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
     <copy todir="${jboss.deploy.home}/client" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
     <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
     <mkdir dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>