From common-commits-return-14713-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org  Thu Jul 14 22:27:40 2011
Return-Path: <common-commits-return-14713-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E15767E2C
	for <apmail-hadoop-common-commits-archive@www.apache.org>; Thu, 14 Jul 2011 22:27:40 +0000 (UTC)
Received: (qmail 48396 invoked by uid 500); 14 Jul 2011 22:27:40 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 47967 invoked by uid 500); 14 Jul 2011 22:27:39 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 47792 invoked by uid 99); 14 Jul 2011 22:27:39 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jul 2011 22:27:39 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jul 2011 22:27:36 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D0D832388897;
	Thu, 14 Jul 2011 22:27:15 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1146912 - in /hadoop/common/trunk/common: CHANGES.txt build.xml
Date: Thu, 14 Jul 2011 22:27:15 -0000
To: common-commits@hadoop.apache.org
From: eli@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110714222715.D0D832388897@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: eli
Date: Thu Jul 14 22:27:15 2011
New Revision: 1146912

URL: http://svn.apache.org/viewvc?rev=1146912&view=rev
Log:
HADOOP-7305. Eclipse project files are incomplete. Contributed by Niels Basjes

Modified:
    hadoop/common/trunk/common/CHANGES.txt
    hadoop/common/trunk/common/build.xml

Modified: hadoop/common/trunk/common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/common/CHANGES.txt?rev=1146912&r1=1146911&r2=1146912&view=diff
==============================================================================
--- hadoop/common/trunk/common/CHANGES.txt (original)
+++ hadoop/common/trunk/common/CHANGES.txt Thu Jul 14 22:27:15 2011
@@ -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

Modified: hadoop/common/trunk/common/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/common/build.xml?rev=1146912&r1=1146911&r2=1146912&view=diff
==============================================================================
--- hadoop/common/trunk/common/build.xml (original)
+++ hadoop/common/trunk/common/build.xml Thu Jul 14 22:27:15 2011
@@ -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>