summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2010-02-15 17:34:25 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2010-02-15 17:34:25 +0000
commitdce48cef88f6bc70e8a0f138bbf8fedfbf2994b5 (patch)
tree367a0e2deeccba57a98c9e9e4207f40abf5b6265
parent4ece9aa7edd94f64b4510418d2aeea8d08309217 (diff)
TUSCANY-2594 - Adding workaround for missing tools.jar in mac os, by setting profiles/properties to set the proper jar based on the os being used
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@910273 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/trunk/pom.xml28
1 files changed, 26 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/pom.xml b/sca-java-2.x/trunk/pom.xml
index 4767c726bc..f5bdbc02ef 100644
--- a/sca-java-2.x/trunk/pom.xml
+++ b/sca-java-2.x/trunk/pom.xml
@@ -253,6 +253,30 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
+ <properties>
+ <tools.jar>${java.home}/../lib/tools.jar</tools.jar>
+ </properties>
+ <modules>
+ <module>modules</module>
+ <module>samples</module>
+ <module>itest</module>
+ <module>features</module>
+ <module>shades</module>
+ <module>distribution</module>
+ <module>archetypes</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>default-mac</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <tools.jar>${java.home}/../Classes/classes.jar</tools.jar>
+ </properties>
<modules>
<module>modules</module>
<module>samples</module>
@@ -617,7 +641,6 @@
</plugins>
</build>
</profile>
-
</profiles>
@@ -826,7 +849,8 @@
<artifactId>tools</artifactId>
<version>1.6</version>
<scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ <systemPath>${tools.jar}</systemPath>
+ <!--systemPath>${java.home}/../lib/tools.jar</systemPath-->
<optional>true</optional>
</dependency>
</dependencies>