[jboss-cvs] JBossAS SVN: r65078 - projects/aop/trunk/aop.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2007-09-05 05:37:29 -0400 (Wed, 05 Sep 2007)
New Revision: 65078

Modified:
   projects/aop/trunk/aop/build.xml
Log:
Make version of JRockit more flexible

Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml	2007-09-05 06:19:25 UTC (rev 65077)
+++ projects/aop/trunk/aop/build.xml	2007-09-05 09:37:29 UTC (rev 65078)
@@ -93,8 +93,25 @@
       <!-- Defines jrockit.home -->
       <property file="local.properties"/>
 
-      <available file="${jrockit.home}/jre/lib/managementapi.jar" property="JROCKIT_API_AVAILABLE" value="managementapi.jar"/>
-      <available file="${jrockit.home}/jre/lib/management-agent.jar" property="JROCKIT_API_AVAILABLE" value="rt.jar"/>
+      <!-- in older versions of jrockit the weaving stuff lives in managementapi.jar, in newer in management-agent.jar -->
+      <available file="${jrockit.home}/jre/lib/managementapi.jar" property="OLD_JROCKIT" value="managementapi.jar"/>
+      <available file="${jrockit.home}/jre/lib/management-agent.jar" property="NEW_JROCKIT" value="rt.jar"/>
+      <condition property="JROCKIT_API_AVAILABLE" value="${OLD_JROCKIT}">
+         <and>
+            <isset property="OLD_JROCKIT"/>
+            <not>
+               <isset property="NEW_JROCKIT"/>
+             </not>
+         </and>
+      </condition>
+      <condition property="JROCKIT_API_AVAILABLE" value="${NEW_JROCKIT}">
+         <and>
+            <isset property="NEW_JROCKIT"/>
+            <not>
+               <isset property="OLD_JROCKIT"/>
+             </not>
+         </and>
+      </condition>
 
       <!-- ======= -->
       <!-- Modules -->
@@ -176,7 +193,7 @@
 
       <!-- Packages to include when generating api documentation -->
       <property name="javadoc.packages" value="org.jbos.aop.*"/>
-    
+
    </target>