You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/02/15 18:34:26 UTC

svn commit: r910273 - /tuscany/sca-java-2.x/trunk/pom.xml

Author: lresende
Date: Mon Feb 15 17:34:25 2010
New Revision: 910273

URL: http://svn.apache.org/viewvc?rev=910273&view=rev
Log:
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

Modified:
    tuscany/sca-java-2.x/trunk/pom.xml

Modified: tuscany/sca-java-2.x/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/pom.xml?rev=910273&r1=910272&r2=910273&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/pom.xml Mon Feb 15 17:34:25 2010
@@ -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>