Author: dwoods
Date: Mon Oct 25 20:23:54 2010
New Revision: 1027257
URL: http://svn.apache.org/viewvc?rev=1027257&view=rev
Log:
OPENJPA-1844 Update build to find jconsole.jar on MacOSX
Modified:
openjpa/trunk/openjpa-kernel/pom.xml
Modified: openjpa/trunk/openjpa-kernel/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/pom.xml?rev=1027257&r1=1027256&r2=1027257&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/pom.xml (original)
+++ openjpa/trunk/openjpa-kernel/pom.xml Mon Oct 25 20:23:54 2010
@@ -36,6 +36,11 @@
<name>OpenJPA Kernel</name>
<description>OpenJPA Kernel</description>
+ <properties>
+ <!-- default location of jconsole.jar on most platforms -->
+ <jconsoleHome>${java.home}/../lib</jconsoleHome>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -70,11 +75,27 @@
<artifactId>jconsole</artifactId>
<version>1.6.0</version>
<scope>system</scope>
- <systemPath>${java.home}/../lib/jconsole.jar</systemPath>
+ <systemPath>${jconsoleHome}/jconsole.jar</systemPath>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>macosx</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <!-- location of jconsole.jar on MacOSX -->
+ <jconsoleHome>${java.home}/lib</jconsoleHome>
+ </properties>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
