Author: jgrassel
Date: Wed May 11 17:51:03 2011
New Revision: 1101997
URL: http://svn.apache.org/viewvc?rev=1101997&view=rev
Log:
OPENJPA-1996: OpenJPA Samples fail on MacOS X
Modified:
openjpa/branches/1.2.x/openjpa-examples/src/main/java/build.xml
Modified: openjpa/branches/1.2.x/openjpa-examples/src/main/java/build.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-examples/src/main/java/build.xml?rev=1101997&r1=1101996&r2=1101997&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-examples/src/main/java/build.xml (original)
+++ openjpa/branches/1.2.x/openjpa-examples/src/main/java/build.xml Wed May 11
17:51:03 2011
@@ -36,11 +36,23 @@ Please traverse to a sub-directory and r
</fail>
</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}"/>
<fileset dir="${root}">
<include name="**/*.jar"/>
+ <exclude name="**/derby*.jar"/>
+ </fileset>
+ <fileset dir="${derby.loc}">
+ <include name="lib/derby*.jar"/>
</fileset>
</path>
