[jboss-cvs] JBossAS SVN: r62883 - in projects/aop/trunk/aop/docs: examples/all and 34 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue May 8 13:50:44 EDT 2007


Author: kabir.khan at jboss.com
Date: 2007-05-08 13:50:43 -0400 (Tue, 08 May 2007)
New Revision: 62883

Modified:
   projects/aop/trunk/aop/docs/examples/after-throwing/after-throwing.html
   projects/aop/trunk/aop/docs/examples/all/all.html
   projects/aop/trunk/aop/docs/examples/annotated-aspects/annotated-aspects.html
   projects/aop/trunk/aop/docs/examples/annotated-cflow/annotated-cflow.html
   projects/aop/trunk/aop/docs/examples/annotated-composition/annotated-composition.html
   projects/aop/trunk/aop/docs/examples/annotated-dynamic-cflow/annotated-dynamic-cflow.html
   projects/aop/trunk/aop/docs/examples/annotated-injboss/annotated-injboss.html
   projects/aop/trunk/aop/docs/examples/annotated-interceptors/annotated-interceptors.html
   projects/aop/trunk/aop/docs/examples/annotated-introduction/annotated-introduction.html
   projects/aop/trunk/aop/docs/examples/annotated-parameters/annotated-parameters.html
   projects/aop/trunk/aop/docs/examples/annotated-precedence/annotated-precedence.html
   projects/aop/trunk/aop/docs/examples/annotated-typedef/annotated-typedef.html
   projects/aop/trunk/aop/docs/examples/annotation-introductions/annotation.html
   projects/aop/trunk/aop/docs/examples/aspect/aspect.html
   projects/aop/trunk/aop/docs/examples/beanstyleconf/config.html
   projects/aop/trunk/aop/docs/examples/beforeafter/beforeafter.html
   projects/aop/trunk/aop/docs/examples/caller/caller.html
   projects/aop/trunk/aop/docs/examples/cflow/cflow.html
   projects/aop/trunk/aop/docs/examples/composition/composition.html
   projects/aop/trunk/aop/docs/examples/constructor-execution/constructor.html
   projects/aop/trunk/aop/docs/examples/dynamic-aop/dynamic.html
   projects/aop/trunk/aop/docs/examples/dynamic_cflow/cflow.html
   projects/aop/trunk/aop/docs/examples/field-execution/field.html
   projects/aop/trunk/aop/docs/examples/finally/finally.html
   projects/aop/trunk/aop/docs/examples/implements/implements.html
   projects/aop/trunk/aop/docs/examples/instanceof/instanceof.html
   projects/aop/trunk/aop/docs/examples/introductions/introductions.html
   projects/aop/trunk/aop/docs/examples/metadata/metadata.html
   projects/aop/trunk/aop/docs/examples/method-execution/methodexecution.html
   projects/aop/trunk/aop/docs/examples/overloaded-advices/overloaded-advices.html
   projects/aop/trunk/aop/docs/examples/packaging/packaging.html
   projects/aop/trunk/aop/docs/examples/precedence/precedence.html
   projects/aop/trunk/aop/docs/examples/return-types/return-types.html
   projects/aop/trunk/aop/docs/examples/stacks/stacks.html
   projects/aop/trunk/aop/docs/examples/typedef/typedef.html
   projects/aop/trunk/aop/docs/reference/reference/en/modules/annotated.xml
   projects/aop/trunk/aop/docs/reference/reference/en/modules/annotationcompiler.xml
   projects/aop/trunk/aop/docs/reference/reference/en/modules/compiling.xml
   projects/aop/trunk/aop/docs/reference/reference/en/modules/running.xml
Log:
[JBAOP-399] Stop calling it JDK 1.5, that's too old school

Modified: projects/aop/trunk/aop/docs/examples/after-throwing/after-throwing.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/after-throwing/after-throwing.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/after-throwing/after-throwing.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -81,7 +81,7 @@
 
 </p><p>
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/all/all.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/all/all.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/all/all.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -19,7 +19,7 @@
 <h4>Running</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/annotated-aspects/annotated-aspects.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-aspects/annotated-aspects.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/annotated-aspects/annotated-aspects.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -65,7 +65,7 @@
 <h4>Running</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/annotated-cflow/annotated-cflow.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-cflow/annotated-cflow.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/annotated-cflow/annotated-cflow.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -55,7 +55,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/annotated-composition/annotated-composition.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-composition/annotated-composition.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/annotated-composition/annotated-composition.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -62,7 +62,7 @@
 <h4>Running the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/annotated-dynamic-cflow/annotated-dynamic-cflow.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-dynamic-cflow/annotated-dynamic-cflow.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/annotated-dynamic-cflow/annotated-dynamic-cflow.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -45,7 +45,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/annotated-injboss/annotated-injboss.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-injboss/annotated-injboss.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/annotated-injboss/annotated-injboss.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -8,14 +8,14 @@
 </p><p>
 <b>To run these examples you must edit build.xml and set the jboss.dir to where JBoss is. The server configuration used in this example is 'all', so you must start JBoss with 'run -c all'. </b>
 </p><p>
-<h3> JDK 1.5</h3>
+<h3> JDK 5</h3>
 
-JDK 1.5 must be used for this example, this involves:
+JDK 5 must be used for this example, this involves:
 <ul>
 <li>deleting JBOSS_HOME/server/all/jboss-aop.deployer</li>
 <li>copying jboss-40-install/jboss-aop-jdk50.deployer from the AOP distribution into the JBOSS_HOME/server/all/ folder</li>
 <li>using JDK 5.0 when you run JBoss</li>
-<li>building the example with JDK 1.5</li>
+<li>building the example with JDK 5</li>
 </ul>
 </p><p>
 <h3>Interceptors and bindings</h3>
@@ -24,10 +24,10 @@
 </p><p>
 <pre>
 @InterceptorDef
- at Bind (pointcut="org.jboss.injbossaop.lib.SimpleInterceptor.valueConstructors OR 
-	org.jboss.injbossaop.lib.SimpleInterceptor.valueMessage OR 
-	org.jboss.injbossaop.lib.SimpleInterceptor.service OR 
-	org.jboss.injbossaop.lib.SimpleInterceptor.sessionValue OR 
+ at Bind (pointcut="org.jboss.injbossaop.lib.SimpleInterceptor.valueConstructors OR
+	org.jboss.injbossaop.lib.SimpleInterceptor.valueMessage OR
+	org.jboss.injbossaop.lib.SimpleInterceptor.service OR
+	org.jboss.injbossaop.lib.SimpleInterceptor.sessionValue OR
 	org.jboss.injbossaop.lib.SimpleInterceptor.mbeans")
 public class SimpleInterceptor implements Interceptor
 {

Modified: projects/aop/trunk/aop/docs/examples/annotated-interceptors/annotated-interceptors.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-interceptors/annotated-interceptors.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/annotated-interceptors/annotated-interceptors.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -58,7 +58,7 @@
 <h4>Running</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/annotated-introduction/annotated-introduction.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-introduction/annotated-introduction.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/annotated-introduction/annotated-introduction.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -70,7 +70,7 @@
 <h4>Running the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/annotated-parameters/annotated-parameters.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-parameters/annotated-parameters.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/annotated-parameters/annotated-parameters.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -265,7 +265,7 @@
 <h3>Run the example</h3>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/annotated-precedence/annotated-precedence.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-precedence/annotated-precedence.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/annotated-precedence/annotated-precedence.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -85,7 +85,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/annotated-typedef/annotated-typedef.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-typedef/annotated-typedef.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/annotated-typedef/annotated-typedef.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -39,7 +39,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/annotation-introductions/annotation.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation-introductions/annotation.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/annotation-introductions/annotation.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -6,7 +6,7 @@
 </p><p>
 <h4>Overview</h4>
 
-This is an extension of the annotation14 example.  In this example, instead of declaring an annotation within the Java source file, we <i>introduce</i> an annotation through an XML descriptor.  This XML descriptor has the same effect as declaring an annotation the JDK 1.5 way, or the JDK 1.4 way.
+This is an extension of the annotation14 example.  In this example, instead of declaring an annotation within the Java source file, we <i>introduce</i> an annotation through an XML descriptor.  This XML descriptor has the same effect as declaring an annotation the JDK 5 way, or the JDK 1.4 way.
 </p><p>
 <h4>Example code</h4>
 
@@ -27,7 +27,7 @@
 <h4>Running</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/aspect/aspect.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/aspect/aspect.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/aspect/aspect.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -62,7 +62,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/beanstyleconf/config.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/beanstyleconf/config.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/beanstyleconf/config.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -147,7 +147,7 @@
 <h4>Running</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/beforeafter/beforeafter.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/beforeafter/beforeafter.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/beforeafter/beforeafter.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -314,7 +314,7 @@
 
 </p><p>
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/caller/caller.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/caller/caller.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/caller/caller.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -30,7 +30,7 @@
 <h4>Running</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/cflow/cflow.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/cflow/cflow.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/cflow/cflow.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -59,7 +59,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/composition/composition.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/composition/composition.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/composition/composition.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -34,7 +34,7 @@
 Running the example you'll see composition in action
 </p><p>
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/constructor-execution/constructor.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/constructor-execution/constructor.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/constructor-execution/constructor.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -31,7 +31,7 @@
 <h4>Running</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/dynamic-aop/dynamic.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/dynamic-aop/dynamic.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/dynamic-aop/dynamic.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -50,7 +50,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/dynamic_cflow/cflow.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/dynamic_cflow/cflow.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/dynamic_cflow/cflow.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -45,7 +45,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/field-execution/field.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/field-execution/field.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/field-execution/field.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -46,7 +46,7 @@
 <h4>Running</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/finally/finally.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/finally/finally.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/finally/finally.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -268,7 +268,7 @@
 
 </p>
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other weaving modes, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other weaving modes, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/implements/implements.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/implements/implements.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/implements/implements.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -36,7 +36,7 @@
 <h4>Running</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/instanceof/instanceof.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/instanceof/instanceof.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/instanceof/instanceof.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -17,7 +17,7 @@
 <h4>Running</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/introductions/introductions.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/introductions/introductions.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/introductions/introductions.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -90,7 +90,7 @@
 </p><p>
 This is expected because POJO is not serializable.  Now run it with introductions.
 </p><p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/metadata/metadata.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/metadata/metadata.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/metadata/metadata.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -6,7 +6,7 @@
 </p><p>
 <h4>Overview</h4>
 
-JBoss Metadata is alot like JDK 1.5's annotations(<a href="http://www.jcp.org/en/jsr/detail?id=175">JSR-175</a>) except it is driven and applied through XML.  JBossAOP has the ability to define metadata in XML or as Doclet tags that are then parsed to generate XML when you are not using JDK 1.5 or higher.  You can use the same pointcut annotation expressions to reference JBossAOP XML metadata expressions.  This metadata is different than regular JDK annotations in that they are untyped.  If you've read the <a href="../annotations14/annotation.html">Annotations with JDK 1.4</a>.  You can handcode this XML or have the Annotation compiler generate them from doclet tags using the -xml option.
+JBoss Metadata is alot like JDK 5's annotations(<a href="http://www.jcp.org/en/jsr/detail?id=175">JSR-175</a>) except it is driven and applied through XML.  JBossAOP has the ability to define metadata in XML or as Doclet tags that are then parsed to generate XML when you are not using JDK 5 or higher.  You can use the same pointcut annotation expressions to reference JBossAOP XML metadata expressions.  This metadata is different than regular JDK annotations in that they are untyped.  If you've read the <a href="../annotations14/annotation.html">Annotations with JDK 1.4</a>.  You can handcode this XML or have the Annotation compiler generate them from doclet tags using the -xml option.
 </p><p>
 <h4>Example code</h4>
 

Modified: projects/aop/trunk/aop/docs/examples/method-execution/methodexecution.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/method-execution/methodexecution.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/method-execution/methodexecution.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -84,7 +84,7 @@
 <h4>Running</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/overloaded-advices/overloaded-advices.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/overloaded-advices/overloaded-advices.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/overloaded-advices/overloaded-advices.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -178,7 +178,7 @@
 
 </p><p>
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/packaging/packaging.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/packaging/packaging.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/packaging/packaging.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -26,7 +26,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/precedence/precedence.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/precedence/precedence.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/precedence/precedence.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -86,7 +86,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/return-types/return-types.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/return-types/return-types.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/return-types/return-types.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -147,7 +147,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_annotated.html"/>annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/stacks/stacks.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/stacks/stacks.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/stacks/stacks.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -23,7 +23,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/examples/typedef/typedef.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/typedef/typedef.html	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/examples/typedef/typedef.html	2007-05-08 17:50:43 UTC (rev 62883)
@@ -36,7 +36,7 @@
 <h4>Run the example</h4>
 
 <p>
-<b>THIS EXAMPLE REQUIRES JDK 1.5!! For other options, please look at the
+<b>THIS EXAMPLE REQUIRES JDK 5!! For other options, please look at the
 <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a></b> To compile and run:</p>
 <pre>
   $ run.aopc.50

Modified: projects/aop/trunk/aop/docs/reference/reference/en/modules/annotated.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/reference/en/modules/annotated.xml	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/reference/reference/en/modules/annotated.xml	2007-05-08 17:50:43 UTC (rev 62883)
@@ -5,20 +5,20 @@
    <!-- *********************************** Intro ******************************** -->
 
    <para>
-         JDK 5.0 has introduced a new concept called annotations. Annotations can be 
+         JDK 5.0 has introduced a new concept called annotations. Annotations can be
          used as an alternative to XML for configuring classes for AOP. For backward compatibility
          with JDK 1.4.2 JBoss AOP uses an annotation compiler allowing you to create the same annotations
          in javadoc style comments.
    </para>
    <para>
-         The JDK 1.5 form has been used for the declarations of each annotation type shown below. For
+         The JDK 5 form has been used for the declarations of each annotation type shown below. For
          clarity both types of annotations are shown in the usage examples contained in this chapter.
-         A point worth mentioning is that in JDK 1.5 annotations are part of language and can thus 
+         A point worth mentioning is that in JDK 5 annotations are part of language and can thus
          be imported, so that just the classname can be used. In JDK 1.4.2 the annotations are not
-         part of "Java" so fully qualified classnames are needed. To keep things short and sweet 
+         part of "Java" so fully qualified classnames are needed. To keep things short and sweet
          the listings only import classes that are new for each listing.
    </para>
-   
+
    <!-- *********************************** Aspect ******************************** -->
 
    <sect1 id="annotated-aspect" revision="1">
@@ -35,14 +35,14 @@
          <literal>org.jboss.aop.Aspect</literal> is:
          <programlisting>
    package org.jboss.aop;
-   
+
    import org.jboss.aop.advice.Scope;
    import java.lang.annotation.ElementType;
    import java.lang.annotation.Retention;
    import java.lang.annotation.RetentionPolicy;
    import java.lang.annotation.Target;
-      
-   
+
+
    @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
            public @interface Aspect
    {
@@ -53,7 +53,7 @@
          and Scope is:
          <programlisting>
    package org.jboss.aop.advice;
-   
+
    public enum Scope
    {
       PER_VM, PER_CLASS, PER_INSTANCE, PER_JOINPOINT
@@ -62,14 +62,14 @@
          See the "XML Bindings" chapter for a description of the various scopes.
       </para>
       <para>
-         In JDK 1.5 we use the @Aspect annotation as follows:
+         In JDK 5 we use the @Aspect annotation as follows:
          <programlisting>
    package com.mypackage;
-   
+
    import org.jboss.aop.Aspect;
    import org.jboss.aop.advice.Scope;
    import org.jboss.aop.joinpoint.Invocation;
-   
+
    @Aspect (scope = Scope.PER_VM)
    public class MyAspect
    {
@@ -80,7 +80,7 @@
          And in JDK 1.4.2:
          <programlisting>
    package com.mypackage;
-   
+
    /**
     * @@Aspect (scope = Scope.PER_VM)
     */
@@ -94,7 +94,7 @@
          </programlisting>
       </para>
       <para>
-         The name of the class (in this case com.mypackage.MyAspect) gets used as the 
+         The name of the class (in this case com.mypackage.MyAspect) gets used as the
          internal name of the aspect. The equivalent using XML configuration would be:
          <programlisting>
             &lt;aop&gt;
@@ -120,7 +120,7 @@
          <literal>org.jboss.aop.InterceptorDef</literal> is:
          <programlisting>
    package org.jboss.aop;
-   
+
    @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
            public @interface Aspect
    {
@@ -131,22 +131,22 @@
          The same
          <literal>Scope</literal> enum is used as for
          <literal>Aspect</literal>.
-         The following examples use the @Bind annotation, which will be described in more 
+         The following examples use the @Bind annotation, which will be described in more
          detail below.
       </para>
       <sect2 id="annotated-interceptor-interceptor" revision="1">
          <title>Interceptor Example</title>
          <para>
-            In JDK 1.5 we use the
+            In JDK 5 we use the
             <literal>@InterceptorDef</literal> annotation to mark
             an Interceptor as follows:
             <programlisting>
    package com.mypackage;
-   
+
    import org.jboss.aop.Bind;
    import org.jboss.aop.InterceptorDef;
    import org.jboss.aop.advice.Interceptor;
-   
+
    @InterceptorDef (scope = Scope.PER_VM)
    @Bind (pointcut="execution("* com.blah.Test->test(..)")
    public class MyInterceptor implements Interceptor
@@ -161,7 +161,7 @@
          And in JDK 1.4.2:
             <programlisting>
    package com.mypackage;
-   
+
    /**
     * @@org.jboss.aop.InterceptorDef (scope = org.jboss.aop.advice.Scope.PER_VM)
     * @@org.jboss.aop.Bind (pointcut="execution("* com.blah.Test->test(..)")
@@ -176,7 +176,7 @@
             </programlisting>
          </para>
          <para>
-         The name of the class (in this case com.mypackage.MyInterceptor) gets used as the 
+         The name of the class (in this case com.mypackage.MyInterceptor) gets used as the
          class name of the interceptor. The equivalent using XML configuration would be:
             <programlisting>
                &lt;aop&gt;
@@ -189,14 +189,14 @@
       <sect2 id="annotated-interceptor-factory" revision="1">
          <title>AspectFactory Example</title>
          <para>
-            In JDK 1.5 the
+            In JDK 5 the
             <literal>@InterceptorDef</literal> annotation is used to mark an
             AspectFactory as follows:
             <programlisting>
    package com.mypackage;
 
    import org.jboss.aop.advice.AspectFactory;
-   
+
    @InterceptorDef (scope=org.jboss.aop.advice.Scope.PER_VM)
    @Bind (pointcut="execution("* com.blah.Test->test2(..)")
    public class MyInterceptorFactory implements AspectFactory
@@ -209,7 +209,7 @@
             And in JDK 1.4.2:
             <programlisting>
    package com.mypackage;
-   
+
    /**
     * @@org.jboss.aop.InterceptorDef (scope=org.jboss.aop.advice.Scope.PER_VM)
     * @@org.jboss.aop.Bind (pointcut="execution("* com.blah.Test->test2(..)")
@@ -221,8 +221,8 @@
             </programlisting>
          </para>
          <para>
-         The name of the class (in this case com.mypackage.MyInterceptorFactory) gets used 
-         as the factory name of the aspect factory. The equivalent using XML configuration 
+         The name of the class (in this case com.mypackage.MyInterceptorFactory) gets used
+         as the factory name of the aspect factory. The equivalent using XML configuration
          would be:
             <programlisting>
                &lt;aop&gt;
@@ -257,26 +257,26 @@
 {
    String value();
 }</programlisting>
-         <literal>@PointcutDef</literal> takes only one value, a valid pointcut expression. 
+         <literal>@PointcutDef</literal> takes only one value, a valid pointcut expression.
          The name of the pointcut used internally and when yo want to reference it is:
          <programlisting>&lt;name of @Aspect/@InterceptorDef annotated class&gt;.&lt;name of @PointcutDef annotated field&gt;</programlisting>
       </para>
       <para>
-         An example of an aspect class containing a named pointcut which it references from 
-         a bindng's pointcut expression in JDK 1.5:
+         An example of an aspect class containing a named pointcut which it references from
+         a bindng's pointcut expression in JDK 5:
          <programlisting>
    package com.mypackage;
 
    import org.jboss.aop.PointcutDef;
    import org.jboss.aop.pointcut.Pointcut;
-            
+
    @Aspect (scope = Scope.PER_VM)
    public class MyAspect
    {
       @PointcutDef ("(execution(* org.blah.Foo->someMethod()) OR \
 	      execution(* org.blah.Foo->otherMethod()))")
       public static Pointcut fooMethods;
-      
+
       public Object myAdvice(Invocation invocation)
       {
          return invocation.invokeNext();
@@ -284,7 +284,7 @@
    }
          </programlisting>
          It is worth noting that named pointcuts can be referenced in pointcut expressions
-         outside the class they are declared in (if the annotated fields are declared 
+         outside the class they are declared in (if the annotated fields are declared
          public of course!).
       </para>
       <para>
@@ -293,18 +293,18 @@
    package com.mypackage;
 
    import org.jboss.aop.pointcut.Pointcut;
-            
+
    /**
     * @@org.jboss.aop.Aspect (scope = Scope.PER_VM)
     */
    public class MyAspect
    {
       /**
-       * @@org.jboss.aop.PointcutDef ("(execution(* org.blah.Foo->someMethod()) \ 
+       * @@org.jboss.aop.PointcutDef ("(execution(* org.blah.Foo->someMethod()) \
                OR execution(* org.blah.Foo->otherMethod()))")
        */
       public static Pointcut fooMethods;
-      
+
       public Object myAdvice(Invocation invocation)
       {
          return invocation.invokeNext();
@@ -318,7 +318,7 @@
             &lt;aop&gt;
             &lt;aspect class="com.mypackage.MyAspect" scope="PER_VM"/&gt;
             &lt;pointcut
-            name="com.mypackage.MyAspect.fooMethods" 
+            name="com.mypackage.MyAspect.fooMethods"
             expr="(execution(* org.blah.Foo->someMethod()) OR \
                   execution(* org.blah.Foo->otherMethod()))"
       /&gt;
@@ -348,7 +348,7 @@
          <literal>org.jboss.aop.Bind</literal> is:
          <programlisting>
 package org.jboss.aop;
-   
+
 @Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
 public @interface Bind
 {
@@ -364,13 +364,13 @@
                joinpoints you want to bind an aspect/interceptor to
             </listitem>
             <listitem>
-               <literal>cflow</literal>, which is optional. If defined it must resolve to 
+               <literal>cflow</literal>, which is optional. If defined it must resolve to
                the name of a defined cflow.)
             </listitem>
          </itemizedlist>
          <para>
          </para>
-         In the case of a binding to an advice in an aspect class, the internal name of 
+         In the case of a binding to an advice in an aspect class, the internal name of
          the binding becomes:
          <programlisting>&lt;name of the aspect class&gt;.&lt;the name of the advice method&gt;</programlisting>
          In the case of a binding to an
@@ -380,19 +380,19 @@
          <programlisting>&lt;name of the Interceptor/AspectFactory implementation class&gt;</programlisting>
       </para>
       <para>
-         An example of a binding using an advice method in an aspect class in JDK 1.5:
+         An example of a binding using an advice method in an aspect class in JDK 5:
          <programlisting>
    package com.mypackage;
 
    import org.jboss.aop.Bind;
-            
+
    @Aspect (scope = Scope.PER_VM)
    public class MyAspect
    {
-      @PointcutDef ("(execution(* org.blah.Foo->someMethod()) \ 
+      @PointcutDef ("(execution(* org.blah.Foo->someMethod()) \
             OR execution(* org.blah.Foo->otherMethod()))")
       public static Pointcut fooMethods;
-      
+
       @Bind (pointcut="com.mypackage.MyAspect.fooMethods")
       public Object myAdvice(Invocation invocation)
       {
@@ -412,18 +412,18 @@
          And in JDK 1.4.2:
          <programlisting>
    package com.mypackage;
-   
+
    /**
     * @@org.jboss.aop.Aspect (scope = Scope.PER_VM)
     */
    public class MyAspect
    {
       /**
-       * @@org.jboss.aop.PointcutDef ("(execution(* org.blah.Foo->someMethod()) \ 
+       * @@org.jboss.aop.PointcutDef ("(execution(* org.blah.Foo->someMethod()) \
              OR execution(* org.blah.Foo->otherMethod()))")
        */
       public static Pointcut fooMethods;
-      
+
       /**
        * @@org.jboss.aop.Bind (pointcut="com.mypackage.MyAspect.fooMethods")
        */
@@ -431,7 +431,7 @@
       {
          return invocation.invokeNext();
       }
-      
+
       /**
        * @@org.jboss.aop.Bind (pointcut="execution(* org.blah.Bar->someMethod())")
        */
@@ -447,8 +447,8 @@
          &lt;aop&gt;
          &lt;aspect class="com.mypackage.MyAspect" scope="PER_VM"/&gt;
          &lt;pointcut
-         name="com.mypackage.MyAspect.fooMethods" 
-         expr="(execution("* org.blah.Foo->someMethod()) OR \ 
+         name="com.mypackage.MyAspect.fooMethods"
+         expr="(execution("* org.blah.Foo->someMethod()) OR \
                execution("* org.blah.Foo->otherMethod()))"
       /&gt;
          &lt;bind pointcut="com.mypackage.MyAspect.fooMethods"&gt;
@@ -494,7 +494,7 @@
          <literal>org.jboss.aop.Introduction</literal>:
          <programlisting>
    package org.jboss.aop;
-   
+
    @Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
    public @interface Introduction
    {
@@ -507,11 +507,11 @@
          <literal>@Introduction</literal> are:
          <itemizedlist>
             <listitem>
-               <literal>target</literal>, the name of the class we want to introduce 
+               <literal>target</literal>, the name of the class we want to introduce
                an interface to.
             </listitem>
             <listitem>
-               <literal>typeExpression</literal>, a type expression that should resolve 
+               <literal>typeExpression</literal>, a type expression that should resolve
                to one or more classes we want to introduce an interface to.
             </listitem>
             <listitem>
@@ -525,12 +525,12 @@
       </para>
       <para>
          This is how to use
-         <literal>@Introduction</literal> in JDK 1.5:
+         <literal>@Introduction</literal> in JDK 5:
          <programlisting>
    package com.mypackage;
 
    import org.jboss.aop.Introduction;
-            
+
    @Aspect (scope = Scope.PER_VM)
    public class IntroAspect
    {
@@ -549,14 +549,14 @@
    public class IntroAspect
    {
       /*
-       * @org.jboss.aop.Introduction (target=com.blah.SomeClass, \ 
+       * @org.jboss.aop.Introduction (target=com.blah.SomeClass, \
              interfaces={java.io.Serializable})
        */
       public static Object pojoNoInterfacesIntro;
    }
          </programlisting>
-         
-         Notice the slight difference in the JDK 1.4.2 annotation, the class values don't have 
+
+         Notice the slight difference in the JDK 1.4.2 annotation, the class values don't have
          the ".class" suffix.
       </para>
       <para>
@@ -580,13 +580,13 @@
       <title>@Mixin</title>
       <para>
          Sometimes when we want to introduce/force a new class to implement an interface,
-         that interface introduces new methods to a class. The class needs to implement 
-         these methods to be valid. In these cases a mixin class is used. The mixin class 
-         must implement the methods specified by the interface(s) and the main class can 
+         that interface introduces new methods to a class. The class needs to implement
+         these methods to be valid. In these cases a mixin class is used. The mixin class
+         must implement the methods specified by the interface(s) and the main class can
          then implement these methods and delegate to the mixin class.
       </para>
       <para>
-         Mixins are created using the @Mixin annotation.  Only methods within a class 
+         Mixins are created using the @Mixin annotation.  Only methods within a class
          annotated with
          <literal>@Aspect</literal> or
          <literal>@InterceptorDef</literal>
@@ -611,27 +611,27 @@
       String typeExpression() default "";
       Class[] interfaces();
       boolean isTransient() default true;
-   }            
+   }
          </programlisting>
          The parameters of
          <literal>@Mixin</literal> are:
 
          <itemizedlist>
             <listitem>
-               <literal>target</literal>, the name of the class we want to introduce 
+               <literal>target</literal>, the name of the class we want to introduce
                an interface to.
             </listitem>
             <listitem>
-               <literal>typeExpression</literal>, a type expression that should resolve 
+               <literal>typeExpression</literal>, a type expression that should resolve
                to one or more classes we want to introduce an interface to.
             </listitem>
             <listitem>
-               <literal>interfaces</literal>, an array of the interfaces we want to introduce, 
+               <literal>interfaces</literal>, an array of the interfaces we want to introduce,
                implemented by the mixin class.
             </listitem>
             <listitem>
-               <literal>isTransient</literal>. Internally AOP makes the main class keep a 
-               reference to the mixin class, and this sets if that reference should be 
+               <literal>isTransient</literal>. Internally AOP makes the main class keep a
+               reference to the mixin class, and this sets if that reference should be
                transient or not. The default is true.
             </listitem>
          </itemizedlist>
@@ -641,13 +641,13 @@
       </para>
       <para>
          An example aspect using
-         <literal>@Mixin</literal> in JDK 1.5:
+         <literal>@Mixin</literal> in JDK 5:
          <programlisting>
    package com.mypackage;
-   
+
    import org.jboss.aop.Mixin;
    import com.mypackage.POJO;
-   
+
    @Aspect (scope=org.jboss.aop.advice.Scope.PER_VM)
    public class IntroductionAspect
    {
@@ -660,19 +660,19 @@
          Here's the JDK 1.4.2 version:
          <programlisting>
    package com.mypackage;
-   
+
    import org.jboss.aop.Mixin;
    import com.mypackage.POJO;
 
    /**
     * @@org.jboss.aop.Aspect (scope=org.jboss.aop.advice.Scope.PER_VM)
-    */   
+    */
    public class IntroductionAspect
    {
       /**
        * @org.jboss.aop.Mixin (target=com.mypackage.POJO.class, \
              interfaces={java.io.Externalizable.class})
-       */   
+       */
       public static ExternalizableMixin createExternalizableMixin(POJO pojo) {
           return new ExternalizableMixin(pojo);
       }
@@ -687,7 +687,7 @@
       </para>
       <programlisting>
    package com.mypackage;
-   
+
    public class POJO
    {
       String stuff;
@@ -695,7 +695,7 @@
       </programlisting>
       <programlisting>
    package com.mypackage;
-   
+
    import java.io.Externalizable;
    import java.io.IOException;
    import java.io.ObjectInput;
@@ -704,17 +704,17 @@
    public class ExternalizableMixin implements Externalizable
    {
       POJO pojo;
-      
+
       public ExternalizableMixin(POJO pojo)
       {
          this.pojo = pojo;
       }
-   
+
       public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
       {
-         pojo.stuff = in.readUTF();  
+         pojo.stuff = in.readUTF();
       }
-      
+
       public void writeExternal(ObjectOutput out) throws IOException
       {
          out.writeUTF(pojo.stuff);
@@ -743,7 +743,7 @@
    <sect1 id="annotated-prepare" revision="1">
       <title>@Prepare</title>
       <para>
-         To prepare a joinpoint or a set of joinpoints for DynamicAOP annotate a field 
+         To prepare a joinpoint or a set of joinpoints for DynamicAOP annotate a field
          with
          <literal>@Prepare</literal> in a class anotated with
          <literal>@Aspect</literal>
@@ -755,7 +755,7 @@
          <literal>org.jboss.aop.Prepare</literal> is:
          <programlisting>
    package org.jboss.aop;
-   
+
    @Target({ElementType.FIELD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
          public @interface Prepare {
        String value() default "";
@@ -767,19 +767,19 @@
       </para>
       <para>
          To use
-         <literal>@Prepare</literal> in JDK 1.5:
+         <literal>@Prepare</literal> in JDK 5:
          <programlisting>
    package com.mypackage;
 
    import org.jboss.aop.Prepare;
-   
+
    @InterceptorDef (scope = Scope.PER_VM)
    @Bind (pointcut="execution("* com.blah.Test->test(..)")
    public class MyInterceptor2 implements Interceptor
    {
       @Prepare ("all(com.blah.DynamicPOJO)")
       public static Pointcut dynamicPOJO;
-   
+
       public Object invoke(Invocation invocation)throws Throwable
       {
          return invocation.invokeNext();
@@ -790,7 +790,7 @@
          And in JDK 1.4.2:
          <programlisting>
    package com.mypackage;
-   
+
    /**
     * @@org.jboss.aop.InterceptorDef (scope = org.jboss.aop.advice.Scope.PER_VM)
     * @@org.jboss.aop.Bind (pointcut="execution("* com.blah.Test->test(..)")
@@ -839,21 +839,21 @@
         <para>
            You can also annotate a POJO with @Prepare directly in cases where
            you are using Dynamic AOP, and the exact bindings are not known at
-           instrumentation time. In this case you annotate the class itself. 
-           Here's how it is done in JDK 1.5:
+           instrumentation time. In this case you annotate the class itself.
+           Here's how it is done in JDK 5:
            <programlisting>
    package com.mypackage;
 
    import org.jboss.aop.Prepare;
-   
+
    @Prepare ("all(this)")
    public class MyDynamicPOJO implements Interceptor
    {
       ...
    }
            </programlisting>
-           <literal>all(this)</literal> means the same as 
-           <literal>all(com.blah.MyDynamicPOJO)</literal>, but the use of 
+           <literal>all(this)</literal> means the same as
+           <literal>all(com.blah.MyDynamicPOJO)</literal>, but the use of
            <literal>all(this)</literal> is recommended.
         </para>
         <para>
@@ -862,7 +862,7 @@
    package com.mypackage;
 
    import org.jboss.aop.Prepare;
-   
+
    /**
     * @@org.jboss.aop.Prepare ("all(this)")
     */
@@ -880,8 +880,8 @@
         </para>
      </sect2>
      <para>
-        To summarise, when using @Prepare within an @Interceptor or @Aspect 
-        annotated class, you annotate a field within that class. When using 
+        To summarise, when using @Prepare within an @Interceptor or @Aspect
+        annotated class, you annotate a field within that class. When using
         @Prepare with a POJO you annotate the class itself.
      </para>
    </sect1>
@@ -915,7 +915,7 @@
          <programlisting>&lt;name of @Aspect/@InterceptorDef annotated class&gt;.&lt;name of @TypeDef annotated field&gt;</programlisting>
       </para>
       <para>
-         Here's how to use it with JDK 1.5:
+         Here's how to use it with JDK 5:
          <programlisting>
    package com.mypackage;
 
@@ -926,8 +926,8 @@
    {
       @TypeDef ("class(com.blah.POJO)")
       public static Typedef myTypedef;
-   
-       @Bind (pointcut="execution(* \ 
+
+       @Bind (pointcut="execution(* \
              $typedef{com.mypackage.TypedefAspect.myTypedef}->methodWithTypedef())")
        public Object typedefAdvice(Invocation invocation) throws Throwable
       {
@@ -943,7 +943,7 @@
 
    import org.jboss.aop.TypeDef;
    import org.jboss.aop.pointcut.Typedef;
-   
+
    /**
     * @@org.jboss.aop.Aspect (scope=org.jboss.aop.advice.Scope.PER_VM)
     */
@@ -953,7 +953,7 @@
        * @@org.jboss.aop.TypeDef ("class(com.blah.POJO)")
        */
       public static Typedef myTypedef;
-   
+
       /**
        * @@org.jboss.aop.Bind (pointcut="execution(* \
           $typedef{com.mypackage.TypedefAspect.myTypedef}->methodWithTypedef())")
@@ -996,18 +996,18 @@
          <literal>org.jboss.aop.CFlowStackDef</literal> is:
          <programlisting>
    package org.jboss.aop;
-   
+
    @Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
          public @interface CFlowStackDef
    {
       CFlowDef[] cflows();
    }
          </programlisting>
-         In turn the declaration of 
+         In turn the declaration of
          <literal>org.jboss.aop.CFlowDef</literal> is:
          <programlisting>
    package org.jboss.aop;
-   
+
    public @interface CFlowDef {
        boolean called();
        String expr();
@@ -1017,7 +1017,7 @@
          <literal>@CFlowDef</literal> are:
          <itemizedlist>
             <listitem>
-               <literal>called</literal>, whether the corresponding expr should appear 
+               <literal>called</literal>, whether the corresponding expr should appear
                in the stack trace or not.
             </listitem>
             <listitem>
@@ -1028,52 +1028,52 @@
          <programlisting>&lt;name of @Aspect/@InterceptorDef annotated class&gt;.&lt;name of @CFlowStackDef annotated field&gt;</programlisting>
       </para>
       <para>
-         CFlowStackDef is used like this in JDK 1.5:
+         CFlowStackDef is used like this in JDK 5:
          <programlisting>
    package com.mypackage;
 
-   import org.jboss.aop.CFlowStackDef;   
-   import org.jboss.aop.pointcut.CFlowStack;   
+   import org.jboss.aop.CFlowStackDef;
+   import org.jboss.aop.pointcut.CFlowStack;
 
    @Aspect (scope=org.jboss.aop.advice.Scope.PER_VM)
    public class CFlowAspect
    {
-   
+
       @CFlowStackDef (cflows={@CFlowDef(expr= "void com.blah.POJO->cflowMethod1()", \
             called=false),  @CFlowDef(expr = "void com.blah.POJO->cflowMethod2()", \
             called=true)})
       public static CFlowStack cfNot1And2Stack;
-   
-      @Bind (pointcut="execution(void com.blah.POJO*->privMethod())", \ 
+
+      @Bind (pointcut="execution(void com.blah.POJO*->privMethod())", \
             cflow="com.mypackage.CFlowAspect.cfNot1And2Stack")
       public Object cflowAdvice(Invocation invocation) throws Throwable
       {
          return invocation.invokeNext();
       }
-   }     
+   }
          </programlisting>
       </para>
       <para>
          And in 1.4.2:
          <programlisting>
-            
+
    package com.mypackage;
 
-   import org.jboss.aop.pointcut.CFlowStack;   
+   import org.jboss.aop.pointcut.CFlowStack;
    /**
     * @@org.jboss.aop.Aspect (scope=org.jboss.aop.advice.Scope.PER_VM)
     */
    public class CFlowAspect
    {
-      
+
       /**
        * @@org.jboss.aop.CFlowStackDef (cflows={@org.jboss.aop.CFlowDef \
           (expr= "void com.blah.POJO->cflowMethod1()", called=false),  \
-          @org.jboss.aop.CFlowDef (expr = "void com.blah.POJO->cflowMethod2()", \ 
+          @org.jboss.aop.CFlowDef (expr = "void com.blah.POJO->cflowMethod2()", \
           called=true)})
        */
       public static CFlowStack cfNot1And2Stack;
-   
+
       /**
        * @@org.jboss.aop.Bind (pointcut="execution(void com.blah.POJO*->privMethod())", \
              cflow="com.mypackage.CFlowAspect.cfNot1And2Stack")
@@ -1082,7 +1082,7 @@
       {
          return invocation.invokeNext();
       }
-   }     
+   }
          </programlisting>
       </para>
       <para>
@@ -1109,7 +1109,7 @@
          <literal>@org.jboss.aop.DynamicCFlowDef</literal> is:
          <programlisting>
    package org.jboss.aop;
-   
+
    @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
    public @interface DynamicCFlowDef
    {
@@ -1117,18 +1117,18 @@
          </programlisting>
       </para>
       <para>
-         Here is a @DynamicCFlow annotated class in JDK 1.5:
+         Here is a @DynamicCFlow annotated class in JDK 5:
          <programlisting>
    package com.mypackage;
-   
+
    import org.jboss.aop.DynamicCFlowDef;
    import org.jboss.aop.pointcut.DynamicCFlow;
-   
+
    @DynamicCFlowDef
    public class MyDynamicCFlow implements DynamicCFlow
    {
       public static boolean execute = false;
-   
+
       public boolean shouldExecute(Invocation invocation)
       {
          return execute;
@@ -1140,16 +1140,16 @@
          And the same in JDK 1.4.2:
          <programlisting>
    package com.mypackage;
-   
+
    import org.jboss.aop.pointcut.DynamicCFlow;
-   
-   /**   
+
+   /**
     * @org.jboss.aop.DynamicCFlowDef
     */
    public class MyDynamicCFlow implements DynamicCFlow
    {
       public static boolean execute = false;
-   
+
       public boolean shouldExecute(Invocation invocation)
       {
          return execute;
@@ -1161,7 +1161,7 @@
          the name of the cflow for references.
       </para>
       <para>
-         To use the dynamic cflow we just defined in JDK 1.5:
+         To use the dynamic cflow we just defined in JDK 5:
          <programlisting>
    package com.mypackage;
 
@@ -1174,14 +1174,14 @@
       {
          return invocation.invokeNext();
       }
-   }     
+   }
          </programlisting>
       </para>
       <para>
-         To use the dynamic cflow we just defined in JDK 1.5:
+         To use the dynamic cflow we just defined in JDK 5:
          <programlisting>
    package com.mypackage;
-   
+
    /**
     * @@org.jboss.aop.Aspect (scope=org.jboss.aop.advice.Scope.PER_VM)
     */
@@ -1195,7 +1195,7 @@
       {
          return invocation.invokeNext();
       }
-   }     
+   }
          </programlisting>
       </para>
    </sect1>
@@ -1212,7 +1212,7 @@
          <literal>org.jboss.aop.AnnotationIntroductionDef</literal> is:
          <programlisting>
    package org.jboss.aop;
-   
+
    @Target (ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME)
          public @interface AnnotationIntroductionDef
    {
@@ -1225,7 +1225,7 @@
          <literal>@AnnotationIntroductionDef</literal> are:
          <itemizedlist>
             <listitem>
-               <literal>expr</literal>, pointcut matching the classes/constructors/methods/fields 
+               <literal>expr</literal>, pointcut matching the classes/constructors/methods/fields
                we want to annotate.
             </listitem>
             <listitem>
@@ -1254,13 +1254,13 @@
       </para>
       <para>
          The use of
-         <literal>@AnnotationIntroductionDef</literal> in JDK 1.5:
+         <literal>@AnnotationIntroductionDef</literal> in JDK 5:
          <programlisting>
    package com.mypackage;
-   
+
    import org.jboss.aop.AnnotationIntroductionDef:
    import org.jboss.aop.introduction.AnnotationIntroduction;
-   
+
    @.InterceptorDef (scope=org.jboss.aop.advice.Scope.PER_VM)
    @org.jboss.aop.Bind (pointcut="all(com.blah.SomePOJO)")
    public class IntroducedAnnotationInterceptor implements Interceptor
@@ -1271,12 +1271,12 @@
              annotation="@com.mypackage.MyAnnotation \
                 (string='hello', integer=5, bool=true)")
       public static AnnotationIntroduction annotationIntroduction;
-      
+
       public String getName()
       {
          return "IntroducedAnnotationInterceptor";
       }
-   
+
       public Object invoke(Invocation invocation) throws Throwable
       {
          return invocation.invokeNext();
@@ -1292,9 +1292,9 @@
          <literal>@AnnotationIntroductionDef</literal> in JDK 1.4.2:
          <programlisting>
    package com.mypackage;
-   
+
    import org.jboss.aop.introduction.AnnotationIntroduction;
-   
+
    /**
     * @@org.jboss.aop.InterceptorDef (scope=org.jboss.aop.advice.Scope.PER_VM)
     * @@org.jboss.aop.Bind (pointcut="all(com.blah.SomePOJO)")
@@ -1309,12 +1309,12 @@
              (string='hello', integer=5, bool=true)")
        */
       public static AnnotationIntroduction annotationIntroduction;
-      
+
       public String getName()
       {
          return "IntroducedAnnotationInterceptor";
       }
-   
+
       public Object invoke(Invocation invocation) throws Throwable
       {
          return invocation.invokeNext();
@@ -1327,7 +1327,7 @@
          The previous listings are the same as this XML configuration:
          <programlisting>
             &lt;annotation-introduction
-      expr="method(* com.blah.SomePOJO->annotationIntroductionMethod()) 
+      expr="method(* com.blah.SomePOJO->annotationIntroductionMethod())
       invisible="false"
             &gt;
       @com.mypackage.MyAnnotation (string="hello", integer=5, bool=true)
@@ -1338,16 +1338,16 @@
 
    <sect1 id="annotated-precedence" revision="1">
       <title>@Precedence</title>
-      <para>You can declare precedence by annotating a class with <literal>@Precedence</literal>, and then annotate 
-      fields where the types are the various Interfaces/Aspects you want to sort. You annotate fields where the 
+      <para>You can declare precedence by annotating a class with <literal>@Precedence</literal>, and then annotate
+      fields where the types are the various Interfaces/Aspects you want to sort. You annotate fields where the
       type is an interceptor with <literal>@PrecedenceInterceptor</literal>. When the type is an
       aspect class, you annotate the field with <literal>@PrecedenceAdvice</literal>. The definitions
-      of org.jboss.aop.Precedence, org.jboss.aop.PrecedenceInterceptor and 
+      of org.jboss.aop.Precedence, org.jboss.aop.PrecedenceInterceptor and
       org.jboss.aop.PrecedenceAdvice are
       </para>
       <programlisting>
    package org.jboss.aop;
-   
+
    @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
    public @interface Precedence
    {
@@ -1355,11 +1355,11 @@
       </programlisting>
       <programlisting>
    package org.jboss.aop;
-   
+
    @Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
    public @interface PrecedenceInterceptor
    {
-   }      
+   }
       </programlisting>
       <programlisting>
    package org.jboss.aop;
@@ -1375,14 +1375,14 @@
          advice method to use.
       </para>
       <para>
-         The example shown below declares a relative sort order where <literal>org.acme.Interceptor</literal> 
+         The example shown below declares a relative sort order where <literal>org.acme.Interceptor</literal>
          must always be invoked before <literal>org.acme.Aspect.advice1()</literal> which must be invoked before
-         <literal>org.acme.Aspect.advice2()</literal>. Here is the JDK 1.5 version:
+         <literal>org.acme.Aspect.advice2()</literal>. Here is the JDK 5 version:
       </para>
       <programlisting>
    import org.jboss.aop.Precedence;
    import org.jboss.aop.PrecedenceAdvice;
-         
+
    @Precedence
    public class MyPrecedence
    {
@@ -1394,7 +1394,7 @@
 
       @PrecedenceAdvice ("advice2")
       org.acme.Aspect precAdvice2;
-   }         
+   }
       </programlisting>
       <para>
          And the JDK 1.4 version:
@@ -1419,7 +1419,7 @@
        * @@org.jboss.aop.PrecedenceAdvice ("advice2")
        */
       org.acme.Aspect precAdvice2;
-   }         
+   }
       </programlisting>
       <para>
          The ordering of interceptors/advices defined via annotations that have no precedence defined, is arbitrary.
@@ -1429,10 +1429,10 @@
    <sect1 id="annotated-declare" revision="1">
       <title>@DeclareError and @DeclareWarning</title>
       <para>
-         You can declare checks to be enforced at instrumentation time. They take a pointcut and a message. 
+         You can declare checks to be enforced at instrumentation time. They take a pointcut and a message.
          If the pointcut is matched, the message is printed out. To use this with annotations, annotate fields
          with <literal>DeclareWarning</literal> or <literal>DeclareError</literal> within a class annotated with
-         <literal>@Aspect</literal> or <literal>@InterceptorDef</literal>. The definitions of 
+         <literal>@Aspect</literal> or <literal>@InterceptorDef</literal>. The definitions of
          <literal>org.jboss.aop.DeclareError</literal> and <literal>org.jboss.aop.DeclareWarning</literal> are:
       </para>
       <programlisting>
@@ -1445,10 +1445,10 @@
       String msg();
    }
       </programlisting>
-      
+
       <programlisting>
    package org.jboss.aop;
-   
+
    @Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
    public @interface DeclareError
    {
@@ -1458,17 +1458,17 @@
       </programlisting>
       <para>
          For both: the expr() attribute is a pointcut expression that should not occur, and the msg() attribute is
-         the message to print out if a match is found for the pointcut. If you use 
-         <literal>DeclareWarning</literal> instrumentation/your application will simply continue having printed the 
+         the message to print out if a match is found for the pointcut. If you use
+         <literal>DeclareWarning</literal> instrumentation/your application will simply continue having printed the
          message you supplied. In the case of <literal>DeclareError</literal>, the message is logged and an error is
-         thrown, causing instrumentation/your application to stop. Here is an example in JDK 1.5
+         thrown, causing instrumentation/your application to stop. Here is an example in JDK 5
       </para>
       <programlisting>
    import org.jboss.aop.Aspect;
    import org.jboss.aop.pointcut.Pointcut;
    import org.jboss.aop.DeclareError;
    import org.jboss.aop.DeclareWarning;
-   
+
    @Aspect (scope=org.jboss.aop.advice.Scope.PER_VM)
    public class DeclareAspect
    {
@@ -1476,19 +1476,19 @@
          !has(public void *->save())", \
          msg="All VehicleDAO subclasses must override the save() method.")
       Pointcut warning;
-   
+
       @DeclareError (expr="call(* org.acme.businesslayer.*->*(..)) \
          AND within(org.acme.datalayer.*)", \
          msg="Data layer classes should not call up to the business layer")
       Pointcut error;
-   }         
+   }
       </programlisting>
       <para>
          And in JDK 1.4:
       </para>
       <programlisting>
    import org.jboss.aop.pointcut.Pointcut;
-   
+
    /**
     * @@org.jboss.aop.Aspect (scope=org.jboss.aop.advice.Scope.PER_VM)
     */
@@ -1500,18 +1500,18 @@
           msg="All VehicleDAO subclasses must override the save() method.")
        */
       Pointcut warning;
-   
+
       /**
        * @@org.jboss.aop.DeclareError (expr="call(* org.acme.businesslayer.*->*(..)) \
           AND within(org.acme.datalayer.*)", \
           msg="Data layer classes should not call up to the business layer")
        */
       Pointcut error;
-   }         
+   }
       </programlisting>
    </sect1>
-      
 
+
 </chapter>
 
 

Modified: projects/aop/trunk/aop/docs/reference/reference/en/modules/annotationcompiler.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/reference/en/modules/annotationcompiler.xml	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/reference/reference/en/modules/annotationcompiler.xml	2007-05-08 17:50:43 UTC (rev 62883)
@@ -4,47 +4,47 @@
       <title>Annotations with JDK 1.4.2</title>
 
       <para>
-         Annotations are only available in JDK 1.5, but using our annotation compiler
+         Annotations are only available in JDK 5, but using our annotation compiler
          you can acheive similar functionality with JDK 1.4.2.
       </para>
 
       <para>
-         Annotations must map to an annotation type, in JDK 1.5 they are defined as:
+         Annotations must map to an annotation type, in JDK 5 they are defined as:
 
          <programlisting>
    package com.mypackage;
-   
+
    public @interface MyAnnotation
    {
       String myString();
       int myInteger();
-   }            
+   }
          </programlisting>
-         
-         Annotation types for use with the annotation compiler are defined in exactly 
+
+         Annotation types for use with the annotation compiler are defined in exactly
          the same way for JDK 1.4.2, with the important difference that '@interface'
-         is replaced by 'interface'. i.e. the simulater annotation type is a normal 
+         is replaced by 'interface'. i.e. the simulater annotation type is a normal
          Java interface:
          <programlisting>
    package com.mypackage;
-   
+
    public interface MyAnnotation
    {
       String myString();
       int myInteger();
-   }            
+   }
          </programlisting>
       </para>
 
       <para>
-         The syntax for using annotations in JDK 1.4.2 is almost exactly the same as 
-         JDK 1.5 annotations except for these subtle differences:
+         The syntax for using annotations in JDK 1.4.2 is almost exactly the same as
+         JDK 5 annotations except for these subtle differences:
          <itemizedlist>
             <listitem>they are embedded as doclet tags</listitem>
             <listitem>You use a double at sign, i.e. '@@'</listitem>
             <listitem>
-               You MUST have a space after the tag name otherwise you will get 
-               a compilation error. (This is the quirkiness of the QDox doclet compiler 
+               You MUST have a space after the tag name otherwise you will get
+               a compilation error. (This is the quirkiness of the QDox doclet compiler
                used to compile the annotations.')
             </listitem>
             <listitem>
@@ -63,7 +63,7 @@
          This example shows an annotated class in JDK 1.4.2:
          <programlisting>
    package com.mypackage;
-   
+
    /**
     * @@com.mypackage.MyAnnotation (myString="class", myInteger=5)
     */
@@ -73,21 +73,21 @@
        * @@com.mypackage.MyAnnotation (myString="field", myInteger=4)
        */
       private String myField;
-      
+
       /**
        * @@com.mypackage.MyAnnotation (myString="constructor", myInteger=3)
        */
       public MyClass()
       {
       }
-      
+
       /**
        * @@com.mypackage.MyAnnotation (myString="method", myInteger=3)
        */
       public int myMethod()
       {
       }
-   }            
+   }
          </programlisting>
       </para>
 
@@ -95,72 +95,72 @@
    <sect1 id="annotationcompiler-enums" revision="1">
       <title>Enums in JDK 1.4.2</title>
       <para>
-         Another JDK 1.5 feature that JBoss AOP helps introduce to JBoss 1.4.2 are Enums.
+         Another JDK 5 feature that JBoss AOP helps introduce to JBoss 1.4.2 are Enums.
          As an example we can look at the
          <literal>org.jboss.aop.advice.Scope</literal>
          enum that is used for the
          <literal>@Aspect</literal> annotation. Here is the
-         JDK 1.5 version.
+         JDK 5 version.
          <programlisting>
             package org.jboss.aop.advice;
-            
+
             public enum Scope
             {
                PER_VM, PER_CLASS, PER_INSTANCE, PER_JOINPOINT
-            }         
+            }
          </programlisting>
-         
-         And it's usage in JDK 1.5
+
+         And it's usage in JDK 5
          <programlisting>
    package com.mypackage;
 
    @Aspect (scope=org.jboss.aop.advice.Scope.PER_VM)
    public class SomeAspect
    {
-   }     
+   }
          </programlisting>
          The usage in JDK 1.4.2 is similar:
          <programlisting>
    package com.mypackage;
-   
+
    /**
     * @@org.jboss.aop.Aspect (scope=org.jboss.aop.advice.Scope.PER_VM)
     */
    public class SomeAspect
    {
       //...
-   }     
+   }
          </programlisting>
          However the declaration of the enumeration is different in 1.4.2:
          <programlisting>
    package org.jboss.aop.advice;
-   
+
    import java.io.ObjectStreamException;
-   
+
    public class Scope extends org.jboss.lang.Enum
    {
       private Scope(String name, int v)
       {
          super(name, v);
       }
-   
+
       public static final Scope PER_VM = new Scope("PER_VM", 0);
       public static final Scope PER_CLASS = new Scope("PER_CLASS", 1);
       public static final Scope PER_INSTANCE = new Scope("PER_INSTANCE", 2);
       public static final Scope PER_JOINPOINT = new Scope("PER_JOINPOINT", 3);
-      
+
       private static final Scope[] values = {PER_VM, PER_CLASS, PER_INSTANCE, PER_JOINPOINT};
-   
+
       Object readResolve() throws ObjectStreamException
       {
          return values[ordinal];
       }
-   
+
    }
          </programlisting>
       </para>
       <para>
-         To create your own enum class for use within annotations, you need to inherit 
+         To create your own enum class for use within annotations, you need to inherit
          from
          <literal>org.jboss.lang.Enum</literal>. Each enum has two values, a
          String name, and an integer ordinal. The value used for the ordinal must
@@ -171,13 +171,13 @@
    <sect1 id="annotationcompiler-nestedannotations" revision="1">
       <title>Using Annotations within Annotations</title>
       <para>
-         The annotation compiler allows you to use annotations within annotations. This 
-         is best illustrated with an example. The definitions of the annotation 
+         The annotation compiler allows you to use annotations within annotations. This
+         is best illustrated with an example. The definitions of the annotation
          interfaces in JDK 1.4.2:
 
          <programlisting>
             com.mypackage;
-            
+
             public interface Outer
             {
                Inner[] values();
@@ -186,7 +186,7 @@
 
          <programlisting>
             com.mypackage;
-            
+
             public interface Inner
             {
                String str();
@@ -198,9 +198,9 @@
          The annotations can be applied as follows
          <programlisting>
             com.mypackage;
-            
+
             /**
-             * @@com.mypackage.Outer ({@@com.mypackage.Inner (str="x", integer=1), \ 
+             * @@com.mypackage.Outer ({@@com.mypackage.Inner (str="x", integer=1), \
                    @@com.mypackage.Inner (str="y", integer=2)})
              */
             public class Test
@@ -216,14 +216,14 @@
    <sect1 id="annotationcompiler-compiler" revision="1">
       <title>Using the Annotation Compiler</title>
       <para>
-         In order to use the JDK 1.4.2 annotations you have to precompile your 
+         In order to use the JDK 1.4.2 annotations you have to precompile your
          files with an annotation compiler.
       </para>
 
       <para>
          To use the annotation compiler you can create a simple ant build.xml file
 
-         <programlisting><![CDATA[         
+         <programlisting><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project default="run" name="JBoss/AOP">
@@ -265,7 +265,7 @@
          Define the ant task that does the annnotation compilation
          <programlisting><![CDATA[
       <taskdef
-         name="annotationc" 
+         name="annotationc"
          classname="org.jboss.aop.ant.AnnotationC"
          classpathref="jboss.aop.classpath"/>
    </target>
@@ -306,8 +306,8 @@
                name of a predefined ant path.
             </listitem>
             <listitem>
-               <literal>bytecode</literal> - The default is false. If true the annotation compiler 
-               instruments (i.e. modifies) the class files with the annotations. In this case, 
+               <literal>bytecode</literal> - The default is false. If true the annotation compiler
+               instruments (i.e. modifies) the class files with the annotations. In this case,
                the classes must be precompiled with javac and
                <literal>classpath</literal> or
                <literal>classpathref</literal> must be specified.
@@ -335,7 +335,7 @@
                <literal>metadata-aop.xml</literal>
             </listitem>
             <listitem>
-               <literal>verbose</literal> - Default is false. If true, verbose output 
+               <literal>verbose</literal> - Default is false. If true, verbose output
                is generated, which comes in handy for diagnosing unexpected results.
             </listitem>
          </itemizedlist>
@@ -347,8 +347,8 @@
          You can also run
          <literal>org.jboss.aop.ant.AnnotationC</literal> from the command line, you need
          <programlisting>
-   $ java -cp &lt;all the JBoss AOP jars and the directory containing files we want to AOP&gt; \ 
-         org.jboss.aop.annotation.compiler.AnnotationCompiler \ 
+   $ java -cp &lt;all the JBoss AOP jars and the directory containing files we want to AOP&gt; \
+         org.jboss.aop.annotation.compiler.AnnotationCompiler \
          [-xml [-o outputfile ]] [-bytecode]&lt;files&gt;+
          </programlisting>
       </para>

Modified: projects/aop/trunk/aop/docs/reference/reference/en/modules/compiling.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/reference/en/modules/compiling.xml	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/reference/reference/en/modules/compiling.xml	2007-05-08 17:50:43 UTC (rev 62883)
@@ -7,18 +7,18 @@
       <para>
          JBoss AOP works by instrumenting the classes you want to run. This means
          that modifications to the bytecode are made in order to add extra information
-         to the classes to hook into the AOP library.  JBoss AOP allows for two types 
+         to the classes to hook into the AOP library.  JBoss AOP allows for two types
          of instrumentation
          <itemizedlist>
             <listitem>
-               Precompiled - The classes are instrumented in a separate aop compilation 
+               Precompiled - The classes are instrumented in a separate aop compilation
                step before they are run.
             </listitem>
             <listitem>
                Loadtime - The classes are instrumented when they are first loaded.
             </listitem>
          </itemizedlist>
-         This chapter describes the steps you need to take to precompile your classes 
+         This chapter describes the steps you need to take to precompile your classes
          with the aop precompiler.
       </para>
    </sect1>
@@ -87,7 +87,7 @@
          JDK 5.0 if your classes do not use JDK 5.0 style annotations and enums:
          <programlisting><![CDATA[
       <!--                  JDK version 1.4.2                         -->
-      <!-- Do not include this if using JDK 1.5 with annotations!!!!  -->
+      <!-- Do not include this if using JDK 5 with annotations!!!!  -->
 
       <path id="jboss.aop.classpath">
          <pathelement path="../../../jboss-aop.jar"/>
@@ -230,9 +230,9 @@
                XML deployment descriptors.
                <para/>
                Report generation works on the instrumented classes, so to get valid data in your
-               report, you have to to make two passes with <literal>aopc</literal>. First 
-               you run <literal>aopc</literal> with <literal>report="false"</literal> to 
-               instrument the classes, and then you run <literal>aopc</literal> with 
+               report, you have to to make two passes with <literal>aopc</literal>. First
+               you run <literal>aopc</literal> with <literal>report="false"</literal> to
+               instrument the classes, and then you run <literal>aopc</literal> with
                <literal>report="true"</literal> to generate the report.
          </listitem>
          <listitem>
@@ -274,14 +274,14 @@
             </programlisting>
          </listitem>
          <listitem>
-            <literal>maxsrc</literal> - The ant task expands any directories in 
+            <literal>maxsrc</literal> - The ant task expands any directories in
                <literal>src</literal> to list all class files, when creating the parameters
                for the java command that actually performs the compilation. On some operating
-               systems there is a limit to the length of vaid command lines. The default value 
+               systems there is a limit to the length of vaid command lines. The default value
                for <literal>maxsrc</literal> is 1000. If the total length of all the files used
                is greater than <literal>maxsrc</literal>, a temporary file listing the files
-               to be transformed is used and passed in to the java command instead. If you have 
-               problems running the <literal>aopc</literal> task, try setting this value to 
+               to be transformed is used and passed in to the java command instead. If you have
+               problems running the <literal>aopc</literal> task, try setting this value to
                a value smaller than 1000.
           </listitem>
       </itemizedlist>
@@ -312,7 +312,7 @@
             JBoss AOP will browse all classes in this path to see if they are annotated.
             The property can have one or files it points to delimited by the operating
             systems specific classpath delimiter (';' on windows, ':' on unix). Note for this to
-            have effect with JDK 1.4, you first have to run the annotation compiler with 
+            have effect with JDK 1.4, you first have to run the annotation compiler with
             bytecode=true.
       </para>
       <para>
@@ -331,13 +331,13 @@
 $ aopc &lt;classpath&gt; [-aoppath ...] [-aopclasspath ...] [-report] [-verbose] \
       &lt;class files or directories&gt;+
          </programlisting>
-         And for JDK 1.5:
+         And for JDK 5:
          <programlisting>
 $ aopc15 &lt;classpath&gt; [-aoppath ...] [-aopclasspath ...] [-report] [-verbose] \
       &lt;class files or directories&gt;+
          </programlisting>
       </para>
-      <para>         
+      <para>
          <itemizedlist>
             <listitem>
                <literal>classpath</literal> - path to your classes and any jars your code depends on

Modified: projects/aop/trunk/aop/docs/reference/reference/en/modules/running.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/reference/en/modules/running.xml	2007-05-08 17:37:17 UTC (rev 62882)
+++ projects/aop/trunk/aop/docs/reference/reference/en/modules/running.xml	2007-05-08 17:50:43 UTC (rev 62883)
@@ -131,7 +131,7 @@
 $ run-precompiled classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] \
       com.blah.MyMainClass [args...]
             </programlisting>
-            For JDK 1.5:
+            For JDK 5:
             <programlisting>
 $ run-precompiled15 classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] \
       com.blah.MyMainClass [args...]
@@ -243,7 +243,7 @@
             <para>
             In the /bin folder of the distribution we have provided batch/script files to make
             this easier. It includes all the aop libs for you, so you just have to worry
-            about your files. The usage for JDK 1.5 is:
+            about your files. The usage for JDK 5 is:
                <programlisting>
 $ run-load15 classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] \
       com.blah.MyMainClass [args...]




More information about the jboss-cvs-commits mailing list