[jboss-cvs] JBossAS SVN: r79715 - in projects/aop/trunk/aop/docs/examples: after-throwing and 38 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sun Oct 19 16:21:50 EDT 2008


Author: flavia.rainone at jboss.com
Date: 2008-10-19 16:21:49 -0400 (Sun, 19 Oct 2008)
New Revision: 79715

Added:
   projects/aop/trunk/aop/docs/examples/annotation-introductions/Complex.java
   projects/aop/trunk/aop/docs/examples/annotation-introductions/Single.java
   projects/aop/trunk/aop/docs/examples/annotation-introductions/Trace.java
   projects/aop/trunk/aop/docs/examples/annotation/Billable.java
   projects/aop/trunk/aop/docs/examples/annotation/Trace.java
   projects/aop/trunk/aop/docs/examples/running_examples.html
Removed:
   projects/aop/trunk/aop/docs/examples/annotation-introductions/complex.java
   projects/aop/trunk/aop/docs/examples/annotation-introductions/single.java
   projects/aop/trunk/aop/docs/examples/annotation-introductions/trace.java
   projects/aop/trunk/aop/docs/examples/annotation/billable.java
   projects/aop/trunk/aop/docs/examples/annotation/trace.java
   projects/aop/trunk/aop/docs/examples/valid_targets_annotated.html
   projects/aop/trunk/aop/docs/examples/valid_targets_not_annotated.html
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-declare/annotated-declare.html
   projects/aop/trunk/aop/docs/examples/annotated-dynamic-cflow/annotated-dynamic-cflow.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/POJO.java
   projects/aop/trunk/aop/docs/examples/annotation-introductions/TraceInterceptor.java
   projects/aop/trunk/aop/docs/examples/annotation-introductions/annotation.html
   projects/aop/trunk/aop/docs/examples/annotation-introductions/jboss-aop.xml
   projects/aop/trunk/aop/docs/examples/annotation/POJO.java
   projects/aop/trunk/aop/docs/examples/annotation/annotation.html
   projects/aop/trunk/aop/docs/examples/annotation/jboss-aop.xml
   projects/aop/trunk/aop/docs/examples/arrayinterception/arrayinterception.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/declare/declare.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/examples.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/introductions/jboss-aop.xml
   projects/aop/trunk/aop/docs/examples/logging/logging.html
   projects/aop/trunk/aop/docs/examples/metadata/BillingInterceptor.java
   projects/aop/trunk/aop/docs/examples/metadata/jboss-aop.xml
   projects/aop/trunk/aop/docs/examples/metadata/metadata-aop.xml
   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
Log:
[JBAOP-668] Removed jdk50 references from all tutorial documentation.
Renamed annotation and metadata replacing lower-case names by upper-case names, following the new standard that we have seen in industry since annotation support was added to Java language.
Removed examples/valid_targets_annotation.html file.
Renamed examples/valid_targets_not_annotated.html file to examples/running_examples.html.

Modified: projects/aop/trunk/aop/docs/examples/after-throwing/after-throwing.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/after-throwing/after-throwing.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/after-throwing/after-throwing.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -81,14 +81,13 @@
 
 </p><p>
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] Calling POJO-&gt;throwExceptionMethod()
      [java] ====================================
      [java] RUNNING POJO-&gt;throwsExceptionMethod("argument")

Modified: projects/aop/trunk/aop/docs/examples/all/all.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/all/all.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/all/all.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -19,14 +19,13 @@
 <h4>Running</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- new POJO(); ---
      [java] &lt;&lt;&lt; Entering SimpleInterceptor type: org.jboss.aop.joinpoint.ConstructorInvocation
      [java] empty constructor

Modified: projects/aop/trunk/aop/docs/examples/annotated-aspects/annotated-aspects.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-aspects/annotated-aspects.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotated-aspects/annotated-aspects.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -65,14 +65,13 @@
 <h4>Running</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
 
     [java] --- pojo constructor ---
     [java] &lt;&lt;&lt; MyAdvice.constructorAdvice accessing: public POJO()

Modified: projects/aop/trunk/aop/docs/examples/annotated-cflow/annotated-cflow.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-cflow/annotated-cflow.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotated-cflow/annotated-cflow.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -55,14 +55,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
 
      [java] --- pojo.method4(); ---
      [java] method4

Modified: projects/aop/trunk/aop/docs/examples/annotated-composition/annotated-composition.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-composition/annotated-composition.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotated-composition/annotated-composition.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -62,14 +62,13 @@
 <h4>Running the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- pojo constructor ---
      [java] &lt;&lt;&lt; MyAspect.anotherPOJOAdvice - calling constructor
      [java] constructor

Modified: projects/aop/trunk/aop/docs/examples/annotated-declare/annotated-declare.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-declare/annotated-declare.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotated-declare/annotated-declare.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -61,15 +61,13 @@
 
 </p><p>
 Now if you run the example:
-</p><p>
-To compile and run with JDK 5:
 <pre>
-  $ ant run.aopc.50
+  $ ant run.aopc
 </pre>
 </p><p>
-It will generate the following output
+It will generate the following output:
 <pre>
-_aopc50.annotated:
+_aopc.annotated:
      [aopc] WARNING: declare-warning condition
      [aopc]     'call(Driver->new(..)) AND within(*DAO)'
      [aopc] was broken for constructor call: CarDAO.save()V calls Driver.new()V
@@ -87,28 +85,27 @@
 
      [aopc] Build Successful: 438 ms
 
-_run.aopc.50.annotated:
+_run.aopc.annotated:
      [java] ---- Start ----
      [java] Car DAO save
 </pre>
 </p><p>
 Note that when using compile time instrumentation the warnings are generated during the aopc phase. <p>
-(To run with JDK 1.4 use $ ant run.aopc.14 as shown in the <a href="../valid_targets_annotated.html"/>annotated examples guide</a>.)
 </p>
-</p><p>
+<p>
 <h4>Run the example load-time instrumented</h4>
 
 </p><p>
-Run the example with JDK 5:
+Run the example:
 </p>
 <pre>
-  $ ant run.loadtime.50
+  $ ant run.loadtime
 </pre>
 </p><p>
 It will generate the following output
 </p>
 <pre>
-_run.loadtime.50.annotated:
+_run.loadtime.annotated:
      [java] ---- Start ----
      [java] WARNING: declare-warning condition
      [java]     'call(Driver->new(..)) AND within(*DAO)'
@@ -128,7 +125,6 @@
 
 </pre>
 Note that now the warnings are displayed when running the application, as the classes are transformed when loaded.
-(To run with JDK 1.4 use $ ant run.aopc.14 as shown in the <a href="../valid_targets_annotated.html"/>annotated examples guide</a>.)
 </p><p>
 <h3>Declaring errors</h3>
 
@@ -153,14 +149,14 @@
 </p><p>
 <h3>declare-error precompiled</h3>
 
-When running precompiled with JDK 5 we get:
+When running precompiled we get:
 <pre>
-$ ant run.aopc.50
+$ ant run.aopc
 Buildfile: build.xml
 
 ...
 
-_aopc50.annotated:
+_aopc.annotated:
      [aopc] ERROR: declare-error condition
      [aopc]     'call(Driver-&gt;new(..)) AND within(*DAO)'
      [aopc] was broken for constructor call: CarDAO.save()V calls Driver.new()V
@@ -208,16 +204,15 @@
 </pre>
 </p><p>
 See how the compiler stops at the first error and execution stops.
-(To run with JDK 1.4 use $ ant run.aopc.14 as shown in the <a href="../valid_targets_annotated.html"/>annotated examples guide</a>.)
 </p><p>
 <h3>DeclareError loadtime</h3>
 
-When running with loadtime transformations with JDK 5 we get:
+When running with loadtime transformations we get:
 <pre>
-$ ant run.loadtime.50
+$ ant run.loadtime
 ...
 
-_run.loadtime.50.annotated:
+_run.loadtime.annotated:
      [java] ---- Start ----
      [java] ERROR: declare-error condition
      [java]     'call(Driver-&gt;new(..)) AND within(*DAO)'
@@ -262,7 +257,6 @@
 
 </pre>
 Again you can see how the first broken condition causes execution to stop.
-(To run with JDK 1.4 use $ ant run.aopc.14 as shown in the <a href="../valid_targets_annotated.html"/>annotated examples guide</a>.)
 </p>
 </body>
 </html>

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	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotated-dynamic-cflow/annotated-dynamic-cflow.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -45,14 +45,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
     [java] --- pojo.method4(); ---
     [java] method1
     [java] --- turn on cflow ---

Modified: projects/aop/trunk/aop/docs/examples/annotated-interceptors/annotated-interceptors.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-interceptors/annotated-interceptors.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotated-interceptors/annotated-interceptors.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -58,14 +58,13 @@
 <h4>Running</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] &lt;&lt;&lt; Entering SimpleInterceptor for: public POJO()
      [java] constructor
      [java] &gt;&gt;&gt; Leaving SimpleInterceptor

Modified: projects/aop/trunk/aop/docs/examples/annotated-introduction/annotated-introduction.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-introduction/annotated-introduction.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotated-introduction/annotated-introduction.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -70,14 +70,13 @@
 <h4>Running the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- POJO ---
      [java] deserialized pojo.stuff: hello world
      [java] --- POJO2 ---

Modified: projects/aop/trunk/aop/docs/examples/annotated-parameters/annotated-parameters.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-parameters/annotated-parameters.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotated-parameters/annotated-parameters.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -265,14 +265,13 @@
 <h3>Run the example</h3>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] Calling POJO constructor
      [java] ========================
      [java] &gt;&gt;&gt; beforeConstructorArg: Object "Driver"

Modified: projects/aop/trunk/aop/docs/examples/annotated-precedence/annotated-precedence.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-precedence/annotated-precedence.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotated-precedence/annotated-precedence.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -85,14 +85,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- new POJO(); ---
      [java] &lt;&lt;&lt; Entering SimpleInterceptor type: POJO0OptimizedConstructorInvocation
      [java] &lt;&lt;&lt; Entering SimpleInterceptor2 type: POJO0OptimizedConstructorInvocation

Modified: projects/aop/trunk/aop/docs/examples/annotated-typedef/annotated-typedef.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-typedef/annotated-typedef.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotated-typedef/annotated-typedef.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -39,14 +39,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- new POJO(); ---
      [java] &lt;&lt;&lt; Entering SimpleInterceptor
      [java] &lt;&lt;&lt; Entering SimpleInterceptor2

Copied: projects/aop/trunk/aop/docs/examples/annotation/Billable.java (from rev 79712, projects/aop/trunk/aop/docs/examples/annotation/billable.java)
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation/Billable.java	                        (rev 0)
+++ projects/aop/trunk/aop/docs/examples/annotation/Billable.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -0,0 +1,26 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface Billable {}

Modified: projects/aop/trunk/aop/docs/examples/annotation/POJO.java
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation/POJO.java	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotation/POJO.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -21,25 +21,25 @@
 */
 public class POJO
 {
-   @trace @billable
+   @Trace @Billable
    public POJO() 
    {
       System.out.println("empty constructor");
    }
 
-   @trace
+   @Trace
    public POJO(int i)
    {
       System.out.println("int constructor");
    }
 
-   @trace @billable
+   @Trace @Billable
    public void someMethod()
    {
       System.out.println("someMethod");
    }
 
-   @trace
+   @Trace
    public int field;
 }
 

Copied: projects/aop/trunk/aop/docs/examples/annotation/Trace.java (from rev 79712, projects/aop/trunk/aop/docs/examples/annotation/trace.java)
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation/Trace.java	                        (rev 0)
+++ projects/aop/trunk/aop/docs/examples/annotation/Trace.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -0,0 +1,26 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface Trace {}

Modified: projects/aop/trunk/aop/docs/examples/annotation/annotation.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation/annotation.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotation/annotation.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -1,34 +1,26 @@
 <html>
 <body>
 <p>
-<h2>Annotations for JDK 5</h2>
+<h2>Java Annotations</h2>
 
 </p><p>
 <h3>Overview</h3>
 
-JDK 5 has a new interesting feature called annotations.  It allows you to specify xdoclet like tags right in the Java language just as you can with C#.  These tags are typesafe and access to them is available at compile time, load-time, and run-time.  See <a href="http://www.jcp.org/en/jsr/detail?id=175">JSR-175</a> for more detail.  JBossAOP since beta2 does support JDK 5 annotations
+As of version 1.5, Java language was enriched with a new interesting feature called annotations.  It allows you to specify xdoclet like tags right in the Java language just as you can with C#.  These tags are typesafe and access to them is available at compile time, load-time, and run-time.
 </p><p>
-A good way to visualize metadata is to think of classnames, method names, field names, and constructor signatures as nouns, and annotations/metadata as adjectives.  You can declare advice/interceptor bindings like:  All @Remotable objects should register with a dispatcher whenever they are constructed.  Any method marked @transactional begin/commit/rollback a transaction at the start and end of the method.  Or even any field, method, constructor marked @traceable, do tracing.  It kinda lets the application developer give hints to the aspect developer.  If you think about it another way, combining annotations and AOP allows you to plug in new Java keywords.  Kinda like C pre-processor macros on steroids.  Macros that are typesafe and checked by the compiler and unlike Major League Baseball players, it will always be legal for you to use these steroids in your applications.
+A good way to visualize annotations is to think of classnames, method names, field names, and constructor signatures as nouns, and annotations/metadata as adjectives.  You can declare advice/interceptor bindings like:  All @Remotable objects should register with a dispatcher whenever they are constructed.  Any method marked @Transactional begin/commit/rollback a transaction at the start and end of the method.  Or even any field, method, constructor marked @Traceable, do tracing.  It kinda lets the application developer give hints to the aspect developer.  If you think about it another way, combining annotations and AOP allows you to plug in new Java keywords.  Kinda like C pre-processor macros on steroids.  Macros that are typesafe and checked by the compiler and unlike Major League Baseball players, it will always be legal for you to use these steroids in your applications.
 </p><p>
 
-<a name="ann14"/>
-<h3>Annotations for JDK 1.4</h3>
-<p>Although not supported in JDK 1.4, JBoss AOP allows you a few ways to use annotations with JDK 5.
-One way is as shown in the the
-<a href="../valid_targets_annotated.html"/>annotated examples guide</a> whereby you code your classes using
-JDK 5, and transform your classes into JDK 1.4 bytecode using JBoss Retro. Another way is to use the annotation
-compiled, as shown in <a href="../annotation14/annotation.html">JDK 5 Annotations with JDK 1.4</a>.</p>
-
 <h3>Example code</h3>
 
-The example code applies 2 separate interceptors via tags supplied in a Java source file.  One of the interceptors is a tracing interceptor that is trigger by a @trace annotation, the other is B2B functionality that will bill/charge a user for each access of the api.  This is also triggered by an annotation.
+The example code applies 2 separate interceptors via tags supplied in a Java source file.  One of the interceptors is a tracing interceptor that is trigger by a @Trace annotation, the other is B2B functionality that will bill/charge a user for each access of the api.  This is also triggered by an annotation.
 </p><p>
 <h3>Declaring annotations</h3>
 
-Open up POJO.java.  This is the source file for where our annotations will be declared.
+Open up POJO.java. This is the source file for where our annotations will be declared.
 </p><p>
 <pre>
-   @trace @billable
+   @Trace @Billable
    public void someMethod()
    {
       System.out.println("someMethod");
@@ -45,41 +37,39 @@
 Annotations can be referenced by an '@' sign in pointcut expressions.  They can only be used in the class expressions for a method, field, or constructor for execution and caller pointcuts.  They can also be used in substitute for 'new' in constructor land, and for a method or field name.  Take a look at jboss-aop.xml
 </p><p>
 <pre>
-   &lt;bind pointcut="execution(POJO-&gt;@billable(..))"&gt;
+   &lt;bind pointcut="execution(POJO-&gt;@Billable(..))"&gt;
        &lt;interceptor class="BillingInterceptor"/&gt;
    &lt;/bind&gt;
 
-   &lt;bind pointcut="execution(* POJO-&gt;@billable(..))"&gt;
+   &lt;bind pointcut="execution(* POJO-&gt;@Billable(..))"&gt;
        &lt;interceptor class="BillingInterceptor"/&gt;
    &lt;/bind&gt;
 
 </pre>
 </p><p>
-The first binding above says that for every constructor tagged as @billable apply the BillingInterceptor.  The second binding states that for any method tagged as @billable apply the BillingInterceptor.  Let's now take a look at applying the tracing advice.
+The first binding above says that for every constructor tagged as @Billable apply the BillingInterceptor.  The second binding states that for any method tagged as @Billable apply the BillingInterceptor.  Let's now take a look at applying the tracing advice.
 </p><p>
 <pre>
-   &lt;bind pointcut="all(@trace)"&gt;
+   &lt;bind pointcut="all(@Trace)"&gt;
        &lt;interceptor class="TraceInterceptor"/&gt;
    &lt;/bind&gt;
 </pre>
 </p><p>
-The above states that for any field, constructor, or method tagged as @trace, apply the TraceInterceptor.
+The above states that for any field, constructor, or method tagged as @Trace, apply the TraceInterceptor.
 </p><p>
 
 
 <h3>Running</h3>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- new POJO(); ---
-     [java] populateMixinMethods*****
      [java] billing...org.jboss.aop.joinpoint.ConstructorInvocation at 1ee4648
      [java] &lt;&lt;&lt; Trace : executing constructor public POJO()
      [java] empty constructor

Deleted: projects/aop/trunk/aop/docs/examples/annotation/billable.java
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation/billable.java	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotation/billable.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -1,26 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
- at Retention(RetentionPolicy.RUNTIME)
-public @interface billable {}

Modified: projects/aop/trunk/aop/docs/examples/annotation/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation/jboss-aop.xml	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotation/jboss-aop.xml	2008-10-19 20:21:49 UTC (rev 79715)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <aop>
 
-   <bind pointcut="execution(POJO->@billable(..))">
+   <bind pointcut="execution(POJO->@Billable(..))">
        <interceptor class="BillingInterceptor"/>
    </bind>
 
-   <bind pointcut="execution(* POJO->@billable(..))">
+   <bind pointcut="execution(* POJO->@Billable(..))">
        <interceptor class="BillingInterceptor"/>
    </bind>
 
-   <bind pointcut="all(@trace)">
+   <bind pointcut="all(@Trace)">
        <interceptor class="TraceInterceptor"/>
    </bind>
 

Deleted: projects/aop/trunk/aop/docs/examples/annotation/trace.java
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation/trace.java	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotation/trace.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -1,26 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
- at Retention(RetentionPolicy.RUNTIME)
-public @interface trace {}

Copied: projects/aop/trunk/aop/docs/examples/annotation-introductions/Complex.java (from rev 79712, projects/aop/trunk/aop/docs/examples/annotation-introductions/complex.java)
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation-introductions/Complex.java	                        (rev 0)
+++ projects/aop/trunk/aop/docs/examples/annotation-introductions/Complex.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface Complex
+{
+   char ch();
+   String string();
+   float flt();
+   double dbl();
+   short shrt();
+   long lng();
+   int integer();
+   boolean bool();
+   Single annotation();
+   String[] array();
+   Class clazz();
+
+
+}

Modified: projects/aop/trunk/aop/docs/examples/annotation-introductions/POJO.java
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation-introductions/POJO.java	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotation-introductions/POJO.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -21,22 +21,22 @@
 */
 public class POJO
 {
-   @trace
-   @single ("hello world")
+   @Trace
+   @Single ("hello world")
    public POJO()
    {
       System.out.println("empty constructor");
    }
 
-   @trace
-   @single ("hello world")
+   @Trace
+   @Single ("hello world")
    public void someMethod()
    {
       System.out.println("someMethod");
    }
 
-   @trace
-   @single ("hello world")
+   @Trace
+   @Single ("hello world")
    public int field;
 }
 

Copied: projects/aop/trunk/aop/docs/examples/annotation-introductions/Single.java (from rev 79712, projects/aop/trunk/aop/docs/examples/annotation-introductions/single.java)
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation-introductions/Single.java	                        (rev 0)
+++ projects/aop/trunk/aop/docs/examples/annotation-introductions/Single.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -0,0 +1,29 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface Single
+{
+   String value();
+}

Copied: projects/aop/trunk/aop/docs/examples/annotation-introductions/Trace.java (from rev 79712, projects/aop/trunk/aop/docs/examples/annotation-introductions/trace.java)
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation-introductions/Trace.java	                        (rev 0)
+++ projects/aop/trunk/aop/docs/examples/annotation-introductions/Trace.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -0,0 +1,27 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface Trace {}

Modified: projects/aop/trunk/aop/docs/examples/annotation-introductions/TraceInterceptor.java
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation-introductions/TraceInterceptor.java	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotation-introductions/TraceInterceptor.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -36,14 +36,14 @@
 {
    public String getName() { return "TraceInterceptor"; }
 
-   private void printSingle(single s)
+   private void printSingle(Single s)
    {
-      System.out.println("@single (\"" + s.value() + "\")");
+      System.out.println("@Single (\"" + s.value() + "\")");
    }
 
-   private void printComplex(complex c)
+   private void printComplex(Complex c)
    {
-      System.out.print("@complex (ch='" + c.ch() + "', ");
+      System.out.print("@Complex (ch='" + c.ch() + "', ");
       System.out.print("\"" + c.string() + "\", ");
       System.out.print("flt=" + c.flt() + ", ");
       System.out.println("dbl=" + c.dbl() + ", ...blah blah blah YOU GET THE IDEA...");
@@ -56,33 +56,33 @@
       if (invocation instanceof MethodInvocation)
       {
          msg = "executing method " + ((MethodInvocation)invocation).getMethod().toString();
-         single s = (single)AnnotationElement.getAnyAnnotation(((MethodInvocation)invocation).getMethod(), single.class);
+         Single s = (Single)AnnotationElement.getAnyAnnotation(((MethodInvocation)invocation).getMethod(), Single.class);
          printSingle(s);
-         complex c = (complex)AnnotationElement.getAnyAnnotation(((MethodInvocation)invocation).getMethod(), complex.class);
+         Complex c = (Complex)AnnotationElement.getAnyAnnotation(((MethodInvocation)invocation).getMethod(), Complex.class);
          printComplex(c);
       }
       else if (invocation instanceof ConstructorInvocation)
       {
          msg = "executing constructor " + ((ConstructorInvocation)invocation).getConstructor();
-         single s = (single)AnnotationElement.getAnyAnnotation(((ConstructorInvocation)invocation).getConstructor(), single.class);
+         Single s = (Single)AnnotationElement.getAnyAnnotation(((ConstructorInvocation)invocation).getConstructor(), Single.class);
          printSingle(s);
-         complex c = (complex)AnnotationElement.getAnyAnnotation(((ConstructorInvocation)invocation).getConstructor(), complex.class);
+         Complex c = (Complex)AnnotationElement.getAnyAnnotation(((ConstructorInvocation)invocation).getConstructor(), Complex.class);
          printComplex(c);
       }
       else if (invocation instanceof FieldReadInvocation)
       {
          msg = "read field name: " + ((FieldReadInvocation)invocation).getField();
-         single s = (single)AnnotationElement.getAnyAnnotation(((FieldInvocation)invocation).getField(), single.class);
+         Single s = (Single)AnnotationElement.getAnyAnnotation(((FieldInvocation)invocation).getField(), Single.class);
          printSingle(s);
-         complex c = (complex)AnnotationElement.getAnyAnnotation(((FieldInvocation)invocation).getField(), complex.class);
+         Complex c = (Complex)AnnotationElement.getAnyAnnotation(((FieldInvocation)invocation).getField(), Complex.class);
          printComplex(c);
       }
       else if (invocation instanceof FieldWriteInvocation)
       {
          msg = "write field name: " + ((FieldWriteInvocation)invocation).getField();
-         single s = (single)AnnotationElement.getAnyAnnotation(((FieldInvocation)invocation).getField(), single.class);
+         Single s = (Single)AnnotationElement.getAnyAnnotation(((FieldInvocation)invocation).getField(), Single.class);
          printSingle(s);
-         complex c = (complex)AnnotationElement.getAnyAnnotation(((FieldInvocation)invocation).getField(), complex.class);
+         Complex c = (Complex)AnnotationElement.getAnyAnnotation(((FieldInvocation)invocation).getField(), Complex.class);
          printComplex(c);
       }
 

Modified: projects/aop/trunk/aop/docs/examples/annotation-introductions/annotation.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation-introductions/annotation.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotation-introductions/annotation.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -6,11 +6,11 @@
 </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 5 way, or the JDK 1.4 way.
+This is an extension of the annotation 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.
 </p><p>
 <h4>Example code</h4>
 
-The example code declares annotations via doclets within POJO.java.  single.java, trace.java, and complex.java all represent our annotation interfaces.  The TraceInterceptor traces method, field, and constructor calls on POJO and outputs the annotations tagged on those members;
+The example code declares annotations via doclets within POJO.java.  Single.java, Trace.java, and Complex.java all represent our annotation interfaces.  The TraceInterceptor traces method, field, and constructor calls on POJO and outputs the annotations tagged on those members;
 </p><p>
 <h4>Applying an Annotation Introduction</h4>
 
@@ -18,7 +18,7 @@
 jboss-aop.xml
 <pre>
    &lt;annotation-introduction expr="constructor(POJO-&gt;new())"&gt;
-      @complex (ch='a', string="hello world", flt=5.5, dbl=6.6, shrt=5, lng=6, integer=7, bool=true, annotation=@single("hello"), array={"hello", "world"}, clazz=java.lang.String)
+      @Complex (ch='a', string="hello world", flt=5.5, dbl=6.6, shrt=5, lng=6, integer=7, bool=true, annotation=@Single("hello"), array={"hello", "world"}, clazz=java.lang.String)
    &lt;/annotation-introduction&gt;
 </pre>
 </p><p>
@@ -27,29 +27,28 @@
 <h4>Running</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- new POJO(); ---
-     [java] @single ("hello world")
-     [java] @complex (ch='a', "hello world", flt=5.5, dbl=6.6, ...blah blah blah YOU GET THE IDEA...
+     [java] @Single ("hello world")
+     [java] @Complex (ch='a', "hello world", flt=5.5, dbl=6.6, ...blah blah blah YOU GET THE IDEA...
      [java] &lt;&lt;&lt; Trace : executing constructor public POJO()
      [java] empty constructor
      [java] &gt;&gt;&gt; Leaving Trace
      [java] --- pojo.someMethod(); ---
-     [java] @single ("hello world")
-     [java] @complex (ch='a', "hello world", flt=5.5, dbl=6.6, ...blah blah blah YOU GET THE IDEA...
+     [java] @Single ("hello world")
+     [java] @Complex (ch='a', "hello world", flt=5.5, dbl=6.6, ...blah blah blah YOU GET THE IDEA...
      [java] &lt;&lt;&lt; Trace : executing method public void POJO.someMethod()
      [java] someMethod
      [java] &gt;&gt;&gt; Leaving Trace
      [java] --- pojo.field = 55;  ---
-     [java] @single ("hello world")
-     [java] @complex (ch='a', "hello world", flt=5.5, dbl=6.6, ...blah blah blah YOU GET THE IDEA...
+     [java] @Single ("hello world")
+     [java] @Complex (ch='a', "hello world", flt=5.5, dbl=6.6, ...blah blah blah YOU GET THE IDEA...
      [java] &lt;&lt;&lt; Trace : write field name: public int POJO.field
      [java] &gt;&gt;&gt; Leaving Trace
 </pre>

Deleted: projects/aop/trunk/aop/docs/examples/annotation-introductions/complex.java
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation-introductions/complex.java	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotation-introductions/complex.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
- at Retention(RetentionPolicy.RUNTIME)
-public @interface complex
-{
-   char ch();
-   String string();
-   float flt();
-   double dbl();
-   short shrt();
-   long lng();
-   int integer();
-   boolean bool();
-   single annotation();
-   String[] array();
-   Class clazz();
-
-
-}

Modified: projects/aop/trunk/aop/docs/examples/annotation-introductions/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation-introductions/jboss-aop.xml	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotation-introductions/jboss-aop.xml	2008-10-19 20:21:49 UTC (rev 79715)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <aop>
 
-   <bind pointcut="all(@trace)">
+   <bind pointcut="all(@Trace)">
        <interceptor class="TraceInterceptor"/>
    </bind>
 
    <annotation-introduction expr="constructor(POJO->new())">
-      @complex (ch='a', string="hello world", flt=5.5, dbl=6.6, shrt=5, lng=6, integer=7, bool=true, annotation=@single("hello"), array={"hello", "world"}, clazz=java.lang.String)
+      @Complex (ch='a', string="hello world", flt=5.5, dbl=6.6, shrt=5, lng=6, integer=7, bool=true, annotation=@Single("hello"), array={"hello", "world"}, clazz=java.lang.String)
    </annotation-introduction>
 
    <annotation-introduction expr="method(void POJO->someMethod())">
-      @complex (ch='a', string="hello world", flt=5.5, dbl=6.6, shrt=5, lng=6, integer=7, bool=true, annotation=@single("hello"), array={"hello", "world"}, clazz=java.lang.String)
+      @Complex (ch='a', string="hello world", flt=5.5, dbl=6.6, shrt=5, lng=6, integer=7, bool=true, annotation=@Single("hello"), array={"hello", "world"}, clazz=java.lang.String)
    </annotation-introduction>
 
    <annotation-introduction expr="field(public int POJO->field)">
-      @complex (ch='a', string="hello world", flt=5.5, dbl=6.6, shrt=5, lng=6, integer=7, bool=true, annotation=@single("hello"), array={"hello", "world"}, clazz=java.lang.String)
+      @Complex (ch='a', string="hello world", flt=5.5, dbl=6.6, shrt=5, lng=6, integer=7, bool=true, annotation=@Single("hello"), array={"hello", "world"}, clazz=java.lang.String)
    </annotation-introduction>
 
 </aop>

Deleted: projects/aop/trunk/aop/docs/examples/annotation-introductions/single.java
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation-introductions/single.java	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotation-introductions/single.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -1,29 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
- at Retention(RetentionPolicy.RUNTIME)
-public @interface single
-{
-   String value();
-}

Deleted: projects/aop/trunk/aop/docs/examples/annotation-introductions/trace.java
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotation-introductions/trace.java	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/annotation-introductions/trace.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -1,27 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
- at Retention(RetentionPolicy.RUNTIME)
-public @interface trace {}

Modified: projects/aop/trunk/aop/docs/examples/arrayinterception/arrayinterception.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/arrayinterception/arrayinterception.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/arrayinterception/arrayinterception.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -28,14 +28,13 @@
 <h4>Running</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- new Woven(); ---
      [java] Initialising array
      [java] --- woven.setInt(0, 100); ---

Modified: projects/aop/trunk/aop/docs/examples/aspect/aspect.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/aspect/aspect.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/aspect/aspect.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -63,14 +63,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] ---- POJO ---
      [java] AspectPerVM.constructorAdvice accessing: public POJO()
      [java] AspectPerClass.constructorAdvice accessing: public POJO()

Modified: projects/aop/trunk/aop/docs/examples/beanstyleconf/config.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/beanstyleconf/config.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/beanstyleconf/config.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -147,14 +147,13 @@
 <h4>Running</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- new POJO(); ---
      [java] setAttr1: aa
      [java] setAttr2: 1

Modified: projects/aop/trunk/aop/docs/examples/beforeafter/beforeafter.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/beforeafter/beforeafter.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/beforeafter/beforeafter.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -356,14 +356,13 @@
 
 </p><p>
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
 
      [java] SETUP
      [java] =====

Modified: projects/aop/trunk/aop/docs/examples/caller/caller.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/caller/caller.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/caller/caller.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -30,14 +30,13 @@
 <h4>Running</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- main is calling new ArrayList(); ---
      [java] &lt;&lt;&lt; Entering CallerInterceptor1
      [java] &gt;&gt;&gt; Leaving CallerInterceptor1

Modified: projects/aop/trunk/aop/docs/examples/cflow/cflow.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/cflow/cflow.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/cflow/cflow.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -59,14 +59,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- pojo.method4(); ---
      [java] method4
      [java] --- pojo.method3(); ---

Modified: projects/aop/trunk/aop/docs/examples/composition/composition.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/composition/composition.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/composition/composition.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -34,14 +34,13 @@
 Running the example you'll see composition in action
 </p><p>
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- new POJO(); ---
      [java] &lt;&lt;&lt; Entering SimpleInterceptor for: org.jboss.aop.joinpoint.ConstructorInvocation
      [java] empty constructor

Modified: projects/aop/trunk/aop/docs/examples/constructor-execution/constructor.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/constructor-execution/constructor.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/constructor-execution/constructor.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -31,14 +31,13 @@
 <h4>Running</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- new POJO(); ---
      [java] empty constructor
      [java] --- new POJO(String); ---

Modified: projects/aop/trunk/aop/docs/examples/declare/declare.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/declare/declare.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/declare/declare.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -42,17 +42,14 @@
 
 </p><p>
 Now if you run the example:
-</p><p>
-To compile and run with JDK 5:
+</p>
 <pre>
-  $ ant run.aopc.50
+  $ ant run.aopc
 </pre>
 </p><p>
-(To run with JDK 1.4 use $ ant run.aopc.14 as shown in the <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a>.)
-</p><p>
-It will generate the following output
+It will generate the following output:
 <pre>
-_aopc50:
+_aopc:
      [aopc] WARNING: declare-warning condition
      [aopc]     'call(Driver-&gt;new(..)) AND within(*DAO)'
      [aopc] was broken for constructor call: CarDAO.save()V calls Driver.new()V
@@ -69,7 +66,7 @@
      [aopc]     All VehicleDAO subclasses must override the save() method.
 
 
-_run.aopc.50:
+_run.aopc:
      [java] ---- Start ----
      [java] Car DAO save
 
@@ -84,17 +81,14 @@
 
 </p
 <p>
-To run with JDK 5:
+To run:
 </p><p>
 <pre>
-  $ ant run.loadtime.50
+  $ ant run.loadtime
 </pre>
-<p>
-(To run with JDK 1.4 use $ ant run.loadtime.14 as shown in the <a href="../valid_targets_not_annotated.html"/>non-annotated examples guide</a>.)
 </p>
-</p>
 <pre>
-_run.loadtime.50:
+_run.loadtime:
      [java] ---- Start ----
      [java] WARNING: declare-warning condition
      [java]     'call(Driver->new(..)) AND within(*DAO)'
@@ -137,9 +131,9 @@
 
 When running precompiled we get:
 <pre>
-$ ant run.aopc.50
+$ ant run.aopc
 ....
-_aopc50:
+_aopc:
      [aopc] ERROR: declare-error condition
      [aopc]     'call(Driver-&gt;new(..)) AND within(*DAO)'
      [aopc] was broken for constructor call: CarDAO.save()V calls Driver.new()V
@@ -169,11 +163,11 @@
 
 When running with loadtime transformations we get:
 <pre>
-$ ant run.loadtime.50
+$ ant run.loadtime
 
 ...
 
-_run.loadtime.50:
+_run.loadtime:
      [java] ---- Start ----
      [java] ERROR: declare-error condition
      [java]     'call(Driver-&gt;new(..)) AND within(*DAO)'

Modified: projects/aop/trunk/aop/docs/examples/dynamic-aop/dynamic.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/dynamic-aop/dynamic.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/dynamic-aop/dynamic.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -50,14 +50,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- new POJO(); ---
      [java] in empty constructor
      [java] --- adding instance interceptors ---

Modified: projects/aop/trunk/aop/docs/examples/dynamic-cflow/cflow.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/dynamic-cflow/cflow.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/dynamic-cflow/cflow.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -45,14 +45,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- pojo.method4(); ---
      [java] method1
      [java] --- turn on cflow ---

Modified: projects/aop/trunk/aop/docs/examples/examples.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/examples.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/examples.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -4,8 +4,7 @@
 <h2>Tutorial</h2>
 
 </p><p>
-This directory contains sample programs to test drive JBossAOP. They should probably be run in order, but feel free to skip around.
-<b>All the examples assume that JDK 5 is being used</b>
+This directory contains sample programs to test drive JBoss AOP. They should probably be run in order, but feel free to skip around.
 </p><p>
 <h3> XML examples</h3>
 
@@ -63,8 +62,8 @@
 You can access metadata and annotations from advices. In the next few examples
 we will show you how to do this.
 <ul>
-<li> <a href="annotation/annotation.html">JDK 1.5 Annotations</a></li>
-<li> <a href="metadata/metadata.html">JBoss AOP metadata</a></li>
+<li> <a href="annotation/annotation.html">Annotations</a></li>
+<li> <a href="metadata/metadata.html">JBoss AOP Metadata</a></li>
 </ul>
 </p><p>
 <b>Advanced Features</b>
@@ -93,7 +92,7 @@
 <h3> Annotation examples</h3>
 
 </p><p>
-The annotation examples are shorter, since they assume you have already been through the XML examples and already understand the AOP basics. Their aim is to introduce you to how to achieve the same using JDK 5.0 annotations. <b>To run them you will need to set up your environment so that you are running JDK 5.0</b>
+The annotation examples are shorter, since they assume you have already been through the XML examples and already understand the AOP basics. Their aim is to introduce you to how to achieve the same using annotations.
 </p><p>
 <ul>
 <li> <a href="annotated-interceptors/annotated-interceptors.html">Annotated interceptors</a></li>

Modified: projects/aop/trunk/aop/docs/examples/field-execution/field.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/field-execution/field.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/field-execution/field.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -46,14 +46,13 @@
 <h4>Running</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- pojo.getVar1(); ---
      [java] &lt;&lt;&lt; Entering GetInterceptor for: var1
      [java] &gt;&gt;&gt; Leaving GetInterceptor

Modified: projects/aop/trunk/aop/docs/examples/finally/finally.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/finally/finally.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/finally/finally.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -268,14 +268,13 @@
 
 </p>
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
 
      [java] SETUP
      [java] =====

Modified: projects/aop/trunk/aop/docs/examples/implements/implements.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/implements/implements.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/implements/implements.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -36,14 +36,13 @@
 <h4>Running</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- POJO ---
      [java] --- POJO.methodFromImplements ---
      [java] &lt;&lt;&lt; TestInterceptor intercepting

Modified: projects/aop/trunk/aop/docs/examples/instanceof/instanceof.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/instanceof/instanceof.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/instanceof/instanceof.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -17,14 +17,13 @@
 <h4>Running</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- pojo.someMethod(); ---
      [java] &lt;&lt;&lt; Entering SimpleInterceptor type: org.jboss.aop.joinpoint.MethodInvocation
      [java] someMethod

Modified: projects/aop/trunk/aop/docs/examples/introductions/introductions.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/introductions/introductions.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/introductions/introductions.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -44,11 +44,11 @@
 The <i>class</i> attribute of the introduction can only handle a single class expression.  If you want a boolean expression, you can instead use the <i>expr</i> XML attribute.  You can have any scoped boolean expression.  The <i>class(..)</i> keyword will have a class expression within it.  You can also specify a <i>has</i> or <i>hasField</i> expression as well.  The example shows how to use the <i>expr</i> XML attribute.
 </p><p>
 <pre>
-   &lt;metadata tag="test" class="POJO3"&gt;
+   &lt;metadata tag="Test" class="POJO3"&gt;
       &lt;method expr="void method()"/&gt;
    &lt;/metadata&gt;
 
-   &lt;metadata tag="test2" class="POJO4"&gt;
+   &lt;metadata tag="Test2" class="POJO4"&gt;
       &lt;class/&gt;
    &lt;/metadata&gt;
 </pre>
@@ -56,14 +56,14 @@
 First we add some metadata to POJO3 and POJO4.  Then we use these tags in our introduction expression:
 </p><p>
 <pre>
-   &lt;introduction expr="has(* *-&gt;@test(..)) OR class(@test2)"&gt;
+   &lt;introduction expr="has(* *-&gt;@Test(..)) OR class(@Test2)"&gt;
       &lt;interfaces&gt;
          java.io.Serializable
       &lt;/interfaces&gt;
    &lt;/introduction&gt;
 </pre>
 </p><p>
-The <i>expr</i> states:  Any class that has a method tagged as <i>@test</i> or any class that is itself tagged <i>@test2</i>.
+The <i>expr</i> states:  Any class that has a method tagged as <i>@Test</i> or any class that is itself tagged <i>@Test2</i>.
 </p><p>
 <h4>Running the example</h4>
 
@@ -90,14 +90,13 @@
 </p><p>
 This is expected because POJO is not serializable.  Now run it with introductions.
 </p><p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
 
      [java] --- POJO ---
      [java] deserialized pojo.stuff: hello world

Modified: projects/aop/trunk/aop/docs/examples/introductions/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/docs/examples/introductions/jboss-aop.xml	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/introductions/jboss-aop.xml	2008-10-19 20:21:49 UTC (rev 79715)
@@ -16,16 +16,16 @@
       </mixin>
    </introduction>
 
-   <metadata tag="test" class="POJO3">
+   <metadata tag="Test" class="POJO3">
       <method expr="void method()"/>
    </metadata>
 
-   <metadata tag="test2" class="POJO4">
+   <metadata tag="Test2" class="POJO4">
       <class/>
    </metadata>
 
    <!-- introduce serializable to any class that is tagged @test2 or has a method tagged @test -->
-   <introduction expr="has(* *->@test(..)) OR class(@test2)">
+   <introduction expr="has(* *->@Test(..)) OR class(@Test2)">
       <interfaces>
          java.io.Serializable
       </interfaces>

Modified: projects/aop/trunk/aop/docs/examples/logging/logging.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/logging/logging.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/logging/logging.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -18,8 +18,6 @@
 Application server, both <tt>jboss-logging-log4j.jar</tt> and <tt>log4j.jar</tt> will be available, so if logging is enabled
 it will happen via log4j.</p>
 
-<p>All the examples in this lesson use JDK 5, but hopefully by now you have the knowledge to set this up using JDK 1.4!</p>
-
 <h3>Loadtime weaving</h3>
 <p>With loadtime weaving, classes are woven while the class is first loaded, so to see the logging of the weaving process we need 
 to turn on logging when the class is being loaded. We turn this on by passing in the value <tt>true</tt> for the <tt>jboss.aop.verbose</tt> 
@@ -39,12 +37,12 @@
 just there for clarity.</p>
 <p>To run the example with loadtime weaving and no logging turned on, you can run</P>
 <pre>
-$ ant  run.loadtime.50.nologging
+$ ant  run.loadtime.nologging
 </pre>
 <p>This will run the application with no logging:</p>
 <pre>
 ...
-run.loadtime.50.nologging:
+run.loadtime.nologging:
      [java] --- pojo.notwoven(); ---
      [java] notwoven()
      [java] --- pojo.boundMethod(); ---
@@ -68,11 +66,11 @@
 
 <p>To run the example with System.out logging, you  should run:</p>
 <pre>
-$ ant  run.loadtime.50.system.out.logging
+$ ant  run.loadtime.system.out.logging
 </pre>
 <p> This will generate quite a lot of output during the 'run' stage, the most important of which are outlined here:</p>
 <pre>
-run.loadtime.50.system.out.logging:
+run.loadtime.system.out.logging:
 ...
      [java] [aop-debug] org.jboss.aop.instrument.Instrumentor trying to transform POJO
      [java] [aop-debug] org.jboss.aop.instrument.CallerTransformer There are no caller pointcuts!
@@ -110,11 +108,11 @@
 well as control of the output formats etc. See the Apache log4j documentation for more information about log4j.</p>
 <p>To run the example with log4j logging, run:</p>
 <pre>
-$ ant  run.loadtime.50.log4j.logging
+$ ant  run.loadtime.log4j.logging
 </pre>
 <p>Again, this will generate quite a lot of logging for each woven class during the weaving process, the most important bits show below:</p>
 <pre>
-run.loadtime.50.log4j.logging:
+run.loadtime.log4j.logging:
 ...
      [java] 2007-05-15 23:38:23,625 DEBUG org.jboss.aop.instrument.Instrumentor - trying to transform POJO
      [java] 2007-05-15 23:38:23,625 DEBUG org.jboss.aop.instrument.CallerTransformer - There are no caller pointcuts!
@@ -155,7 +153,7 @@
 just there for clarity.</p>
 <p>To run the example:</p>
 <pre>
-$ ant  run.aopc.50.nologging
+$ ant  run.aopc.nologging
 </pre>
 <p>This will aopc the application without logging enabled, and then run the application. As expected, we get no
 logging during the aopc process</p>
@@ -175,7 +173,7 @@
 <p>since neither <tt>jboss-logging-log4j.jar</tt> nor <tt>log4j.jar</tt> are on the classpath, JBoss AOP
 defaults to the System.out logger. To run:</p>
 <pre>
-$ ant  run.aopc.50.system.out.logging
+$ ant  run.aopc.system.out.logging
 </pre>
 <p>The output looks much the same as during the loadtime weaving, but this time
 it happens during the <tt>aopc</tt> stage:</p>
@@ -194,7 +192,7 @@
 <p>We also get some lugging when running the application, showing what happens when the aop information is processed at 
 runtime when running the application:</p>
 <pre>
-run.aopc.50.system.out.logging:
+run.aopc.system.out.logging:
 ...
      [java] [aop-debug] org.jboss.aop.ClassAdvisor Creating chains for class POJO sun.misc.Launcher$AppClassLoader at a39137
      [java] [aop-debug] org.jboss.aop.ClassAdvisor iterate binding file:/C:/cygwin/home/Kabir/sourcecontrol/jboss-aop/build/output/jboss-aop-snapshot/docs/aspect-framework/examples/logging/jboss-aop.xml0 execution(public void POJO->boundMethod())
@@ -225,7 +223,7 @@
 <tt>log4j.jar</tt> are on the classpath, so JBoss AOP will now use the log4j logging mechanism. To get any meaningful
 output, you need a <a href="log4j.properties">log4j.properties</a> on the classpath as was the case when using loadtime weaving. To run:
 <pre>
-$ ant  run.aopc.50.log4j.logging
+$ ant  run.aopc.log4j.logging
 </pre>
 <p>We get much the same output as we did in the <i>Compile-time logging with System.out logging</i> case, but this time formatted and 
 controllable using log4j. Here is the output from aopc:</p>
@@ -243,7 +241,7 @@
 </pre>
 <p>and here is the output from the runtime applicatiin of the aop information</p>
 <pre>
-run.aopc.50.log4j.logging:
+run.aopc.log4j.logging:
 ...
      [java] 2007-05-16 00:03:59,343 DEBUG org.jboss.aop.ClassAdvisor - Creating chains for class POJO sun.misc.Launcher$AppClassLoader at 92e78c
      [java] 2007-05-16 00:03:59,343 DEBUG org.jboss.aop.ClassAdvisor - iterate binding file:/C:/cygwin/home/Kabir/sourcecontrol/jboss-aop/build/output/jboss-aop-snapshot/docs/aspect-framework/examples/logging/jboss-aop.xml0 execution(public void POJO->boundMethod())

Modified: projects/aop/trunk/aop/docs/examples/metadata/BillingInterceptor.java
===================================================================
--- projects/aop/trunk/aop/docs/examples/metadata/BillingInterceptor.java	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/metadata/BillingInterceptor.java	2008-10-19 20:21:49 UTC (rev 79715)
@@ -33,7 +33,7 @@
 
    public Object invoke(Invocation invocation) throws Throwable
    {
-      System.out.println("billing amount: $" + invocation.getMetaData("billable", "amount"));
+      System.out.println("billing amount: $" + invocation.getMetaData("Billable", "amount"));
       return invocation.invokeNext();
    }
 }

Modified: projects/aop/trunk/aop/docs/examples/metadata/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/docs/examples/metadata/jboss-aop.xml	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/metadata/jboss-aop.xml	2008-10-19 20:21:49 UTC (rev 79715)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <aop>
 
-   <bind pointcut="execution(POJO->@billable(..))">
+   <bind pointcut="execution(POJO->@Billable(..))">
        <interceptor class="BillingInterceptor"/>
    </bind>
 
-   <bind pointcut="execution(* POJO->@billable(..))">
+   <bind pointcut="execution(* POJO->@Billable(..))">
        <interceptor class="BillingInterceptor"/>
    </bind>
 
-   <bind pointcut="all(@trace)">
+   <bind pointcut="all(@Trace)">
        <interceptor class="TraceInterceptor"/>
    </bind>
 

Modified: projects/aop/trunk/aop/docs/examples/metadata/metadata-aop.xml
===================================================================
--- projects/aop/trunk/aop/docs/examples/metadata/metadata-aop.xml	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/metadata/metadata-aop.xml	2008-10-19 20:21:49 UTC (rev 79715)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <aop>
-   <metadata tag="trace" class="POJO">
+   <metadata tag="Trace" class="POJO">
       <constructor expr="POJO()"/>
    </metadata>
-   <metadata tag="billable" class="POJO">
+   <metadata tag="Billable" class="POJO">
       <constructor expr="POJO()">
          <amount>0.01</amount>
       </constructor>
    </metadata>
-   <metadata tag="trace" class="POJO">
+   <metadata tag="Trace" class="POJO">
       <field name="field"/>
       <constructor expr="POJO(int)"/>
       <method expr="void someMethod()"/>
    </metadata>
-   <metadata tag="billable" class="POJO">
+   <metadata tag="Billable" class="POJO">
       <constructor expr="POJO(int)">
          <amount>0.01</amount>
       </constructor>

Modified: projects/aop/trunk/aop/docs/examples/metadata/metadata.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/metadata/metadata.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/metadata/metadata.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -13,7 +13,7 @@
 </p><p>
 <h4>Example code</h4>
 
-The example code applies 2 separate interceptors via tags supplied in a Java source file.  One of the interceptors is a tracing interceptor that is trigger by a @trace annotation, the other is B2B functionality that will bill/charge a user for each access of the api.  This is also triggered by an annotation.
+The example code applies 2 separate interceptors via tags supplied in a Java source file.  One of the interceptors is a tracing interceptor that is trigger by a @Trace annotation, the other is B2B functionality that will bill/charge a user for each access of the api.  This is also triggered by an annotation.
 </p><p>
 <h4>Declaring Metadata</h4>
 
@@ -23,33 +23,33 @@
 <code>class</code> attribute must contain a class expression. Every class matching that expression will be bound to the metadata.
 Take a look at the two first tags of <code>metadata-aop.xml</code>:
 <pre>
-    &lt;metadata tag="trace" class="POJO"&gt;
+    &lt;metadata tag="Trace" class="POJO"&gt;
       &lt;constructor expr="POJO()"/&gt;
    &lt;/metadata&gt;
-   &lt;metadata tag="billable" class="POJO"&gt;
+   &lt;metadata tag="Billable" class="POJO"&gt;
       &lt;constructor expr="POJO()"&gt;
          &lt;amount&gt;0.01&lt;/amount&gt;
       &lt;/constructor&gt;
    &lt;/metadata&gt;
 </pre>
 </p><p>
-The first one represents a metadata <code>@trace</code> and the second
-one represents the metadata <code>@billable</code>. Both metadata will be applied to class <code>POJO</code>,
+The first one represents a metadata <code>@Trace</code> and the second
+one represents the metadata <code>@Billable</code>. Both metadata will be applied to class <code>POJO</code>,
 as specified in the <code>class</code> attribute.
 The contents of a <code>metadata</code> tag indicate to which elements of
-<code>POJO</code> class this metadata should be applied. In the example, the metadata <code>@trace</code> will be applied to the
-default constructor of POJO(). The metada <code>@billable</code> will be also applied to the same constructor, and has an attribute,
+<code>POJO</code> class this metadata should be applied. In the example, the metadata <code>@Trace</code> will be applied to the
+default constructor of POJO(). The metada <code>@Billable</code> will be also applied to the same constructor, and has an attribute,
 <code>amount</code>, whose value is <code>0.01</code>. Following this same format you can define as many attributes and values you
 need.
 In similar ways, a metadata can be applied to the fields, methods and to the class itself, just like Java annotations. The next
 <code>metadata</code> tags apply metadata to constructors, methods and fields:
 <pre>
-   &lt;metadata tag="trace" class="POJO"&gt;
+   &lt;metadata tag="Trace" class="POJO"&gt;
       &lt;field name="field"/&gt;
       &lt;constructor expr="POJO(int)"/&gt;
       &lt;method expr="void someMethod()"/&gt;
    &lt;/metadata&gt;
-   &lt;metadata tag="billable" class="POJO"&gt;
+   &lt;metadata tag="Billable" class="POJO"&gt;
       &lt;constructor expr="POJO(int)"&gt;
          &lt;amount&gt;0.01&lt;/amount&gt;
       &lt;/constructor&gt;
@@ -59,17 +59,17 @@
    &lt;/metadata&gt;
 </pre>
 
-If we wanted to apply <code>@trace</code> to <code>POJO</code> class, we could have added an empty <code>class</code>
+If we wanted to apply <code>@Trace</code> to <code>POJO</code> class, we could have added an empty <code>class</code>
 XML tag to a <code>metadata</code> element:
 <pre>
-   &lt;metadata tag="trace" class="POJO"&gt;
+   &lt;metadata tag="Trace" class="POJO"&gt;
       &lt;class/&gt;
    &lt;/metadata&gt;
 </pre>
 The example bellow states that every constructor, field, and method of <code>POJO</code> class will be bound to the
-<code>@trace</code> metadata:
+<code>@Trace</code> metadata:
 <pre>
-   &lt;metadata tag="trace" class="POJO"&gt;
+   &lt;metadata tag="Trace" class="POJO"&gt;
       &lt;default/&gt;
    &lt;/metadata&gt;
 </pre>
@@ -80,25 +80,25 @@
 Annotations can be referenced by an '@' sign in pointcut expressions.  They can only be used in the class expressions for a method, field, or constructor for execution and caller pointcuts.  They can also be used in substitute for 'new' in constructor land, and for a method or field name.  Take a look at jboss-aop.xml
 </p><p>
 <pre>
-   &lt;bind pointcut="execution(POJO-&gt;@billable(..))"&gt;
+   &lt;bind pointcut="execution(POJO-&gt;@Billable(..))"&gt;
        &lt;interceptor class="BillingInterceptor"/&gt;
    &lt;/bind&gt;
 
-   &lt;bind pointcut="execution(* POJO-&gt;@billable(..))"&gt;
+   &lt;bind pointcut="execution(* POJO-&gt;@Billable(..))"&gt;
        &lt;interceptor class="BillingInterceptor"/&gt;
    &lt;/bind&gt;
 
 </pre>
 </p><p>
-The first binding above says that for every constructor tagged as <code>@billable</code> apply the <code>BillingInterceptor</code>.  The second binding states that for any method tagged as <code>@billable</code> apply the <code>BillingInterceptor</code>.  Let's now take a look at applying the tracing advice.
+The first binding above says that for every constructor tagged as <code>@Billable</code> apply the <code>BillingInterceptor</code>.  The second binding states that for any method tagged as <code>@Billable</code> apply the <code>BillingInterceptor</code>.  Let's now take a look at applying the tracing advice.
 </p><p>
 <pre>
-   &lt;bind pointcut="all(@trace)"&gt;
+   &lt;bind pointcut="all(@Trace)"&gt;
        &lt;interceptor class="TraceInterceptor"/&gt;
    &lt;/bind&gt;
 </pre>
 </p><p>
-The above states that for any field, constructor, or method tagged as <code>@trace</code>, apply the <code>TraceInterceptor</code>.
+The above states that for any field, constructor, or method tagged as <code>@Trace</code>, apply the <code>TraceInterceptor</code>.
 </p><p>
 <h4>Accessing metadata at runtime</h4>
 
@@ -107,21 +107,21 @@
 <pre>
    public Object invoke(Invocation invocation) throws Throwable
    {
-      System.out.println("billing amount: $" + invocation.getMetaData("billable", "amount"));
+      System.out.println("billing amount: $" + invocation.getMetaData("Billable", "amount"));
    }
 </pre>
 </p><p>
 <h4>Running</h4>
 
-<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>
+<p>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 It will run the annotationc compiler on the source files to generate metadata in metadata-aop.xml, then javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example. Note that there are two XML aop deployment descriptors: metadata-aop.xml and jboss-aop.xml.  The System Property jboss.aop.path can accept a list of files delimited by the platform classpath separator. ';' on windows ':' on unix. Running the example should produce:
 </p><p>
 <pre>
-run.aopc.50:
+run.aopc:
      [java] --- new POJO(); ---
      [java] billing amount: $0.01
      [java] &lt;&lt;&lt; Trace : executing constructor public POJO()

Modified: projects/aop/trunk/aop/docs/examples/method-execution/methodexecution.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/method-execution/methodexecution.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/method-execution/methodexecution.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -84,14 +84,13 @@
 <h4>Running</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- pojo.noop(); ---
      [java] &lt;&lt;&lt; Entering SimpleInterceptor
      [java] noop()

Modified: projects/aop/trunk/aop/docs/examples/overloaded-advices/overloaded-advices.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/overloaded-advices/overloaded-advices.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/overloaded-advices/overloaded-advices.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -178,14 +178,13 @@
 
 </p><p>
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
 
      [java] Calling POJO constructor
      [java] ========================

Modified: projects/aop/trunk/aop/docs/examples/packaging/packaging.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/packaging/packaging.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/packaging/packaging.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -26,14 +26,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- pojo.noop(); ---
      [java] &lt;&lt;&lt; Entering SimpleInterceptor
      [java] noop()

Modified: projects/aop/trunk/aop/docs/examples/precedence/precedence.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/precedence/precedence.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/precedence/precedence.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -86,14 +86,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- new POJO(); ---
      [java] &lt;&lt;&lt; Entering FirstInterceptor type: POJO0OptimizedConstructorInvocation
      [java] &lt;&lt;&lt; Entering SimpleInterceptor type: POJO0OptimizedConstructorInvocation

Modified: projects/aop/trunk/aop/docs/examples/return-types/return-types.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/return-types/return-types.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/return-types/return-types.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -147,14 +147,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] Calling POJO-&gt;getIntValue()
      [java] ===========================
      [java] &gt;&gt;&gt; aroundDefaultSignature...

Copied: projects/aop/trunk/aop/docs/examples/running_examples.html (from rev 79712, projects/aop/trunk/aop/docs/examples/valid_targets_not_annotated.html)
===================================================================
--- projects/aop/trunk/aop/docs/examples/running_examples.html	                        (rev 0)
+++ projects/aop/trunk/aop/docs/examples/running_examples.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -0,0 +1,40 @@
+<html>
+<body>
+<p>
+<h1>Compiling and Running Examples</h1>
+
+<h2>Run with Ant</h2>
+<p>There are two targets for running the examples with Ant:<p>
+<pre>
+$ ant run.aopc
+$ ant run.loadtime
+</pre>
+
+<h3>ant run.aopc</h3>
+<p>The <i>run.aopc</i> target uses compile-time weaving, and performs the following steps:
+<ul>
+   <li>compiles the classes;</li>
+   <li>runs the <code>aopc</code> compiler;</li>
+   <li>and runs the woven example.</li>
+</ul>
+
+<h3>ant run.loadtime</h3>
+<p>The <i>run.loadtime</i> target uses load-time weaving (the classes are
+transformed when first loaded) and performs the following steps:
+<ul>
+   <li>compiles the classes;</li>
+   <li>and runs the example with the <i>-javagent</i> switch passed in to
+   the java runtime to enable loadtime weaving;</li>
+</ul>
+
+<h2>Run with Maven</h2>
+
+<p>Just run:</p>
+<pre>
+$ mvn install
+</pre>
+<p>This will compile and run the application classes. A few of the examples use compile time weaving, and others
+use loadtime weaving. You can always change between one or the other form by uncommenting sections of the pom.xml
+file.</p>
+
+</html>
\ No newline at end of file

Modified: projects/aop/trunk/aop/docs/examples/stacks/stacks.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/stacks/stacks.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/stacks/stacks.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -23,14 +23,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] SimpleInterceptor1
      [java] SimpleInterceptor2
      [java] SimpleInterceptor3

Modified: projects/aop/trunk/aop/docs/examples/typedef/typedef.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/typedef/typedef.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/typedef/typedef.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -36,14 +36,13 @@
 <h4>Run the example</h4>
 
 <p>
-<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>
+To compile and run (for further detail, refer to our <a href="../running_examples.html"/>Compiling and Running Examples Guide</a>):</p>
 <pre>
-  $ run.aopc.50
+  $ ant run.aopc
 </pre>
 <p>It will javac the files and then run the AOPC precompiler to manipulate the bytecode, then finally run the example.  The output should be similar to this:</p>
 <pre>
-_run.aopc.50:
+_run.aopc:
      [java] --- new POJO(); ---
      [java] &lt;&lt;&lt; Entering SimpleInterceptor
      [java] &lt;&lt;&lt; Entering SimpleInterceptor2

Deleted: projects/aop/trunk/aop/docs/examples/valid_targets_annotated.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/valid_targets_annotated.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/valid_targets_annotated.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -1,32 +0,0 @@
-<html>
-<body>
-<p>
-<h1>Annotated examples</h1>
-<p>This example uses JDK 5 annotations. To execute the ant file that comes with the example
-you need to be set up to use JDK 5, since the annotations will only compile with JDK 5 or above</p>
-
-<h2>Run with JDK 5</h2>
-<p>The two main targets for running with JDK 5 are<p>
-<pre>
-$ ant run.aopc.50
-$ ant run.loadtime.50
-</pre>
-
-<h3>ant.run.aopc.50</h3>
-<p>The <i>ant.run.aopc.50</i> target uses compile-time weaving, and performs the following steps:</p>
-<ul>
-   <li>Compiles the classes using JDK 5</li>
-   <li>Runs the AOPC compiler using JDK 5</li>
-   <li>Runs the woven example using JDK 5</li>
-</ul>
-
-<h3>ant.loadtime.aopc.50</h3>
-<p>The <i>ant.loadtime.aopc.50</i> target uses load-time weaving (the classes are
-transformed when first loaded) and performs the following steps:</p>
-<ul>
-   <li>Compiles the classes using JDK 5</li>
-   <li>Runs the example using JDK 5, with the <i>-javagent</i> switch passed in to
-   the java runtime to enable loadtime weaving</li>
-</ul>
-
-</ul>

Deleted: projects/aop/trunk/aop/docs/examples/valid_targets_not_annotated.html
===================================================================
--- projects/aop/trunk/aop/docs/examples/valid_targets_not_annotated.html	2008-10-19 20:20:29 UTC (rev 79714)
+++ projects/aop/trunk/aop/docs/examples/valid_targets_not_annotated.html	2008-10-19 20:21:49 UTC (rev 79715)
@@ -1,32 +0,0 @@
-<html>
-<body>
-<p>
-<h1>Non-annotated examples</h1>
-<p>This example can be run with either JDK 5 or JDK 1.4</p>
-
-<h2>Run with JDK 5</h2>
-<p>The two main targets for running with JDK 5 are<p>
-<pre>
-$ ant run.aopc.50
-$ ant run.loadtime.50
-</pre>
-<p>These are compiled against the JBoss AOP libraries for JDK 5, and so will work with JDK 5 only</p>
-
-
-<h3>ant.run.aopc.50</h3>
-<p>The <i>ant.run.aopc.50</i> target uses compile-time weaving, and performs the following steps
-<ul>
-   <li>Compiles the classes using JDK 5</li>
-   <li>Runs the AOPC compiler using JDK 5</li>
-   <li>Runs the woven example using JDK 5</li>
-</ul>
-
-<h3>ant.loadtime.aopc.50</h3>
-<p>The <i>ant.loadtime.aopc.50</i> target uses load-time weaving (the classes are
-transformed when first loaded) and performs the following steps:
-<ul>
-   <li>Compiles the classes using JDK 5</li>
-   <li>Runs the example using JDK 5, with the <i>-javagent</i> switch passed in to
-   the java runtime to enable loadtime weaving</li>
-</ul>
-




More information about the jboss-cvs-commits mailing list