[jbossws-commits] JBossWS SVN: r6136 - stack/metro/trunk/ant-import.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-03-27 14:20:18 -0400 (Thu, 27 Mar 2008)
New Revision: 6136

Modified:
   stack/metro/trunk/ant-import/build-thirdparty.xml
Log:
[JBWS-2082] svn merge -r 6096:6098 https://svn.jboss.org/repos/jbossws/stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA

Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml	2008-03-27 18:16:04 UTC (rev 6135)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml	2008-03-27 18:20:18 UTC (rev 6136)
@@ -51,7 +51,7 @@
   <!-- 
   thirdpartry-get
   -->
-  <target name="thirdparty-get" depends="thirdparty-delete,metro-copy-jars" if="force.thirdparty.get" description="Gets the thirdparty libraries">
+  <target name="thirdparty-get" depends="thirdparty-delete" if="force.thirdparty.get" description="Gets the thirdparty libraries">
     
     <mkdir dir="${thirdparty.dir}"/>
     <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
@@ -93,7 +93,7 @@
     <checksum file="${int.metro.dir}/version.properties" fileext=".md5"/>
   </target>
   
-  <target name="thirdparty-classpath" depends="thirdparty-get">
+  <target name="thirdparty-classpath" depends="thirdparty-get,metro-build">
     
     <!-- The compile classpath for jboss50 integration -->
     <path id="metro.integration.classpath">
@@ -173,10 +173,45 @@
   </target>
   
   <!-- Copy the metro jars -->
-  <target name="metro-copy-jars" depends="metro-cvs-build,metro-runtime-jar,metro-tools-jar">
+  <target name="metro-copy-jars" depends="thirdparty-get,metro-cvs-build,metro-runtime-jar,metro-tools-jar" unless="metro.build.available">
     <mkdir dir="${thirdparty.dir}"/>
     
     <property name="lib.runtime.dir" value="${glassfish.metro.dir}/wsit/wsit/lib/runtime"/>
+    
+    <!-- Verify the JAX-WS Implementation version -->
+    <unjar src="${lib.runtime.dir}/jaxws-rt.jar" dest="${metro.output.lib.dir}/jaxws-rt" overwrite="true">
+      <patternset>
+        <include name="META-INF/MANIFEST.MF"/>
+      </patternset>
+    </unjar>
+    <loadfile property="jaxws.impl.version" srcfile="${metro.output.lib.dir}/jaxws-rt/META-INF/MANIFEST.MF">
+      <filterchain>
+        <linecontains>
+          <contains value="Implementation-Version"/>
+        </linecontains>
+      </filterchain>
+    </loadfile>
+    <condition property="jaxws.impl.version.ok">
+      <equals arg1="${jaxws.impl.version}" arg2="Implementation-Version: ${sun-jaxws}" trim="true"/>
+    </condition>
+    <fail message="Unexpected jax-ws version: ${jaxws.impl.version}" unless="jaxws.impl.version.ok"/>
+
+    <!-- Make sure that NONE of these jars are previously downloaded from the repository -->
+    <available property="jaxws-local-transport.available" filepath="${thirdparty.dir}" file="jaxws-local-transport.jar"/>
+    <available property="stax-utils.available" filepath="${thirdparty.dir}" file="stax-utils.jar"/>
+    <available property="txnannprocessor.available" filepath="${thirdparty.dir}" file="txnannprocessor.jar"/>
+    <available property="xmldsig.available" filepath="${thirdparty.dir}" file="xmldsig.jar"/>
+    <available property="xws-security.available" filepath="${thirdparty.dir}" file="xws-security.jar"/>
+    <available property="resolver.available" filepath="${thirdparty.dir}" file="resolver.jar"/>
+    
+    <fail message="jaxws-local-transport.jar already available" if="jaxws-local-transport.available"/>
+    <fail message="stax-utils.jar already available" if="stax-utils.available"/>
+    <fail message="txnannprocessor.jar already available" if="txnannprocessor.available"/>
+    <fail message="xmldsig.jar already available" if="xmldsig.available"/>
+    <fail message="xws-security.jar already available" if="xws-security.available"/>
+    <fail message="resolver.jar already available" if="resolver.available"/>
+    
+    <!-- Make sure that these jars are available in the metro build -->
     <available property="jaxws-local-transport.available" filepath="${lib.runtime.dir}" file="jaxws-local-transport.jar"/>
     <available property="stax-utils.available" filepath="${lib.runtime.dir}" file="stax-utils.jar"/>
     <available property="txnannprocessor.available" filepath="${lib.runtime.dir}" file="txnannprocessor.jar"/>
@@ -191,7 +226,7 @@
     <fail message="xws-security.jar not available" unless="xws-security.available"/>
     <fail message="resolver.jar not available" unless="resolver.available"/>
     
-    <copy todir="${thirdparty.dir}" verbose="true" overwrite="true">
+    <copy todir="${thirdparty.dir}" verbose="true" overwrite="false">
       <fileset dir="${lib.runtime.dir}">
         <include name="jaxws-local-transport.jar"/>
         <include name="stax-utils.jar"/>
@@ -200,7 +235,7 @@
         <include name="xws-security.jar"/>
       </fileset>
     </copy>
-    <copy file="${lib.runtime.dir}/resolver.jar" tofile="${thirdparty.dir}/wsit-resolver.jar" verbose="true" overwrite="true"/>
+    <copy file="${lib.runtime.dir}/resolver.jar" tofile="${thirdparty.dir}/wsit-resolver.jar" verbose="true" overwrite="false"/>
     
     <!-- Touch the build marker --> 
     <touch file="${glassfish.metro.dir}/build-marker-${metro.cvs.tag}"/>