openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgras...@apache.org
Subject svn commit: r1101989 - /openjpa/trunk/openjpa-examples/simple/src/main/java/build.xml
Date Wed, 11 May 2011 17:24:02 GMT
Author: jgrassel
Date: Wed May 11 17:24:01 2011
New Revision: 1101989

URL: http://svn.apache.org/viewvc?rev=1101989&view=rev
Log:
OPENJPA-1996: OpenJPA Samples fail on MacOS X

Modified:
    openjpa/trunk/openjpa-examples/simple/src/main/java/build.xml

Modified: openjpa/trunk/openjpa-examples/simple/src/main/java/build.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/simple/src/main/java/build.xml?rev=1101989&r1=1101988&r2=1101989&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/simple/src/main/java/build.xml (original)
+++ openjpa/trunk/openjpa-examples/simple/src/main/java/build.xml Wed May 11 17:24:01 2011
@@ -58,6 +58,14 @@ Please traverse to a sub-directory, like
         <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
         -->
         <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>



Mime
View raw message