JRockit agent for LTW with 1.3/1.4 + update in doc

1 files changed, 29 insertions, 28 deletions

diff --git a/docs/adk15ProgGuideDB/ltw.xml b/docs/adk15ProgGuideDB/ltw.xml
index 8b6f027bb..e822a5d20 100644
--- a/docs/adk15ProgGuideDB/ltw.xml
+++ b/docs/adk15ProgGuideDB/ltw.xml
@@ -74,7 +74,7 @@
         
         <sect2>
             <title>Enabling Load-time Weaving</title>
-            <para> AspectJ 5 supports three different ways of enabling load-time weaving for
+            <para> AspectJ 5 supports several different ways of enabling load-time weaving for
             an application: agents, a command-line launch script, and a set of interfaces for
             integration of AspectJ load-time weaving in custom environments. </para>
             <variablelist>
@@ -83,30 +83,31 @@
                     <listitem>
                         <para>AspectJ 5 ships with a number of load-time weaving agents that
                             enable load-time weaving. These agents and their configuration
-                            are execution environment dependent.
-                            Using Java 5 for example, you can specify the "-javaagent" option
-                            to the JVM. Configuration for the supported environments is discussed
-                            later in this chapter. AspectJ 5
-                            has several agents including those that use JVMTI, and the 
-                            JRockit MAPI. </para>
-                    </listitem>
-                </varlistentry>
-                <varlistentry>
-                    <term>Command line</term>
-                    <listitem>
-                        <!-- FIXME AV - wondering what is the status of this one as per aop.xml etc.. -->
-                        <para> AspectJ includes a script "aj" that allows programs executed at
-                            the command line to take advantage of load-time weaving. 
-                            The script is customized when AspectJ is installed depending on the chosen 
-                            JDK. For example, for JDK 1.4 the script uses the
-                            <literal>-Djava.system.class.loader</literal> system property to replace
-                            the system class loader with a weaving class loader allowing classes 
-                            loaded from the CLASSPATH to be woven. 
-                            For JDK 1.5 the JVMTI weaving agent is used allowing classes loaded by all
-                            class loaders to be woven. Versions of the JDK prior to 1.3 are not
-                            supported by the "aj" mechanism. </para>
+                            are execution environment dependent. Configuration for the supported environments is discussed
+                            later in this chapter.<br/>
+                            Using Java 5 JVMTI you can specify the <code>-javaagent:pathto/aspectjweaver.jar</code> option
+                            to the JVM.<br/>
+                            Using BEA JRockit and Java 1.3/1.4, the very same behavior can be obtained using BEA JRockit JMAPI features with
+                            the <code>-Xmanagement:class=org.aspectj.weaver.loadtime.JRockitAgent</code>
+                        </para>
                     </listitem>
                 </varlistentry>
+                <!-- FIXME: must be made consistent (aop.xml , CL hierarchy etc) -->
+<!--                <varlistentry>-->
+<!--                    <term>Command line</term>-->
+<!--                    <listitem>-->
+<!--                        <para> AspectJ includes a script "aj" that allows programs executed at-->
+<!--                            the command line to take advantage of load-time weaving. -->
+<!--                            The script is customized when AspectJ is installed depending on the chosen -->
+<!--                            JDK. For example, for JDK 1.4 the script uses the-->
+<!--                            <literal>-Djava.system.class.loader</literal> system property to replace-->
+<!--                            the system class loader with a weaving class loader allowing classes -->
+<!--                            loaded from the CLASSPATH to be woven. -->
+<!--                            For JDK 1.5 the JVMTI weaving agent is used allowing classes loaded by all-->
+<!--                            class loaders to be woven. Versions of the JDK prior to 1.3 are not-->
+<!--                            supported by the "aj" mechanism. </para>-->
+<!--                    </listitem>-->
+<!--                </varlistentry>-->
                 <varlistentry>
                     <term>Custom Integration</term>
                     <listitem>
@@ -114,7 +115,7 @@
                             to instantiate a weaver and weave classes after loading and before
                             defining them in the JVM. This enables load-time weaving to be supported in
                             environments where no weaving agent is available. It also allows the
-                            user to explicity restrict by class loader which classes can be woven. </para>
+                            user to explicity restrict by class loader which classes can be woven.</para>
                     </listitem>
                 </varlistentry>
             </variablelist>
@@ -359,17 +360,17 @@
         <title>Supported Agents</title>
         <sect2>
             <title>JVMTI</title>
-            <para> When using JDK 1.5 the JVMTI agent can be used by starting the JVM with the
+            <para> When using Java 5 the JVMTI agent can be used by starting the JVM with the
                 following option (adapt according to the path to aspectjweaver.jar): </para>
             <programlisting><![CDATA[
-			-javaagent=aspectjweaver.jar          
+			-javaagent=pathto/aspectjweaver.jar
 		  ]]></programlisting>
         </sect2>
         <sect2>
-            <title>JRockit</title>
+            <title>JRockit with Java 1.3/1.4 (use JVMTI on Java 5)</title>
             <para> The JRockit agent is configured with the following JVM option: </para>
             <programlisting><![CDATA[
-			-Xmanagement:class=org.aspectj.weaver.tools.JRockitWeavingAgent
+			-Xmanagement:class=org.aspectj.weaver.loadtime.JRockitAgent
 		  ]]></programlisting>
         </sect2>
     </sect1>