Author: jgrassel
Date: Wed May 11 14:56:06 2011
New Revision: 1101909
URL: http://svn.apache.org/viewvc?rev=1101909&view=rev
Log:
OPENJPA-1996: OpenJPA Samples fail on MacOS X
Modified:
openjpa/branches/2.1.x/openjpa-examples/simple/src/main/java/build.xml
Modified: openjpa/branches/2.1.x/openjpa-examples/simple/src/main/java/build.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-examples/simple/src/main/java/build.xml?rev=1101909&r1=1101908&r2=1101909&view=diff
==============================================================================
--- openjpa/branches/2.1.x/openjpa-examples/simple/src/main/java/build.xml
(original)
+++ openjpa/branches/2.1.x/openjpa-examples/simple/src/main/java/build.xml Wed
May 11 14:56:06 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>
