[jboss-svn-commits] JBossWS SVN: r1153 - in branches/jbossws-1.0: . src/ant

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

Author: thomas.diesler at jboss.com
Date: 2006-10-05 18:25:40 -0400 (Thu, 05 Oct 2006)
New Revision: 1153

Modified:
   branches/jbossws-1.0/
   branches/jbossws-1.0/build.xml
   branches/jbossws-1.0/src/ant/build-thirdparty.xml
Log:
Delete thirdparty when version.properties changes


Property changes on: branches/jbossws-1.0
___________________________________________________________________
Name: svn:ignore
   - 
clipboard.xml
output
output-eclipse
thirdparty
ant.properties

   + 
clipboard.xml
output
output-eclipse
thirdparty
ant.properties
version.properties.md5


Modified: branches/jbossws-1.0/build.xml
===================================================================
--- branches/jbossws-1.0/build.xml	2006-10-05 22:20:40 UTC (rev 1152)
+++ branches/jbossws-1.0/build.xml	2006-10-05 22:25:40 UTC (rev 1153)
@@ -72,10 +72,16 @@
     <available property="jboss.ejb3.available" file="${jboss.client}/jboss-ejb3-client.jar"/>
     <available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/>
     
+    <checksum file="version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
+    <checksum file="version.properties" fileext=".md5"/>
+    
     <condition property="force.thirdparty.get">
-      <not>
-        <available file="${thirdparty.dir}" type="dir"/>
-      </not>
+      <or>
+        <not>
+          <available file="${thirdparty.dir}" type="dir"/>
+        </not>
+        <isfalse value="${checksum.ok}"/>
+      </or>
     </condition>
     
     <fail message="Not available: ${jboss.client}/jboss-ejb3-client.jar" unless="jboss.ejb3.available"/>

Modified: branches/jbossws-1.0/src/ant/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.0/src/ant/build-thirdparty.xml	2006-10-05 22:20:40 UTC (rev 1152)
+++ branches/jbossws-1.0/src/ant/build-thirdparty.xml	2006-10-05 22:25:40 UTC (rev 1153)
@@ -9,7 +9,7 @@
 <!--                                                                        -->
 <!-- ====================================================================== -->
 
-<!-- $Id$ -->
+<!-- $Id:build-thirdparty.xml 1125 2006-10-03 15:45:31Z thomas.diesler at jboss.com $ -->
 
 <project default="init-thirdparty" name="JBossWS-Thirdparty">
 
@@ -23,7 +23,9 @@
   <target name="thirdparty-get" if="force.thirdparty.get" 
     description="Gets the thirdparty libraries">
 
+    <delete dir="${thirdparty.dir}"/>
     <mkdir dir="${thirdparty.dir}"/>
+    
     <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/>
@@ -33,6 +35,11 @@
     <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"/>
@@ -84,16 +91,16 @@
 
     <!-- The classpath for the jbossws core -->
     <path id="jboss.core.classpath">
-      <pathelement location="${jboss.server.lib}/jboss-j2ee.jar"/>
+      <pathelement location="${thirdparty.dir}/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="${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="${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.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>