[jboss-cvs] JBossAS SVN: r60436 - in branches/Branch_AOP_1_5/aop: src/main/org/jboss/aop/hook and 1 other directory.

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

Author: flavia.rainone at jboss.com
Date: 2007-02-08 15:15:18 -0500 (Thu, 08 Feb 2007)
New Revision: 60436

Modified:
   branches/Branch_AOP_1_5/aop/build.xml
   branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java
Log:
Added support to JRockit R27.1.0-jdk1.5.0_08 virtual machine

Modified: branches/Branch_AOP_1_5/aop/build.xml
===================================================================
--- branches/Branch_AOP_1_5/aop/build.xml	2007-02-08 18:33:09 UTC (rev 60435)
+++ branches/Branch_AOP_1_5/aop/build.xml	2007-02-08 20:15:18 UTC (rev 60436)
@@ -91,7 +91,8 @@
       <!-- Defines jrockit.home -->
       <property file="local.properties"/>
 
-      <available file="${jrockit.home}/jre/lib/managementapi.jar" property="JROCKIT_AVAILABLE"/>
+      <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"/>
 
       <!-- ======= -->
       <!-- Modules -->
@@ -155,7 +156,7 @@
 
       <path id="javac.jrockit.classpath">
          <path refid="javac.classpath"/>
-         <path path="${jrockit.home}/jre/lib/managementapi.jar"/>
+         <path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}"/>
       </path>
 
       <path id="test.classpath">
@@ -165,7 +166,7 @@
 
       <path id="test.jrockit.classpath">
          <path refid="test.classpath"/>
-         <path path="${jrockit.home}/jre/lib/managementapi.jar"/>
+         <path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}"/>
       </path>
 
       <path id="test15.classpath">
@@ -261,7 +262,7 @@
       </javac>
    </target>
 
-   <target name="compile-jrockit-classes" depends="init" if="JROCKIT_AVAILABLE">
+   <target name="compile-jrockit-classes" depends="init" if="JROCKIT_API_AVAILABLE">
       <mkdir dir="${build.classes}"/>
       <javac destdir="${build.classes}"
          optimize="${javac.optimize}"
@@ -355,7 +356,7 @@
    </target>
 
    <target name="jars-jrockit" description="Builds all jar files."
-      depends="jars,compile-jrockit-classes" if="JROCKIT_AVAILABLE">
+      depends="jars,compile-jrockit-classes" if="JROCKIT_API_AVAILABLE">
 
       <jar jarfile="${build.lib}/jrockit-pluggable-instrumentor.jar"
          manifest="${build.etc}/default.mf">
@@ -472,7 +473,7 @@
    <!-- ================================================================== -->
 
    <target name="dist" depends="javadocs, init">
-      <fail unless="JROCKIT_AVAILABLE">
+      <fail unless="JROCKIT_API_AVAILABLE">
          To build a distribution you must have a version of JRockit available and set the jrockit.home property.
       </fail>
 
@@ -1695,7 +1696,7 @@
       </junit>
    </target>
 
-   <target name="jrockit-loadtime-tests" depends="compile-test-classes" if="JROCKIT_AVAILABLE">
+   <target name="jrockit-loadtime-tests" depends="compile-test-classes" if="JROCKIT_API_AVAILABLE">
 
       <property name="report.dir" value="${build.reports}/jroockit-loadtime-tests"/>
       <mkdir dir="${report.dir}"/>

Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java	2007-02-08 18:33:09 UTC (rev 60435)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java	2007-02-08 20:15:18 UTC (rev 60436)
@@ -29,6 +29,13 @@
 
 public class JRockitClassPreProcessor implements ClassPreProcessor{
 
+   static
+   {
+      //pre-load necessary classes 
+      Class clazz = JDK14TransformerManager.class;
+      clazz = AspectManager.class;
+   }
+   
    public JRockitClassPreProcessor()
    {
       ClassLibrary lib = JVMFactory.getJVM().getClassLibrary();