From 61ceb8a58ea72d4c07ff0b2f669d5f84b75700ec Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Thu, 4 Jan 2024 10:12:59 +0700 Subject: [PATCH] Move docs examples directory two levels up Now, the location more closely resembles where it is on the website. Signed-off-by: Alexander Kriegisch --- .../doc => }/examples/bean/BoundPoint.java | 0 docs/{dist/doc => }/examples/bean/Demo.java | 0 docs/{dist/doc => }/examples/bean/Point.java | 0 docs/{dist/doc => }/examples/bean/files.lst | 0 docs/{dist/doc => }/examples/build.xml | 0 .../examples/coordination/Condition.java | 0 .../coordination/CoordinationAction.java | 0 .../examples/coordination/Coordinator.java | 0 .../examples/coordination/Exclusion.java | 0 .../examples/coordination/MethodState.java | 0 .../doc => }/examples/coordination/Mutex.java | 0 .../examples/coordination/Selfex.java | 0 .../coordination/TimeoutException.java | 0 .../doc => }/examples/coordination/lib.lst | 0 .../examples/introduction/CloneablePoint.java | 0 .../introduction/ComparablePoint.java | 0 .../examples/introduction/HashablePoint.java | 0 .../doc => }/examples/introduction/Point.java | 0 .../doc => }/examples/introduction/files.lst | 0 .../doc => }/examples/ltw/HelloWorld.java | 0 docs/{dist/doc => }/examples/ltw/README | 84 +++++++++---------- docs/{dist/doc => }/examples/ltw/Tracing.aj | 0 .../doc => }/examples/observer/Button.java | 0 .../examples/observer/ColorLabel.java | 0 .../doc => }/examples/observer/Demo.java | 0 .../doc => }/examples/observer/Display.java | 0 .../doc => }/examples/observer/Observer.java | 0 .../doc => }/examples/observer/Subject.java | 0 .../observer/SubjectObserverProtocol.java | 0 .../observer/SubjectObserverProtocolImpl.java | 0 .../doc => }/examples/observer/files.lst | 0 .../doc => }/examples/spacewar/Bullet.java | 0 .../doc => }/examples/spacewar/Debug.java | 0 .../doc => }/examples/spacewar/Display.java | 0 .../doc => }/examples/spacewar/Display1.java | 0 .../doc => }/examples/spacewar/Display2.java | 0 .../examples/spacewar/EnergyPacket.java | 0 .../spacewar/EnergyPacketProducer.java | 0 .../examples/spacewar/EnsureShipIsAlive.java | 0 .../doc => }/examples/spacewar/Game.java | 0 .../spacewar/GameSynchronization.java | 0 .../{dist/doc => }/examples/spacewar/Makefile | 24 +++--- .../doc => }/examples/spacewar/Pilot.java | 0 .../doc => }/examples/spacewar/Player.java | 0 .../doc => }/examples/spacewar/README.adoc | 0 .../doc => }/examples/spacewar/Registry.java | 0 .../spacewar/RegistrySynchronization.java | 0 .../doc => }/examples/spacewar/Robot.java | 0 .../doc => }/examples/spacewar/SWFrame.java | 0 .../doc => }/examples/spacewar/Ship.java | 0 .../examples/spacewar/SpaceObject.java | 0 .../doc => }/examples/spacewar/Timer.java | 0 .../doc => }/examples/spacewar/debug.lst | 0 .../{dist/doc => }/examples/spacewar/demo.lst | 0 .../examples/telecom/AbstractSimulation.java | 0 .../examples/telecom/BasicSimulation.java | 0 .../doc => }/examples/telecom/Billing.java | 0 .../examples/telecom/BillingSimulation.java | 0 .../{dist/doc => }/examples/telecom/Call.java | 0 .../doc => }/examples/telecom/Connection.java | 0 .../doc => }/examples/telecom/Customer.java | 0 .../doc => }/examples/telecom/Local.java | 0 .../examples/telecom/LongDistance.java | 0 .../doc => }/examples/telecom/Timer.java | 0 .../doc => }/examples/telecom/TimerLog.java | 0 .../doc => }/examples/telecom/Timing.java | 0 .../examples/telecom/TimingSimulation.java | 0 .../{dist/doc => }/examples/telecom/basic.lst | 0 .../doc => }/examples/telecom/billing.lst | 0 .../doc => }/examples/telecom/timing.lst | 0 docs/{dist/doc => }/examples/tjp/Demo.java | 0 docs/{dist/doc => }/examples/tjp/GetInfo.java | 0 docs/{dist/doc => }/examples/tjp/files.lst | 0 .../doc => }/examples/tracing/Circle.java | 0 .../examples/tracing/ExampleMain.java | 0 docs/{dist/doc => }/examples/tracing/README | 64 +++++++------- .../doc => }/examples/tracing/Square.java | 0 .../doc => }/examples/tracing/TwoDShape.java | 0 .../examples/tracing/lib/AbstractTrace.java | 0 .../examples/tracing/lib/TraceMyClasses.java | 0 .../doc => }/examples/tracing/notrace.lst | 0 .../doc => }/examples/tracing/tracelib.lst | 0 .../doc => }/examples/tracing/tracev1.lst | 0 .../doc => }/examples/tracing/tracev2.lst | 0 .../doc => }/examples/tracing/tracev3.lst | 0 .../examples/tracing/version1/Trace.java | 0 .../tracing/version1/TraceMyClasses.java | 0 .../examples/tracing/version2/Trace.java | 0 .../tracing/version2/TraceMyClasses.java | 0 .../examples/tracing/version3/Trace.java | 0 .../tracing/version3/TraceMyClasses.java | 0 docs/index.adoc | 6 +- .../compiler/batch/WorkingTestMain.java | 2 +- .../taskdefs/Ajc11CompilerAdapterTest.java | 2 +- tests/ajcTestsExamples.xml | 58 ++++++------- .../org/aspectj/systemtest/ajc150/ajc150.xml | 2 +- .../systemtest/ajc190/ajc190_from150.xml | 2 +- tests/test-other-systems.xml | 2 +- 98 files changed, 123 insertions(+), 123 deletions(-) rename docs/{dist/doc => }/examples/bean/BoundPoint.java (100%) rename docs/{dist/doc => }/examples/bean/Demo.java (100%) rename docs/{dist/doc => }/examples/bean/Point.java (100%) rename docs/{dist/doc => }/examples/bean/files.lst (100%) rename docs/{dist/doc => }/examples/build.xml (100%) rename docs/{dist/doc => }/examples/coordination/Condition.java (100%) rename docs/{dist/doc => }/examples/coordination/CoordinationAction.java (100%) rename docs/{dist/doc => }/examples/coordination/Coordinator.java (100%) rename docs/{dist/doc => }/examples/coordination/Exclusion.java (100%) rename docs/{dist/doc => }/examples/coordination/MethodState.java (100%) rename docs/{dist/doc => }/examples/coordination/Mutex.java (100%) rename docs/{dist/doc => }/examples/coordination/Selfex.java (100%) rename docs/{dist/doc => }/examples/coordination/TimeoutException.java (100%) rename docs/{dist/doc => }/examples/coordination/lib.lst (100%) rename docs/{dist/doc => }/examples/introduction/CloneablePoint.java (100%) rename docs/{dist/doc => }/examples/introduction/ComparablePoint.java (100%) rename docs/{dist/doc => }/examples/introduction/HashablePoint.java (100%) rename docs/{dist/doc => }/examples/introduction/Point.java (100%) rename docs/{dist/doc => }/examples/introduction/files.lst (100%) rename docs/{dist/doc => }/examples/ltw/HelloWorld.java (100%) rename docs/{dist/doc => }/examples/ltw/README (96%) rename docs/{dist/doc => }/examples/ltw/Tracing.aj (100%) rename docs/{dist/doc => }/examples/observer/Button.java (100%) rename docs/{dist/doc => }/examples/observer/ColorLabel.java (100%) rename docs/{dist/doc => }/examples/observer/Demo.java (100%) rename docs/{dist/doc => }/examples/observer/Display.java (100%) rename docs/{dist/doc => }/examples/observer/Observer.java (100%) rename docs/{dist/doc => }/examples/observer/Subject.java (100%) rename docs/{dist/doc => }/examples/observer/SubjectObserverProtocol.java (100%) rename docs/{dist/doc => }/examples/observer/SubjectObserverProtocolImpl.java (100%) rename docs/{dist/doc => }/examples/observer/files.lst (100%) rename docs/{dist/doc => }/examples/spacewar/Bullet.java (100%) rename docs/{dist/doc => }/examples/spacewar/Debug.java (100%) rename docs/{dist/doc => }/examples/spacewar/Display.java (100%) rename docs/{dist/doc => }/examples/spacewar/Display1.java (100%) rename docs/{dist/doc => }/examples/spacewar/Display2.java (100%) rename docs/{dist/doc => }/examples/spacewar/EnergyPacket.java (100%) rename docs/{dist/doc => }/examples/spacewar/EnergyPacketProducer.java (100%) rename docs/{dist/doc => }/examples/spacewar/EnsureShipIsAlive.java (100%) rename docs/{dist/doc => }/examples/spacewar/Game.java (100%) rename docs/{dist/doc => }/examples/spacewar/GameSynchronization.java (100%) rename docs/{dist/doc => }/examples/spacewar/Makefile (92%) rename docs/{dist/doc => }/examples/spacewar/Pilot.java (100%) rename docs/{dist/doc => }/examples/spacewar/Player.java (100%) rename docs/{dist/doc => }/examples/spacewar/README.adoc (100%) rename docs/{dist/doc => }/examples/spacewar/Registry.java (100%) rename docs/{dist/doc => }/examples/spacewar/RegistrySynchronization.java (100%) rename docs/{dist/doc => }/examples/spacewar/Robot.java (100%) rename docs/{dist/doc => }/examples/spacewar/SWFrame.java (100%) rename docs/{dist/doc => }/examples/spacewar/Ship.java (100%) rename docs/{dist/doc => }/examples/spacewar/SpaceObject.java (100%) rename docs/{dist/doc => }/examples/spacewar/Timer.java (100%) rename docs/{dist/doc => }/examples/spacewar/debug.lst (100%) rename docs/{dist/doc => }/examples/spacewar/demo.lst (100%) rename docs/{dist/doc => }/examples/telecom/AbstractSimulation.java (100%) rename docs/{dist/doc => }/examples/telecom/BasicSimulation.java (100%) rename docs/{dist/doc => }/examples/telecom/Billing.java (100%) rename docs/{dist/doc => }/examples/telecom/BillingSimulation.java (100%) rename docs/{dist/doc => }/examples/telecom/Call.java (100%) rename docs/{dist/doc => }/examples/telecom/Connection.java (100%) rename docs/{dist/doc => }/examples/telecom/Customer.java (100%) rename docs/{dist/doc => }/examples/telecom/Local.java (100%) rename docs/{dist/doc => }/examples/telecom/LongDistance.java (100%) rename docs/{dist/doc => }/examples/telecom/Timer.java (100%) rename docs/{dist/doc => }/examples/telecom/TimerLog.java (100%) rename docs/{dist/doc => }/examples/telecom/Timing.java (100%) rename docs/{dist/doc => }/examples/telecom/TimingSimulation.java (100%) rename docs/{dist/doc => }/examples/telecom/basic.lst (100%) rename docs/{dist/doc => }/examples/telecom/billing.lst (100%) rename docs/{dist/doc => }/examples/telecom/timing.lst (100%) rename docs/{dist/doc => }/examples/tjp/Demo.java (100%) rename docs/{dist/doc => }/examples/tjp/GetInfo.java (100%) rename docs/{dist/doc => }/examples/tjp/files.lst (100%) rename docs/{dist/doc => }/examples/tracing/Circle.java (100%) rename docs/{dist/doc => }/examples/tracing/ExampleMain.java (100%) rename docs/{dist/doc => }/examples/tracing/README (96%) rename docs/{dist/doc => }/examples/tracing/Square.java (100%) rename docs/{dist/doc => }/examples/tracing/TwoDShape.java (100%) rename docs/{dist/doc => }/examples/tracing/lib/AbstractTrace.java (100%) rename docs/{dist/doc => }/examples/tracing/lib/TraceMyClasses.java (100%) rename docs/{dist/doc => }/examples/tracing/notrace.lst (100%) rename docs/{dist/doc => }/examples/tracing/tracelib.lst (100%) rename docs/{dist/doc => }/examples/tracing/tracev1.lst (100%) rename docs/{dist/doc => }/examples/tracing/tracev2.lst (100%) rename docs/{dist/doc => }/examples/tracing/tracev3.lst (100%) rename docs/{dist/doc => }/examples/tracing/version1/Trace.java (100%) rename docs/{dist/doc => }/examples/tracing/version1/TraceMyClasses.java (100%) rename docs/{dist/doc => }/examples/tracing/version2/Trace.java (100%) rename docs/{dist/doc => }/examples/tracing/version2/TraceMyClasses.java (100%) rename docs/{dist/doc => }/examples/tracing/version3/Trace.java (100%) rename docs/{dist/doc => }/examples/tracing/version3/TraceMyClasses.java (100%) diff --git a/docs/dist/doc/examples/bean/BoundPoint.java b/docs/examples/bean/BoundPoint.java similarity index 100% rename from docs/dist/doc/examples/bean/BoundPoint.java rename to docs/examples/bean/BoundPoint.java diff --git a/docs/dist/doc/examples/bean/Demo.java b/docs/examples/bean/Demo.java similarity index 100% rename from docs/dist/doc/examples/bean/Demo.java rename to docs/examples/bean/Demo.java diff --git a/docs/dist/doc/examples/bean/Point.java b/docs/examples/bean/Point.java similarity index 100% rename from docs/dist/doc/examples/bean/Point.java rename to docs/examples/bean/Point.java diff --git a/docs/dist/doc/examples/bean/files.lst b/docs/examples/bean/files.lst similarity index 100% rename from docs/dist/doc/examples/bean/files.lst rename to docs/examples/bean/files.lst diff --git a/docs/dist/doc/examples/build.xml b/docs/examples/build.xml similarity index 100% rename from docs/dist/doc/examples/build.xml rename to docs/examples/build.xml diff --git a/docs/dist/doc/examples/coordination/Condition.java b/docs/examples/coordination/Condition.java similarity index 100% rename from docs/dist/doc/examples/coordination/Condition.java rename to docs/examples/coordination/Condition.java diff --git a/docs/dist/doc/examples/coordination/CoordinationAction.java b/docs/examples/coordination/CoordinationAction.java similarity index 100% rename from docs/dist/doc/examples/coordination/CoordinationAction.java rename to docs/examples/coordination/CoordinationAction.java diff --git a/docs/dist/doc/examples/coordination/Coordinator.java b/docs/examples/coordination/Coordinator.java similarity index 100% rename from docs/dist/doc/examples/coordination/Coordinator.java rename to docs/examples/coordination/Coordinator.java diff --git a/docs/dist/doc/examples/coordination/Exclusion.java b/docs/examples/coordination/Exclusion.java similarity index 100% rename from docs/dist/doc/examples/coordination/Exclusion.java rename to docs/examples/coordination/Exclusion.java diff --git a/docs/dist/doc/examples/coordination/MethodState.java b/docs/examples/coordination/MethodState.java similarity index 100% rename from docs/dist/doc/examples/coordination/MethodState.java rename to docs/examples/coordination/MethodState.java diff --git a/docs/dist/doc/examples/coordination/Mutex.java b/docs/examples/coordination/Mutex.java similarity index 100% rename from docs/dist/doc/examples/coordination/Mutex.java rename to docs/examples/coordination/Mutex.java diff --git a/docs/dist/doc/examples/coordination/Selfex.java b/docs/examples/coordination/Selfex.java similarity index 100% rename from docs/dist/doc/examples/coordination/Selfex.java rename to docs/examples/coordination/Selfex.java diff --git a/docs/dist/doc/examples/coordination/TimeoutException.java b/docs/examples/coordination/TimeoutException.java similarity index 100% rename from docs/dist/doc/examples/coordination/TimeoutException.java rename to docs/examples/coordination/TimeoutException.java diff --git a/docs/dist/doc/examples/coordination/lib.lst b/docs/examples/coordination/lib.lst similarity index 100% rename from docs/dist/doc/examples/coordination/lib.lst rename to docs/examples/coordination/lib.lst diff --git a/docs/dist/doc/examples/introduction/CloneablePoint.java b/docs/examples/introduction/CloneablePoint.java similarity index 100% rename from docs/dist/doc/examples/introduction/CloneablePoint.java rename to docs/examples/introduction/CloneablePoint.java diff --git a/docs/dist/doc/examples/introduction/ComparablePoint.java b/docs/examples/introduction/ComparablePoint.java similarity index 100% rename from docs/dist/doc/examples/introduction/ComparablePoint.java rename to docs/examples/introduction/ComparablePoint.java diff --git a/docs/dist/doc/examples/introduction/HashablePoint.java b/docs/examples/introduction/HashablePoint.java similarity index 100% rename from docs/dist/doc/examples/introduction/HashablePoint.java rename to docs/examples/introduction/HashablePoint.java diff --git a/docs/dist/doc/examples/introduction/Point.java b/docs/examples/introduction/Point.java similarity index 100% rename from docs/dist/doc/examples/introduction/Point.java rename to docs/examples/introduction/Point.java diff --git a/docs/dist/doc/examples/introduction/files.lst b/docs/examples/introduction/files.lst similarity index 100% rename from docs/dist/doc/examples/introduction/files.lst rename to docs/examples/introduction/files.lst diff --git a/docs/dist/doc/examples/ltw/HelloWorld.java b/docs/examples/ltw/HelloWorld.java similarity index 100% rename from docs/dist/doc/examples/ltw/HelloWorld.java rename to docs/examples/ltw/HelloWorld.java diff --git a/docs/dist/doc/examples/ltw/README b/docs/examples/ltw/README similarity index 96% rename from docs/dist/doc/examples/ltw/README rename to docs/examples/ltw/README index f749692ac..43868a2e2 100644 --- a/docs/dist/doc/examples/ltw/README +++ b/docs/examples/ltw/README @@ -1,42 +1,42 @@ - -For users of JDK 1.4 the bin directory of your AspectJ distribution -contains a script "aj" to perform load-time weaving. Java classes on -the CLASSPATH are loaded and woven with aspects also on the CLASSPATH -which are declared in an aop.xml file. This file is either created by -the user or generated by the compiler. Alternatively aspects can be -loaded from an explicitly defined ASPECTPATH. - -For users of JDK 1.5 the bin directory of your AspectJ distribution -contains a script "aj5" to perform load-time weaving using an agent. -This uses an aop.xml as described above. - ---To compile the HelloWorld program-- - - ajc -outjar hello.jar HelloWorld.java - ---To compile the Tracing aspect-- - - ajc -outjar tracing.jar -outxml Tracing.aj - ---To run the example-- - - set CLASSPATH to include hello.jar - - aj HelloWorld - ---To run the example with tracing-- - - set CLASSPATH to include "tracing.jar" - - aj HelloWorld - ---To run the example with tracing using ASPECTPATH-- - - set ASPECTPATH=tracing.jar - - aj HelloWorld - ---To run the example with tracing using an agent-- - - aj5 HelloWorld - + +For users of JDK 1.4 the bin directory of your AspectJ distribution +contains a script "aj" to perform load-time weaving. Java classes on +the CLASSPATH are loaded and woven with aspects also on the CLASSPATH +which are declared in an aop.xml file. This file is either created by +the user or generated by the compiler. Alternatively aspects can be +loaded from an explicitly defined ASPECTPATH. + +For users of JDK 1.5 the bin directory of your AspectJ distribution +contains a script "aj5" to perform load-time weaving using an agent. +This uses an aop.xml as described above. + +--To compile the HelloWorld program-- + + ajc -outjar hello.jar HelloWorld.java + +--To compile the Tracing aspect-- + + ajc -outjar tracing.jar -outxml Tracing.aj + +--To run the example-- + + set CLASSPATH to include hello.jar + + aj HelloWorld + +--To run the example with tracing-- + + set CLASSPATH to include "tracing.jar" + + aj HelloWorld + +--To run the example with tracing using ASPECTPATH-- + + set ASPECTPATH=tracing.jar + + aj HelloWorld + +--To run the example with tracing using an agent-- + + aj5 HelloWorld + diff --git a/docs/dist/doc/examples/ltw/Tracing.aj b/docs/examples/ltw/Tracing.aj similarity index 100% rename from docs/dist/doc/examples/ltw/Tracing.aj rename to docs/examples/ltw/Tracing.aj diff --git a/docs/dist/doc/examples/observer/Button.java b/docs/examples/observer/Button.java similarity index 100% rename from docs/dist/doc/examples/observer/Button.java rename to docs/examples/observer/Button.java diff --git a/docs/dist/doc/examples/observer/ColorLabel.java b/docs/examples/observer/ColorLabel.java similarity index 100% rename from docs/dist/doc/examples/observer/ColorLabel.java rename to docs/examples/observer/ColorLabel.java diff --git a/docs/dist/doc/examples/observer/Demo.java b/docs/examples/observer/Demo.java similarity index 100% rename from docs/dist/doc/examples/observer/Demo.java rename to docs/examples/observer/Demo.java diff --git a/docs/dist/doc/examples/observer/Display.java b/docs/examples/observer/Display.java similarity index 100% rename from docs/dist/doc/examples/observer/Display.java rename to docs/examples/observer/Display.java diff --git a/docs/dist/doc/examples/observer/Observer.java b/docs/examples/observer/Observer.java similarity index 100% rename from docs/dist/doc/examples/observer/Observer.java rename to docs/examples/observer/Observer.java diff --git a/docs/dist/doc/examples/observer/Subject.java b/docs/examples/observer/Subject.java similarity index 100% rename from docs/dist/doc/examples/observer/Subject.java rename to docs/examples/observer/Subject.java diff --git a/docs/dist/doc/examples/observer/SubjectObserverProtocol.java b/docs/examples/observer/SubjectObserverProtocol.java similarity index 100% rename from docs/dist/doc/examples/observer/SubjectObserverProtocol.java rename to docs/examples/observer/SubjectObserverProtocol.java diff --git a/docs/dist/doc/examples/observer/SubjectObserverProtocolImpl.java b/docs/examples/observer/SubjectObserverProtocolImpl.java similarity index 100% rename from docs/dist/doc/examples/observer/SubjectObserverProtocolImpl.java rename to docs/examples/observer/SubjectObserverProtocolImpl.java diff --git a/docs/dist/doc/examples/observer/files.lst b/docs/examples/observer/files.lst similarity index 100% rename from docs/dist/doc/examples/observer/files.lst rename to docs/examples/observer/files.lst diff --git a/docs/dist/doc/examples/spacewar/Bullet.java b/docs/examples/spacewar/Bullet.java similarity index 100% rename from docs/dist/doc/examples/spacewar/Bullet.java rename to docs/examples/spacewar/Bullet.java diff --git a/docs/dist/doc/examples/spacewar/Debug.java b/docs/examples/spacewar/Debug.java similarity index 100% rename from docs/dist/doc/examples/spacewar/Debug.java rename to docs/examples/spacewar/Debug.java diff --git a/docs/dist/doc/examples/spacewar/Display.java b/docs/examples/spacewar/Display.java similarity index 100% rename from docs/dist/doc/examples/spacewar/Display.java rename to docs/examples/spacewar/Display.java diff --git a/docs/dist/doc/examples/spacewar/Display1.java b/docs/examples/spacewar/Display1.java similarity index 100% rename from docs/dist/doc/examples/spacewar/Display1.java rename to docs/examples/spacewar/Display1.java diff --git a/docs/dist/doc/examples/spacewar/Display2.java b/docs/examples/spacewar/Display2.java similarity index 100% rename from docs/dist/doc/examples/spacewar/Display2.java rename to docs/examples/spacewar/Display2.java diff --git a/docs/dist/doc/examples/spacewar/EnergyPacket.java b/docs/examples/spacewar/EnergyPacket.java similarity index 100% rename from docs/dist/doc/examples/spacewar/EnergyPacket.java rename to docs/examples/spacewar/EnergyPacket.java diff --git a/docs/dist/doc/examples/spacewar/EnergyPacketProducer.java b/docs/examples/spacewar/EnergyPacketProducer.java similarity index 100% rename from docs/dist/doc/examples/spacewar/EnergyPacketProducer.java rename to docs/examples/spacewar/EnergyPacketProducer.java diff --git a/docs/dist/doc/examples/spacewar/EnsureShipIsAlive.java b/docs/examples/spacewar/EnsureShipIsAlive.java similarity index 100% rename from docs/dist/doc/examples/spacewar/EnsureShipIsAlive.java rename to docs/examples/spacewar/EnsureShipIsAlive.java diff --git a/docs/dist/doc/examples/spacewar/Game.java b/docs/examples/spacewar/Game.java similarity index 100% rename from docs/dist/doc/examples/spacewar/Game.java rename to docs/examples/spacewar/Game.java diff --git a/docs/dist/doc/examples/spacewar/GameSynchronization.java b/docs/examples/spacewar/GameSynchronization.java similarity index 100% rename from docs/dist/doc/examples/spacewar/GameSynchronization.java rename to docs/examples/spacewar/GameSynchronization.java diff --git a/docs/dist/doc/examples/spacewar/Makefile b/docs/examples/spacewar/Makefile similarity index 92% rename from docs/dist/doc/examples/spacewar/Makefile rename to docs/examples/spacewar/Makefile index 108d3c8c4..e425dfd55 100644 --- a/docs/dist/doc/examples/spacewar/Makefile +++ b/docs/examples/spacewar/Makefile @@ -1,12 +1,12 @@ -SHELL=bash -ACJOPTS=-verbose -nosymbols -AJC=ajc - -.PHONY: demo debug - -demo: - $(AJC) $(ACJOPTS) @demo.lst - -debug: - $(AJC) $(ACJOPTS) @debug.lst - +SHELL=bash +ACJOPTS=-verbose -nosymbols +AJC=ajc + +.PHONY: demo debug + +demo: + $(AJC) $(ACJOPTS) @demo.lst + +debug: + $(AJC) $(ACJOPTS) @debug.lst + diff --git a/docs/dist/doc/examples/spacewar/Pilot.java b/docs/examples/spacewar/Pilot.java similarity index 100% rename from docs/dist/doc/examples/spacewar/Pilot.java rename to docs/examples/spacewar/Pilot.java diff --git a/docs/dist/doc/examples/spacewar/Player.java b/docs/examples/spacewar/Player.java similarity index 100% rename from docs/dist/doc/examples/spacewar/Player.java rename to docs/examples/spacewar/Player.java diff --git a/docs/dist/doc/examples/spacewar/README.adoc b/docs/examples/spacewar/README.adoc similarity index 100% rename from docs/dist/doc/examples/spacewar/README.adoc rename to docs/examples/spacewar/README.adoc diff --git a/docs/dist/doc/examples/spacewar/Registry.java b/docs/examples/spacewar/Registry.java similarity index 100% rename from docs/dist/doc/examples/spacewar/Registry.java rename to docs/examples/spacewar/Registry.java diff --git a/docs/dist/doc/examples/spacewar/RegistrySynchronization.java b/docs/examples/spacewar/RegistrySynchronization.java similarity index 100% rename from docs/dist/doc/examples/spacewar/RegistrySynchronization.java rename to docs/examples/spacewar/RegistrySynchronization.java diff --git a/docs/dist/doc/examples/spacewar/Robot.java b/docs/examples/spacewar/Robot.java similarity index 100% rename from docs/dist/doc/examples/spacewar/Robot.java rename to docs/examples/spacewar/Robot.java diff --git a/docs/dist/doc/examples/spacewar/SWFrame.java b/docs/examples/spacewar/SWFrame.java similarity index 100% rename from docs/dist/doc/examples/spacewar/SWFrame.java rename to docs/examples/spacewar/SWFrame.java diff --git a/docs/dist/doc/examples/spacewar/Ship.java b/docs/examples/spacewar/Ship.java similarity index 100% rename from docs/dist/doc/examples/spacewar/Ship.java rename to docs/examples/spacewar/Ship.java diff --git a/docs/dist/doc/examples/spacewar/SpaceObject.java b/docs/examples/spacewar/SpaceObject.java similarity index 100% rename from docs/dist/doc/examples/spacewar/SpaceObject.java rename to docs/examples/spacewar/SpaceObject.java diff --git a/docs/dist/doc/examples/spacewar/Timer.java b/docs/examples/spacewar/Timer.java similarity index 100% rename from docs/dist/doc/examples/spacewar/Timer.java rename to docs/examples/spacewar/Timer.java diff --git a/docs/dist/doc/examples/spacewar/debug.lst b/docs/examples/spacewar/debug.lst similarity index 100% rename from docs/dist/doc/examples/spacewar/debug.lst rename to docs/examples/spacewar/debug.lst diff --git a/docs/dist/doc/examples/spacewar/demo.lst b/docs/examples/spacewar/demo.lst similarity index 100% rename from docs/dist/doc/examples/spacewar/demo.lst rename to docs/examples/spacewar/demo.lst diff --git a/docs/dist/doc/examples/telecom/AbstractSimulation.java b/docs/examples/telecom/AbstractSimulation.java similarity index 100% rename from docs/dist/doc/examples/telecom/AbstractSimulation.java rename to docs/examples/telecom/AbstractSimulation.java diff --git a/docs/dist/doc/examples/telecom/BasicSimulation.java b/docs/examples/telecom/BasicSimulation.java similarity index 100% rename from docs/dist/doc/examples/telecom/BasicSimulation.java rename to docs/examples/telecom/BasicSimulation.java diff --git a/docs/dist/doc/examples/telecom/Billing.java b/docs/examples/telecom/Billing.java similarity index 100% rename from docs/dist/doc/examples/telecom/Billing.java rename to docs/examples/telecom/Billing.java diff --git a/docs/dist/doc/examples/telecom/BillingSimulation.java b/docs/examples/telecom/BillingSimulation.java similarity index 100% rename from docs/dist/doc/examples/telecom/BillingSimulation.java rename to docs/examples/telecom/BillingSimulation.java diff --git a/docs/dist/doc/examples/telecom/Call.java b/docs/examples/telecom/Call.java similarity index 100% rename from docs/dist/doc/examples/telecom/Call.java rename to docs/examples/telecom/Call.java diff --git a/docs/dist/doc/examples/telecom/Connection.java b/docs/examples/telecom/Connection.java similarity index 100% rename from docs/dist/doc/examples/telecom/Connection.java rename to docs/examples/telecom/Connection.java diff --git a/docs/dist/doc/examples/telecom/Customer.java b/docs/examples/telecom/Customer.java similarity index 100% rename from docs/dist/doc/examples/telecom/Customer.java rename to docs/examples/telecom/Customer.java diff --git a/docs/dist/doc/examples/telecom/Local.java b/docs/examples/telecom/Local.java similarity index 100% rename from docs/dist/doc/examples/telecom/Local.java rename to docs/examples/telecom/Local.java diff --git a/docs/dist/doc/examples/telecom/LongDistance.java b/docs/examples/telecom/LongDistance.java similarity index 100% rename from docs/dist/doc/examples/telecom/LongDistance.java rename to docs/examples/telecom/LongDistance.java diff --git a/docs/dist/doc/examples/telecom/Timer.java b/docs/examples/telecom/Timer.java similarity index 100% rename from docs/dist/doc/examples/telecom/Timer.java rename to docs/examples/telecom/Timer.java diff --git a/docs/dist/doc/examples/telecom/TimerLog.java b/docs/examples/telecom/TimerLog.java similarity index 100% rename from docs/dist/doc/examples/telecom/TimerLog.java rename to docs/examples/telecom/TimerLog.java diff --git a/docs/dist/doc/examples/telecom/Timing.java b/docs/examples/telecom/Timing.java similarity index 100% rename from docs/dist/doc/examples/telecom/Timing.java rename to docs/examples/telecom/Timing.java diff --git a/docs/dist/doc/examples/telecom/TimingSimulation.java b/docs/examples/telecom/TimingSimulation.java similarity index 100% rename from docs/dist/doc/examples/telecom/TimingSimulation.java rename to docs/examples/telecom/TimingSimulation.java diff --git a/docs/dist/doc/examples/telecom/basic.lst b/docs/examples/telecom/basic.lst similarity index 100% rename from docs/dist/doc/examples/telecom/basic.lst rename to docs/examples/telecom/basic.lst diff --git a/docs/dist/doc/examples/telecom/billing.lst b/docs/examples/telecom/billing.lst similarity index 100% rename from docs/dist/doc/examples/telecom/billing.lst rename to docs/examples/telecom/billing.lst diff --git a/docs/dist/doc/examples/telecom/timing.lst b/docs/examples/telecom/timing.lst similarity index 100% rename from docs/dist/doc/examples/telecom/timing.lst rename to docs/examples/telecom/timing.lst diff --git a/docs/dist/doc/examples/tjp/Demo.java b/docs/examples/tjp/Demo.java similarity index 100% rename from docs/dist/doc/examples/tjp/Demo.java rename to docs/examples/tjp/Demo.java diff --git a/docs/dist/doc/examples/tjp/GetInfo.java b/docs/examples/tjp/GetInfo.java similarity index 100% rename from docs/dist/doc/examples/tjp/GetInfo.java rename to docs/examples/tjp/GetInfo.java diff --git a/docs/dist/doc/examples/tjp/files.lst b/docs/examples/tjp/files.lst similarity index 100% rename from docs/dist/doc/examples/tjp/files.lst rename to docs/examples/tjp/files.lst diff --git a/docs/dist/doc/examples/tracing/Circle.java b/docs/examples/tracing/Circle.java similarity index 100% rename from docs/dist/doc/examples/tracing/Circle.java rename to docs/examples/tracing/Circle.java diff --git a/docs/dist/doc/examples/tracing/ExampleMain.java b/docs/examples/tracing/ExampleMain.java similarity index 100% rename from docs/dist/doc/examples/tracing/ExampleMain.java rename to docs/examples/tracing/ExampleMain.java diff --git a/docs/dist/doc/examples/tracing/README b/docs/examples/tracing/README similarity index 96% rename from docs/dist/doc/examples/tracing/README rename to docs/examples/tracing/README index 6bf89328b..bf8e70390 100644 --- a/docs/dist/doc/examples/tracing/README +++ b/docs/examples/tracing/README @@ -1,32 +1,32 @@ - -This directory contains several examples of tracing aspects, -including a reusable tracing library and examples of -using that library. - -A lesson in the AspectJ Primer explains all of this code. - -To work with these (or any other examples), first be sure .../examples -is on your classpath, where ... is where you have installed AspectJ. - - ---To compile and run the example without tracing-- - - ajc @.../examples/tracing/notrace.lst - - java tracing.ExampleMain - - ---To compile and run the example with tracing version-- - - ajc @.../examples/tracing/tracev.lst - - java tracing.version.TraceMyClasses - -where is 1, 2, 3 or 4 - ---To use the tracing.lib.AbstractTrace aspect-- - - Make sure .../examples is in your classpath. - - In order to use this aspect, please read the documentation under - tracing/doc + +This directory contains several examples of tracing aspects, +including a reusable tracing library and examples of +using that library. + +A lesson in the AspectJ Primer explains all of this code. + +To work with these (or any other examples), first be sure .../examples +is on your classpath, where ... is where you have installed AspectJ. + + +--To compile and run the example without tracing-- + + ajc @.../examples/tracing/notrace.lst + + java tracing.ExampleMain + + +--To compile and run the example with tracing version-- + + ajc @.../examples/tracing/tracev.lst + + java tracing.version.TraceMyClasses + +where is 1, 2, 3 or 4 + +--To use the tracing.lib.AbstractTrace aspect-- + + Make sure .../examples is in your classpath. + + In order to use this aspect, please read the documentation under + tracing/doc diff --git a/docs/dist/doc/examples/tracing/Square.java b/docs/examples/tracing/Square.java similarity index 100% rename from docs/dist/doc/examples/tracing/Square.java rename to docs/examples/tracing/Square.java diff --git a/docs/dist/doc/examples/tracing/TwoDShape.java b/docs/examples/tracing/TwoDShape.java similarity index 100% rename from docs/dist/doc/examples/tracing/TwoDShape.java rename to docs/examples/tracing/TwoDShape.java diff --git a/docs/dist/doc/examples/tracing/lib/AbstractTrace.java b/docs/examples/tracing/lib/AbstractTrace.java similarity index 100% rename from docs/dist/doc/examples/tracing/lib/AbstractTrace.java rename to docs/examples/tracing/lib/AbstractTrace.java diff --git a/docs/dist/doc/examples/tracing/lib/TraceMyClasses.java b/docs/examples/tracing/lib/TraceMyClasses.java similarity index 100% rename from docs/dist/doc/examples/tracing/lib/TraceMyClasses.java rename to docs/examples/tracing/lib/TraceMyClasses.java diff --git a/docs/dist/doc/examples/tracing/notrace.lst b/docs/examples/tracing/notrace.lst similarity index 100% rename from docs/dist/doc/examples/tracing/notrace.lst rename to docs/examples/tracing/notrace.lst diff --git a/docs/dist/doc/examples/tracing/tracelib.lst b/docs/examples/tracing/tracelib.lst similarity index 100% rename from docs/dist/doc/examples/tracing/tracelib.lst rename to docs/examples/tracing/tracelib.lst diff --git a/docs/dist/doc/examples/tracing/tracev1.lst b/docs/examples/tracing/tracev1.lst similarity index 100% rename from docs/dist/doc/examples/tracing/tracev1.lst rename to docs/examples/tracing/tracev1.lst diff --git a/docs/dist/doc/examples/tracing/tracev2.lst b/docs/examples/tracing/tracev2.lst similarity index 100% rename from docs/dist/doc/examples/tracing/tracev2.lst rename to docs/examples/tracing/tracev2.lst diff --git a/docs/dist/doc/examples/tracing/tracev3.lst b/docs/examples/tracing/tracev3.lst similarity index 100% rename from docs/dist/doc/examples/tracing/tracev3.lst rename to docs/examples/tracing/tracev3.lst diff --git a/docs/dist/doc/examples/tracing/version1/Trace.java b/docs/examples/tracing/version1/Trace.java similarity index 100% rename from docs/dist/doc/examples/tracing/version1/Trace.java rename to docs/examples/tracing/version1/Trace.java diff --git a/docs/dist/doc/examples/tracing/version1/TraceMyClasses.java b/docs/examples/tracing/version1/TraceMyClasses.java similarity index 100% rename from docs/dist/doc/examples/tracing/version1/TraceMyClasses.java rename to docs/examples/tracing/version1/TraceMyClasses.java diff --git a/docs/dist/doc/examples/tracing/version2/Trace.java b/docs/examples/tracing/version2/Trace.java similarity index 100% rename from docs/dist/doc/examples/tracing/version2/Trace.java rename to docs/examples/tracing/version2/Trace.java diff --git a/docs/dist/doc/examples/tracing/version2/TraceMyClasses.java b/docs/examples/tracing/version2/TraceMyClasses.java similarity index 100% rename from docs/dist/doc/examples/tracing/version2/TraceMyClasses.java rename to docs/examples/tracing/version2/TraceMyClasses.java diff --git a/docs/dist/doc/examples/tracing/version3/Trace.java b/docs/examples/tracing/version3/Trace.java similarity index 100% rename from docs/dist/doc/examples/tracing/version3/Trace.java rename to docs/examples/tracing/version3/Trace.java diff --git a/docs/dist/doc/examples/tracing/version3/TraceMyClasses.java b/docs/examples/tracing/version3/TraceMyClasses.java similarity index 100% rename from docs/dist/doc/examples/tracing/version3/TraceMyClasses.java rename to docs/examples/tracing/version3/TraceMyClasses.java diff --git a/docs/index.adoc b/docs/index.adoc index 34dc1c780..eeefa6296 100644 --- a/docs/index.adoc +++ b/docs/index.adoc @@ -18,7 +18,7 @@ xref:adk15notebook/index.adoc[AspectJ 5 Developer's Notebook], xref:progguide/index.adoc[programming], xref:devguide/index.adoc[development] and xref:pdguide/index.adoc[problem diagnosis] guides, -link:runtime-api/index.html[API] and link:https://github.com/eclipse-aspectj/aspectj/tree/master/docs/dist/doc/examples[example code]. +link:runtime-api/index.html[API] and link:https://github.com/eclipse-aspectj/aspectj/tree/master/docs/examples[example code]. |xref:#distributions[Distributions] |https://eclipse.org/aspectj[AspectJ]; development environment support @@ -116,7 +116,7 @@ xref:dist/doc/porting.adoc[1.0]. |xref:dist/doc/changes.adoc[Changes] |Changes between historical releases up to 1.6.0. -|link:https://github.com/eclipse-aspectj/aspectj/tree/master/docs/dist/doc/examples[Examples] |AspectJ code to demonstrate some language +|link:https://github.com/eclipse-aspectj/aspectj/tree/master/docs/examples[Examples] |AspectJ code to demonstrate some language features and implement JavaBean properties, the Observer pattern, a tracing library, and a game application where aspects handle display updating. @@ -190,7 +190,7 @@ xref:progguide/index.adoc[Programming Guide], keeping the xref:progguide/semantics.adoc[Semantics appendix] nearby as the best reference for AspectJ usage. Focus initially on the join point model and pointcuts, concepts AOP adds to OOP. To read about how the -link:https://github.com/eclipse-aspectj/aspectj/tree/master/docs/dist/doc/examples[examples] work, see the +link:https://github.com/eclipse-aspectj/aspectj/tree/master/docs/examples[examples] work, see the xref:progguide/examples.adoc[Examples] section in the xref:progguide/index.adoc[Programming Guide]. View and navigate the crosscutting structure using https://eclipse.org/ajdt[AJDT]. diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java index 4af03a479..35965a5d6 100644 --- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java @@ -69,7 +69,7 @@ public class WorkingTestMain { TestUtil.runMain("out;../lib/test/testing-client.jar", "org.schmidmeier.unittests.cache.AllTimeCacheTests"); } - private static String examplesDir = "../docs/dist/doc/examples/"; + private static String examplesDir = "../docs/examples/"; private static void example(String[] argfiles, String[] classes) { List args = new ArrayList(); args.add("-verbose"); diff --git a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java index 42762fc17..c84581a33 100644 --- a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java +++ b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java @@ -92,7 +92,7 @@ public class Ajc11CompilerAdapterTest extends TestCase { } void setupTracingJava(Javac javac) { // XXX assumes module dir, doc loc - String exDir = "../docs/dist/doc/examples"; + String exDir = "../docs/examples"; javac.setSrcdir(new Path(javac.getProject(), exDir)); javac.setIncludes("tracing/*.java"); // XXX assumes tracing example } diff --git a/tests/ajcTestsExamples.xml b/tests/ajcTestsExamples.xml index bacd407cf..0c49275d4 100644 --- a/tests/ajcTestsExamples.xml +++ b/tests/ajcTestsExamples.xml @@ -1,14 +1,14 @@ - - - + - @@ -37,84 +37,84 @@ - + - - + - - + - + - + - - + - - + - - + - - + - - + - - + - - + diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml index 63313f624..6ce13fb0d 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml @@ -1569,7 +1569,7 @@ - + diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml index dede00f0a..79a942447 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml @@ -1569,7 +1569,7 @@ - + diff --git a/tests/test-other-systems.xml b/tests/test-other-systems.xml index 09c2b82e6..b43736021 100644 --- a/tests/test-other-systems.xml +++ b/tests/test-other-systems.xml @@ -683,7 +683,7 @@ location="${aj.otherSystems.dir}/examples"/> - +