moved examples under doc per Erik

73 files changed, 6 insertions, 15 deletions

diff --git a/docs/dist/examples/bean/BoundPoint.java b/docs/dist/doc/examples/bean/BoundPoint.java
index c247ca9cd..c247ca9cd 100644
--- a/docs/dist/examples/bean/BoundPoint.java
+++ b/docs/dist/doc/examples/bean/BoundPoint.java
diff --git a/docs/dist/examples/bean/Demo.java b/docs/dist/doc/examples/bean/Demo.java
index 767409878..767409878 100644
--- a/docs/dist/examples/bean/Demo.java
+++ b/docs/dist/doc/examples/bean/Demo.java
diff --git a/docs/dist/examples/bean/Point.java b/docs/dist/doc/examples/bean/Point.java
index d5040c2bf..d5040c2bf 100644
--- a/docs/dist/examples/bean/Point.java
+++ b/docs/dist/doc/examples/bean/Point.java
diff --git a/docs/dist/examples/build.xml b/docs/dist/doc/examples/build.xml
index 08d7cdc05..e08fa8627 100644
--- a/docs/dist/examples/build.xml
+++ b/docs/dist/doc/examples/build.xml
@@ -25,8 +25,8 @@
                      (use -projecthelp to list {example} names)
 
   Setup:
-     - Run from the examples directory.
-     - Put aspectj-ant.jar in ../lib with aspectjtools.jar and aspectjrt.jar
+     - Just run from the doc/examples directory in your AspectJ distribution;
+       the tasks are in ../../lib/aspectjtools.jar 
 
   Variants:
      - To avoid running (i.e., compile only), define variable "norun"
@@ -59,7 +59,7 @@
       <property name="example.dir"
             location="${basedir}"/> 
       <property name="aspectj.lib.dir"
-            location="${basedir}/../lib"/> 
+            location="${basedir}/../../lib"/> 
 
       <!-- required libraries - install or predefine -->
       <property name="aspectj-ant.jar"
@@ -69,11 +69,9 @@
       <property name="aspectjtools.jar"
             location="${aspectj.lib.dir}/aspectjtools.jar"/> 
 
-      <!-- created directories (fyi workingdir unused) -->
+      <!-- created directories -->
       <property name="classes.dir"
             location="${example.dir}/classes"/> 
-      <property name="working.dir"
-            location="${example.dir}/ajworkingdir"/> 
 
       <!-- checking required libraries -->
       <available file="${aspectjtools.jar}"
@@ -94,13 +92,11 @@
 
     <target name="init.taskdefs" depends="init.variables, 
          aspectjtools.jar.available,
-         aspectjrt.jar.available,
-         aspectj-ant.jar.available">
+         aspectjrt.jar.available">
       
       <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
           <classpath> 
             <pathelement path="${aspectjtools.jar}"/> 
-            <pathelement path="${aspectj-ant.jar}"/> 
           </classpath>
       </taskdef>
     </target>
@@ -117,11 +113,6 @@
       <fail message="expecting aspectjtools.jar at ${aspectjtools.jar}"/>
     </target>
 
-    <target name="aspectj-ant.jar.available" depends="init.variables" 
-          unless="aspectj-ant.jar.available" >
-      <fail message="expecting aspectj-ant.jar at ${aspectj-ant.jar}"/>
-    </target>
-
     <!-- ============================================================= -->
     <!-- these targets compile and run any example                     -->
     <!-- ============================================================= -->
@@ -177,7 +168,7 @@
     <target name="intro">
       <antcall target="Ajx">
         <param name="list"    value="introduction/files.lst"/>
-        <param name="class" value="introduction.Point"/>
+        <param name="class"   value="introduction.Point"/>
       </antcall>
     </target>
 
diff --git a/docs/dist/examples/coordination/Condition.java b/docs/dist/doc/examples/coordination/Condition.java
index 18bbafee2..18bbafee2 100644
--- a/docs/dist/examples/coordination/Condition.java
+++ b/docs/dist/doc/examples/coordination/Condition.java
diff --git a/docs/dist/examples/coordination/CoordinationAction.java b/docs/dist/doc/examples/coordination/CoordinationAction.java
index 7825b95b7..7825b95b7 100644
--- a/docs/dist/examples/coordination/CoordinationAction.java
+++ b/docs/dist/doc/examples/coordination/CoordinationAction.java
diff --git a/docs/dist/examples/coordination/Coordinator.java b/docs/dist/doc/examples/coordination/Coordinator.java
index ea0522d6b..ea0522d6b 100644
--- a/docs/dist/examples/coordination/Coordinator.java
+++ b/docs/dist/doc/examples/coordination/Coordinator.java
diff --git a/docs/dist/examples/coordination/Exclusion.java b/docs/dist/doc/examples/coordination/Exclusion.java
index 9179cd6e0..9179cd6e0 100644
--- a/docs/dist/examples/coordination/Exclusion.java
+++ b/docs/dist/doc/examples/coordination/Exclusion.java
diff --git a/docs/dist/examples/coordination/MethodState.java b/docs/dist/doc/examples/coordination/MethodState.java
index 03a44378a..03a44378a 100644
--- a/docs/dist/examples/coordination/MethodState.java
+++ b/docs/dist/doc/examples/coordination/MethodState.java
diff --git a/docs/dist/examples/coordination/Mutex.java b/docs/dist/doc/examples/coordination/Mutex.java
index 2472137c6..2472137c6 100644
--- a/docs/dist/examples/coordination/Mutex.java
+++ b/docs/dist/doc/examples/coordination/Mutex.java
diff --git a/docs/dist/examples/coordination/Selfex.java b/docs/dist/doc/examples/coordination/Selfex.java
index ff73afd61..ff73afd61 100644
--- a/docs/dist/examples/coordination/Selfex.java
+++ b/docs/dist/doc/examples/coordination/Selfex.java
diff --git a/docs/dist/examples/coordination/TimeoutException.java b/docs/dist/doc/examples/coordination/TimeoutException.java
index e16aa7f09..e16aa7f09 100644
--- a/docs/dist/examples/coordination/TimeoutException.java
+++ b/docs/dist/doc/examples/coordination/TimeoutException.java
diff --git a/docs/dist/examples/introduction/CloneablePoint.java b/docs/dist/doc/examples/introduction/CloneablePoint.java
index 85fa4faf0..85fa4faf0 100644
--- a/docs/dist/examples/introduction/CloneablePoint.java
+++ b/docs/dist/doc/examples/introduction/CloneablePoint.java
diff --git a/docs/dist/examples/introduction/ComparablePoint.java b/docs/dist/doc/examples/introduction/ComparablePoint.java
index a2893dba0..a2893dba0 100644
--- a/docs/dist/examples/introduction/ComparablePoint.java
+++ b/docs/dist/doc/examples/introduction/ComparablePoint.java
diff --git a/docs/dist/examples/introduction/HashablePoint.java b/docs/dist/doc/examples/introduction/HashablePoint.java
index 39eb33ba4..39eb33ba4 100644
--- a/docs/dist/examples/introduction/HashablePoint.java
+++ b/docs/dist/doc/examples/introduction/HashablePoint.java
diff --git a/docs/dist/examples/introduction/Point.java b/docs/dist/doc/examples/introduction/Point.java
index 609a0488c..609a0488c 100644
--- a/docs/dist/examples/introduction/Point.java
+++ b/docs/dist/doc/examples/introduction/Point.java
diff --git a/docs/dist/examples/observer/Button.java b/docs/dist/doc/examples/observer/Button.java
index 086a89e24..086a89e24 100644
--- a/docs/dist/examples/observer/Button.java
+++ b/docs/dist/doc/examples/observer/Button.java
diff --git a/docs/dist/examples/observer/ColorLabel.java b/docs/dist/doc/examples/observer/ColorLabel.java
index 7b0c05fc9..7b0c05fc9 100644
--- a/docs/dist/examples/observer/ColorLabel.java
+++ b/docs/dist/doc/examples/observer/ColorLabel.java
diff --git a/docs/dist/examples/observer/Demo.java b/docs/dist/doc/examples/observer/Demo.java
index b25552478..b25552478 100644
--- a/docs/dist/examples/observer/Demo.java
+++ b/docs/dist/doc/examples/observer/Demo.java
diff --git a/docs/dist/examples/observer/Display.java b/docs/dist/doc/examples/observer/Display.java
index d7f4d479c..d7f4d479c 100644
--- a/docs/dist/examples/observer/Display.java
+++ b/docs/dist/doc/examples/observer/Display.java
diff --git a/docs/dist/examples/observer/Observer.java b/docs/dist/doc/examples/observer/Observer.java
index 58ae44916..58ae44916 100644
--- a/docs/dist/examples/observer/Observer.java
+++ b/docs/dist/doc/examples/observer/Observer.java
diff --git a/docs/dist/examples/observer/Subject.java b/docs/dist/doc/examples/observer/Subject.java
index 5d80b1e09..5d80b1e09 100644
--- a/docs/dist/examples/observer/Subject.java
+++ b/docs/dist/doc/examples/observer/Subject.java
diff --git a/docs/dist/examples/observer/SubjectObserverProtocol.java b/docs/dist/doc/examples/observer/SubjectObserverProtocol.java
index 73f730e09..73f730e09 100644
--- a/docs/dist/examples/observer/SubjectObserverProtocol.java
+++ b/docs/dist/doc/examples/observer/SubjectObserverProtocol.java
diff --git a/docs/dist/examples/observer/SubjectObserverProtocolImpl.java b/docs/dist/doc/examples/observer/SubjectObserverProtocolImpl.java
index 01f0c38fc..01f0c38fc 100644
--- a/docs/dist/examples/observer/SubjectObserverProtocolImpl.java
+++ b/docs/dist/doc/examples/observer/SubjectObserverProtocolImpl.java
diff --git a/docs/dist/examples/spacewar/Bullet.java b/docs/dist/doc/examples/spacewar/Bullet.java
index 6581dbbf7..6581dbbf7 100644
--- a/docs/dist/examples/spacewar/Bullet.java
+++ b/docs/dist/doc/examples/spacewar/Bullet.java
diff --git a/docs/dist/examples/spacewar/Debug.java b/docs/dist/doc/examples/spacewar/Debug.java
index b9a476e0e..b9a476e0e 100644
--- a/docs/dist/examples/spacewar/Debug.java
+++ b/docs/dist/doc/examples/spacewar/Debug.java
diff --git a/docs/dist/examples/spacewar/Display.java b/docs/dist/doc/examples/spacewar/Display.java
index a0f77b347..a0f77b347 100644
--- a/docs/dist/examples/spacewar/Display.java
+++ b/docs/dist/doc/examples/spacewar/Display.java
diff --git a/docs/dist/examples/spacewar/Display1.java b/docs/dist/doc/examples/spacewar/Display1.java
index 484a2342a..484a2342a 100644
--- a/docs/dist/examples/spacewar/Display1.java
+++ b/docs/dist/doc/examples/spacewar/Display1.java
diff --git a/docs/dist/examples/spacewar/Display2.java b/docs/dist/doc/examples/spacewar/Display2.java
index d2dbeb40e..d2dbeb40e 100644
--- a/docs/dist/examples/spacewar/Display2.java
+++ b/docs/dist/doc/examples/spacewar/Display2.java
diff --git a/docs/dist/examples/spacewar/EnergyPacket.java b/docs/dist/doc/examples/spacewar/EnergyPacket.java
index d7bc4f9ec..d7bc4f9ec 100644
--- a/docs/dist/examples/spacewar/EnergyPacket.java
+++ b/docs/dist/doc/examples/spacewar/EnergyPacket.java
diff --git a/docs/dist/examples/spacewar/EnergyPacketProducer.java b/docs/dist/doc/examples/spacewar/EnergyPacketProducer.java
index efd276042..efd276042 100644
--- a/docs/dist/examples/spacewar/EnergyPacketProducer.java
+++ b/docs/dist/doc/examples/spacewar/EnergyPacketProducer.java
diff --git a/docs/dist/examples/spacewar/EnsureShipIsAlive.java b/docs/dist/doc/examples/spacewar/EnsureShipIsAlive.java
index f7b949a92..f7b949a92 100644
--- a/docs/dist/examples/spacewar/EnsureShipIsAlive.java
+++ b/docs/dist/doc/examples/spacewar/EnsureShipIsAlive.java
diff --git a/docs/dist/examples/spacewar/Game.java b/docs/dist/doc/examples/spacewar/Game.java
index da67d7bc3..da67d7bc3 100644
--- a/docs/dist/examples/spacewar/Game.java
+++ b/docs/dist/doc/examples/spacewar/Game.java
diff --git a/docs/dist/examples/spacewar/GameSynchronization.java b/docs/dist/doc/examples/spacewar/GameSynchronization.java
index dcf42e904..dcf42e904 100644
--- a/docs/dist/examples/spacewar/GameSynchronization.java
+++ b/docs/dist/doc/examples/spacewar/GameSynchronization.java
diff --git a/docs/dist/examples/spacewar/Makefile b/docs/dist/doc/examples/spacewar/Makefile
index 108d3c8c4..108d3c8c4 100644
--- a/docs/dist/examples/spacewar/Makefile
+++ b/docs/dist/doc/examples/spacewar/Makefile
diff --git a/docs/dist/examples/spacewar/Pilot.java b/docs/dist/doc/examples/spacewar/Pilot.java
index 330d860bf..330d860bf 100644
--- a/docs/dist/examples/spacewar/Pilot.java
+++ b/docs/dist/doc/examples/spacewar/Pilot.java
diff --git a/docs/dist/examples/spacewar/Player.java b/docs/dist/doc/examples/spacewar/Player.java
index ebde6d5c4..ebde6d5c4 100644
--- a/docs/dist/examples/spacewar/Player.java
+++ b/docs/dist/doc/examples/spacewar/Player.java
diff --git a/docs/dist/examples/spacewar/README.html b/docs/dist/doc/examples/spacewar/README.html
index 8b6a56910..8b6a56910 100644
--- a/docs/dist/examples/spacewar/README.html
+++ b/docs/dist/doc/examples/spacewar/README.html
diff --git a/docs/dist/examples/spacewar/Registry.java b/docs/dist/doc/examples/spacewar/Registry.java
index a9cec0418..a9cec0418 100644
--- a/docs/dist/examples/spacewar/Registry.java
+++ b/docs/dist/doc/examples/spacewar/Registry.java
diff --git a/docs/dist/examples/spacewar/RegistrySynchronization.java b/docs/dist/doc/examples/spacewar/RegistrySynchronization.java
index 986e4bd30..986e4bd30 100644
--- a/docs/dist/examples/spacewar/RegistrySynchronization.java
+++ b/docs/dist/doc/examples/spacewar/RegistrySynchronization.java
diff --git a/docs/dist/examples/spacewar/Robot.java b/docs/dist/doc/examples/spacewar/Robot.java
index 05f276108..05f276108 100644
--- a/docs/dist/examples/spacewar/Robot.java
+++ b/docs/dist/doc/examples/spacewar/Robot.java
diff --git a/docs/dist/examples/spacewar/SWFrame.java b/docs/dist/doc/examples/spacewar/SWFrame.java
index 6dfb9f6f6..6dfb9f6f6 100644
--- a/docs/dist/examples/spacewar/SWFrame.java
+++ b/docs/dist/doc/examples/spacewar/SWFrame.java
diff --git a/docs/dist/examples/spacewar/Ship.java b/docs/dist/doc/examples/spacewar/Ship.java
index 9978fe694..9978fe694 100644
--- a/docs/dist/examples/spacewar/Ship.java
+++ b/docs/dist/doc/examples/spacewar/Ship.java
diff --git a/docs/dist/examples/spacewar/SpaceObject.java b/docs/dist/doc/examples/spacewar/SpaceObject.java
index ee3afabcc..ee3afabcc 100644
--- a/docs/dist/examples/spacewar/SpaceObject.java
+++ b/docs/dist/doc/examples/spacewar/SpaceObject.java
diff --git a/docs/dist/examples/spacewar/Timer.java b/docs/dist/doc/examples/spacewar/Timer.java
index 1f4a992a7..1f4a992a7 100644
--- a/docs/dist/examples/spacewar/Timer.java
+++ b/docs/dist/doc/examples/spacewar/Timer.java
diff --git a/docs/dist/examples/telecom/AbstractSimulation.java b/docs/dist/doc/examples/telecom/AbstractSimulation.java
index 1c44af7a7..1c44af7a7 100644
--- a/docs/dist/examples/telecom/AbstractSimulation.java
+++ b/docs/dist/doc/examples/telecom/AbstractSimulation.java
diff --git a/docs/dist/examples/telecom/BasicSimulation.java b/docs/dist/doc/examples/telecom/BasicSimulation.java
index ab7426376..ab7426376 100644
--- a/docs/dist/examples/telecom/BasicSimulation.java
+++ b/docs/dist/doc/examples/telecom/BasicSimulation.java
diff --git a/docs/dist/examples/telecom/Billing.java b/docs/dist/doc/examples/telecom/Billing.java
index c69ca758c..c69ca758c 100644
--- a/docs/dist/examples/telecom/Billing.java
+++ b/docs/dist/doc/examples/telecom/Billing.java
diff --git a/docs/dist/examples/telecom/BillingSimulation.java b/docs/dist/doc/examples/telecom/BillingSimulation.java
index 09f273ff6..09f273ff6 100644
--- a/docs/dist/examples/telecom/BillingSimulation.java
+++ b/docs/dist/doc/examples/telecom/BillingSimulation.java
diff --git a/docs/dist/examples/telecom/Call.java b/docs/dist/doc/examples/telecom/Call.java
index 738d2d348..738d2d348 100644
--- a/docs/dist/examples/telecom/Call.java
+++ b/docs/dist/doc/examples/telecom/Call.java
diff --git a/docs/dist/examples/telecom/Connection.java b/docs/dist/doc/examples/telecom/Connection.java
index 7d54ec843..7d54ec843 100644
--- a/docs/dist/examples/telecom/Connection.java
+++ b/docs/dist/doc/examples/telecom/Connection.java
diff --git a/docs/dist/examples/telecom/Customer.java b/docs/dist/doc/examples/telecom/Customer.java
index 1e099984c..1e099984c 100644
--- a/docs/dist/examples/telecom/Customer.java
+++ b/docs/dist/doc/examples/telecom/Customer.java
diff --git a/docs/dist/examples/telecom/Local.java b/docs/dist/doc/examples/telecom/Local.java
index e0bc02679..e0bc02679 100644
--- a/docs/dist/examples/telecom/Local.java
+++ b/docs/dist/doc/examples/telecom/Local.java
diff --git a/docs/dist/examples/telecom/LongDistance.java b/docs/dist/doc/examples/telecom/LongDistance.java
index b2ed6eb7d..b2ed6eb7d 100644
--- a/docs/dist/examples/telecom/LongDistance.java
+++ b/docs/dist/doc/examples/telecom/LongDistance.java
diff --git a/docs/dist/examples/telecom/Timer.java b/docs/dist/doc/examples/telecom/Timer.java
index 813ae3a0d..813ae3a0d 100644
--- a/docs/dist/examples/telecom/Timer.java
+++ b/docs/dist/doc/examples/telecom/Timer.java
diff --git a/docs/dist/examples/telecom/TimerLog.java b/docs/dist/doc/examples/telecom/TimerLog.java
index 4591894dc..4591894dc 100644
--- a/docs/dist/examples/telecom/TimerLog.java
+++ b/docs/dist/doc/examples/telecom/TimerLog.java
diff --git a/docs/dist/examples/telecom/Timing.java b/docs/dist/doc/examples/telecom/Timing.java
index f40bd0fca..f40bd0fca 100644
--- a/docs/dist/examples/telecom/Timing.java
+++ b/docs/dist/doc/examples/telecom/Timing.java
diff --git a/docs/dist/examples/telecom/TimingSimulation.java b/docs/dist/doc/examples/telecom/TimingSimulation.java
index 309563769..309563769 100644
--- a/docs/dist/examples/telecom/TimingSimulation.java
+++ b/docs/dist/doc/examples/telecom/TimingSimulation.java
diff --git a/docs/dist/examples/tjp/Demo.java b/docs/dist/doc/examples/tjp/Demo.java
index 8b90a7a49..8b90a7a49 100644
--- a/docs/dist/examples/tjp/Demo.java
+++ b/docs/dist/doc/examples/tjp/Demo.java
diff --git a/docs/dist/examples/tjp/GetInfo.java b/docs/dist/doc/examples/tjp/GetInfo.java
index 63f13c74e..63f13c74e 100644
--- a/docs/dist/examples/tjp/GetInfo.java
+++ b/docs/dist/doc/examples/tjp/GetInfo.java
diff --git a/docs/dist/examples/tracing/Circle.java b/docs/dist/doc/examples/tracing/Circle.java
index 76b73e20a..76b73e20a 100644
--- a/docs/dist/examples/tracing/Circle.java
+++ b/docs/dist/doc/examples/tracing/Circle.java
diff --git a/docs/dist/examples/tracing/ExampleMain.java b/docs/dist/doc/examples/tracing/ExampleMain.java
index 93cc465b7..93cc465b7 100644
--- a/docs/dist/examples/tracing/ExampleMain.java
+++ b/docs/dist/doc/examples/tracing/ExampleMain.java
diff --git a/docs/dist/examples/tracing/README b/docs/dist/doc/examples/tracing/README
index 6bf89328b..6bf89328b 100644
--- a/docs/dist/examples/tracing/README
+++ b/docs/dist/doc/examples/tracing/README
diff --git a/docs/dist/examples/tracing/Square.java b/docs/dist/doc/examples/tracing/Square.java
index 78b36882d..78b36882d 100644
--- a/docs/dist/examples/tracing/Square.java
+++ b/docs/dist/doc/examples/tracing/Square.java
diff --git a/docs/dist/examples/tracing/TwoDShape.java b/docs/dist/doc/examples/tracing/TwoDShape.java
index 960a01b89..960a01b89 100644
--- a/docs/dist/examples/tracing/TwoDShape.java
+++ b/docs/dist/doc/examples/tracing/TwoDShape.java
diff --git a/docs/dist/examples/tracing/lib/AbstractTrace.java b/docs/dist/doc/examples/tracing/lib/AbstractTrace.java
index 8c67b12c3..8c67b12c3 100644
--- a/docs/dist/examples/tracing/lib/AbstractTrace.java
+++ b/docs/dist/doc/examples/tracing/lib/AbstractTrace.java
diff --git a/docs/dist/examples/tracing/lib/TraceMyClasses.java b/docs/dist/doc/examples/tracing/lib/TraceMyClasses.java
index 95c3a859c..95c3a859c 100644
--- a/docs/dist/examples/tracing/lib/TraceMyClasses.java
+++ b/docs/dist/doc/examples/tracing/lib/TraceMyClasses.java
diff --git a/docs/dist/examples/tracing/version1/Trace.java b/docs/dist/doc/examples/tracing/version1/Trace.java
index eef96df51..eef96df51 100644
--- a/docs/dist/examples/tracing/version1/Trace.java
+++ b/docs/dist/doc/examples/tracing/version1/Trace.java
diff --git a/docs/dist/examples/tracing/version1/TraceMyClasses.java b/docs/dist/doc/examples/tracing/version1/TraceMyClasses.java
index b4a97ee31..b4a97ee31 100644
--- a/docs/dist/examples/tracing/version1/TraceMyClasses.java
+++ b/docs/dist/doc/examples/tracing/version1/TraceMyClasses.java
diff --git a/docs/dist/examples/tracing/version2/Trace.java b/docs/dist/doc/examples/tracing/version2/Trace.java
index cd631e278..cd631e278 100644
--- a/docs/dist/examples/tracing/version2/Trace.java
+++ b/docs/dist/doc/examples/tracing/version2/Trace.java
diff --git a/docs/dist/examples/tracing/version2/TraceMyClasses.java b/docs/dist/doc/examples/tracing/version2/TraceMyClasses.java
index a3ae99e95..a3ae99e95 100644
--- a/docs/dist/examples/tracing/version2/TraceMyClasses.java
+++ b/docs/dist/doc/examples/tracing/version2/TraceMyClasses.java
diff --git a/docs/dist/examples/tracing/version3/Trace.java b/docs/dist/doc/examples/tracing/version3/Trace.java
index 8fc9d8613..8fc9d8613 100644
--- a/docs/dist/examples/tracing/version3/Trace.java
+++ b/docs/dist/doc/examples/tracing/version3/Trace.java
diff --git a/docs/dist/examples/tracing/version3/TraceMyClasses.java b/docs/dist/doc/examples/tracing/version3/TraceMyClasses.java
index c986d2615..c986d2615 100644
--- a/docs/dist/examples/tracing/version3/TraceMyClasses.java
+++ b/docs/dist/doc/examples/tracing/version3/TraceMyClasses.java