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

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

Author: tcunning
Date: 2012-09-24 14:41:18 -0400 (Mon, 24 Sep 2012)
New Revision: 38196

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP/product/services/soap/build.xml
Log:
JBESB-3835
Only add tools.jar to the path if ant detects the os is 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-09-24 16:45:52 UTC (rev 38195)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/services/soap/build.xml	2012-09-24 18:41:18 UTC (rev 38196)
@@ -37,7 +37,23 @@
 	
 	<target name="test" depends="base.test"/>
 
-    <target name="init.classpath">
+    <target name="set.windows.os">
+        <condition property="windows.os">
+           <os family="windows"/>
+        </condition>
+    </target>
+
+    <target name="tools.classpath" depends="set.windows.os" if="windows.os">
+        <path id="tools.jar.classpath">
+            <fileset dir="${java.home}/../lib" includes="tools.jar"/>
+        </path>
+    </target>
+
+
+    <target name="init.classpath" depends="tools.classpath">
+	<path id="tools.jar.classpath">
+        </path>
+
         <path id="classpath">
             <pathelement location="src/test/resources"/>
 
@@ -106,7 +122,7 @@
         </path>
         <path id="exec.classpath">
             <!-- Ant seem to use JRE by default even if JAVA_HOME is set to JDK -->
-            <fileset dir="${java.home}/../lib" includes="tools.jar"/>
+	    <path refid="tools.jar.classpath"/>
             <pathelement location="${aop.jar}"/>
             <pathelement location="${build.dir}/${wise.jar}"/>
             <path refid="classpath"/>