[jboss-cvs] JBossAS SVN: r60437 - in projects/aop/trunk/aop: src/main/org/jboss/aop/hook and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 8 15:17:58 EST 2007
Author: flavia.rainone at jboss.com
Date: 2007-02-08 15:17:58 -0500 (Thu, 08 Feb 2007)
New Revision: 60437
Modified:
projects/aop/trunk/aop/build-tests-jdk14.xml
projects/aop/trunk/aop/build-tests-jdk50.xml
projects/aop/trunk/aop/build.xml
projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java
Log:
Added support to JRockit R27.1.0-jdk1.5.0_08 virtual machine
Modified: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml 2007-02-08 20:15:18 UTC (rev 60436)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml 2007-02-08 20:17:58 UTC (rev 60437)
@@ -105,7 +105,6 @@
-->
<property file="local.properties"/>
- <available file="${jrockit.home}/jre/lib/managementapi.jar" property="JROCKIT_AVAILABLE"/>
<condition property="jboss.aop.debug.classes" value="true">
<isset property="debug"/>
</condition>
Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml 2007-02-08 20:15:18 UTC (rev 60436)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml 2007-02-08 20:17:58 UTC (rev 60437)
@@ -104,7 +104,8 @@
-->
<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"/>
<condition property="jboss.aop.debug.classes" value="true">
<isset property="debug"/>
</condition>
@@ -164,7 +165,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">
@@ -174,7 +175,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>
<!-- The classpath required to build javadocs. -->
@@ -1174,7 +1175,7 @@
<!-- ==================================================================================== -->
<!-- JROCKIT TESTS (JDK 5.0) -->
<!-- ==================================================================================== -->
- <target name="jrockit-tests" depends="compile-test-classes" if="JROCKIT_AVAILABLE">
+ <target name="jrockit-tests" depends="compile-test-classes" if="JROCKIT_API_AVAILABLE">
<!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
<antcall target="_base-jdk50-tests" inheritRefs="true">
@@ -1194,7 +1195,7 @@
<!-- ==================================================================================== -->
<!-- GENERATED ADVISOR JROCKIT TESTS (JDK 5.0) -->
<!-- ==================================================================================== -->
- <target name="jrockit-genadvisor-tests" depends="compile-test-classes" if="JROCKIT_AVAILABLE">
+ <target name="jrockit-genadvisor-tests" depends="compile-test-classes" if="JROCKIT_API_AVAILABLE">
<!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
<antcall target="_base-jdk50-tests" inheritRefs="true">
Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml 2007-02-08 20:15:18 UTC (rev 60436)
+++ projects/aop/trunk/aop/build.xml 2007-02-08 20:17:58 UTC (rev 60437)
@@ -97,7 +97,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 -->
@@ -158,8 +159,8 @@
</path>
<path id="javac.jrockit.classpath">
- <path refid="javac.classpath"/>
- <path path="${jrockit.home}/jre/lib/managementapi.jar"/>
+ <path refid="javac.classpath"/>
+ <path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}"/>
</path>
<path id="javac15.classpath">
@@ -252,7 +253,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}"
@@ -341,7 +342,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">
@@ -435,7 +436,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>
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java 2007-02-08 20:15:18 UTC (rev 60436)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java 2007-02-08 20:17:58 UTC (rev 60437)
@@ -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();
@@ -53,7 +60,5 @@
{
throw new RuntimeException(e);
}
-
}
-
-}
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list