From 4f0dba41420f6cee349294e17710a8e71cca3366 Mon Sep 17 00:00:00 2001
From: Eli Collins <eli@apache.org>
Date: Thu, 14 Jul 2011 22:27:15 +0000
Subject: [PATCH] HADOOP-7305. Eclipse project files are incomplete.
 Contributed by Niels Basjes

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1146912 13f79535-47bb-0310-9956-ffa450edef68
---
 common/CHANGES.txt |  2 ++
 common/build.xml   | 29 ++++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/common/CHANGES.txt b/common/CHANGES.txt
index bb336d14a7..c286be86b1 100644
--- a/common/CHANGES.txt
+++ b/common/CHANGES.txt
@@ -264,6 +264,8 @@ Trunk (unreleased changes)
 
     HADOOP-7443. Add CRC32C as another DataChecksum implementation (todd)
 
+    HADOOP-7305. Eclipse project files are incomplete. (Niels Basjes via eli)
+
   OPTIMIZATIONS
   
     HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
diff --git a/common/build.xml b/common/build.xml
index eb00e0fd94..abaf4d45cc 100644
--- a/common/build.xml
+++ b/common/build.xml
@@ -1714,10 +1714,29 @@
   <target name="eclipse" 
           depends="init,ant-eclipse-download,ivy-retrieve-common,ivy-retrieve-test,compile-core-test"
           description="Create eclipse project files">
-	     <pathconvert property="eclipse.project">
-	       <path path="${basedir}"/>
-	       <regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes"/>
-	     </pathconvert>
+
+    <property environment="env"/>
+
+    <!-- Locate the tools.jar which is part of the JDK -->
+    <condition property="jdk.tools.jar" value="${env.JDK_HOME}/lib/tools.jar">
+      <available file="${env.JDK_HOME}/lib/tools.jar"/>
+    </condition>
+    <condition property="jdk.tools.jar" value="${env.JAVA_HOME}/lib/tools.jar">
+      <available file="${env.JAVA_HOME}/lib/tools.jar"/>
+    </condition>
+    <condition property="jdk.tools.jar" value="${java.home}/../lib/tools.jar">
+      <available file="${java.home}/../lib/tools.jar"/>
+    </condition>
+
+    <!-- The tools.jar from the JDK is called classes.jar on OS X. -->
+    <condition property="jdk.tools.jar" value="${java.home}/bundle/Classes/classes.jar">
+      <available file="${java.home}/bundle/Classes/classes.jar"/>
+    </condition>  	
+
+    <pathconvert property="eclipse.project">
+      <path path="${basedir}"/>
+      <regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes"/>
+    </pathconvert>
     <taskdef name="eclipse"
              classname="prantl.ant.eclipse.EclipseTask"
              classpath="${build.dir}/lib/ant-eclipse-1.0-jvm1.2.jar" />
@@ -1737,7 +1756,7 @@
         <library pathref="ivy-test.classpath" exported="false" />
         <variable path="ANT_HOME/lib/ant.jar" exported="false" />
         <library path="${conf.dir}" exported="false" />
-        <library path="${java.home}/../lib/tools.jar" exported="false" />
+        <library path="${jdk.tools.jar}" exported="false" />
       </classpath>
     </eclipse>
   </target>