[jboss-svn-commits] JBL Code SVN: r38225 - labs/jbossesb/branches/JBESB_4_11_CP/product/services/soap.

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

Author: tcunning
Date: 2012-10-15 15:15:43 -0400 (Mon, 15 Oct 2012)
New Revision: 38225

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP/product/services/soap/build.xml
Log:
JBESB-3857
Make sure we add tools.jar to the classpath on Linux and Windows.


Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/services/soap/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/services/soap/build.xml	2012-10-15 04:26:11 UTC (rev 38224)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/services/soap/build.xml	2012-10-15 19:15:43 UTC (rev 38225)
@@ -38,21 +38,27 @@
 	<target name="test" depends="base.test"/>
 
     <target name="set.windows.os">
-        <condition property="windows.os">
-           <os family="windows"/>
-        </condition>
+        <condition property="os.not.macosx">
+	   <not>
+	     <and>
+               <os family="mac"/>
+	       <os family="unix"/>
+             </and>
+	   </not>
+	</condition>
     </target>
 
-    <target name="tools.classpath" depends="set.windows.os" if="windows.os">
+    <target name="tools.classpath" depends="set.windows.os" if="os.not.macosx">
         <path id="tools.jar.classpath">
             <fileset dir="${java.home}/../lib" includes="tools.jar"/>
         </path>
+	<property name="tools.jar.location" refid="tools.jar.classpath"/>
+	<echo>tools.jar=${tools.jar.location}</echo>
     </target>
 
 
     <target name="init.classpath" depends="tools.classpath">
-	<path id="tools.jar.classpath">
-        </path>
+	<property name="tools.jar.location" value=""/>
 
         <path id="classpath">
             <pathelement location="src/test/resources"/>
@@ -120,9 +126,10 @@
 
 
         </path>
+
         <path id="exec.classpath">
             <!-- Ant seem to use JRE by default even if JAVA_HOME is set to JDK -->
-	    <path refid="tools.jar.classpath"/>
+	    <pathelement location="${tools.jar.location}"/>
             <pathelement location="${aop.jar}"/>
             <pathelement location="${build.dir}/${wise.jar}"/>
             <path refid="classpath"/>