From 64bd51ea04c186b80a03cd3fb8ceb6f808ef659d Mon Sep 17 00:00:00 2001
From: Jody Grassel <jgrassel@apache.org>
Date: Wed, 11 May 2011 17:24:01 +0000
Subject: [PATCH] OPENJPA-1996: OpenJPA Samples fail on MacOS X

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1101989 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-examples/simple/src/main/java/build.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/openjpa-examples/simple/src/main/java/build.xml b/openjpa-examples/simple/src/main/java/build.xml
index 2c3c5c674..301b1ea5c 100644
--- a/openjpa-examples/simple/src/main/java/build.xml
+++ b/openjpa-examples/simple/src/main/java/build.xml
@@ -58,6 +58,14 @@ Please traverse to a sub-directory, like hellojpa, and run "ant" from there.
         <exec dir="${basedir}/reversemapping" executable="ant${platform.script.ext}"/>
     </target>
 
+    <!-- OPENJPA-1996: The build of derby that ships with the OpenJPA build has an
+         incompatibility with MacOS X.  This can be resolved by leveraging the Derby
+         build that ships with MacOS X in the /usr/share/derby directory. -->
+    <condition property="derby.loc" value="/usr/share/derby">
+       <os family="mac"/>
+    </condition>
+    <property name="derby.loc" value="${root}"/>
+    
     <path id="classpath"
         description="The classpath to use for compiling and running">
         <pathelement path="${parent}"/>
@@ -70,6 +78,9 @@ Please traverse to a sub-directory, like hellojpa, and run "ant" from there.
         -->
         <fileset dir="${root}">
             <include name="openjpa-all-*.jar"/>
+            <!-- <include name="lib/derby*.jar"/> -->
+        </fileset>
+        <fileset dir="${derby.loc}">
             <include name="lib/derby*.jar"/>
         </fileset>
     </path>