From d4a6906b3012fac6e4dbaca5854fc59ba0d67e47 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Sat, 8 Jan 2022 11:50:55 +0700 Subject: [PATCH] Rename '*GuideDB' directories to their actual HTML site target names Signed-off-by: Alexander Kriegisch --- docs/adk15ProgGuideDB/ltw.xml | 16 -- .../adk15notebook.adoc | 0 .../adk15notebook.xml | 0 .../annotations.adoc | 0 .../annotations.xml | 0 .../aspectj-docs.css | 0 .../ataspectj.adoc | 0 .../ataspectj.xml | 0 .../autoboxing.adoc | 0 .../autoboxing.xml | 0 .../covariance.adoc | 0 .../covariance.xml | 0 .../dd_arrow.gif | Bin .../enumeratedtypes.adoc | 0 .../enumeratedtypes.xml | 0 .../generics.adoc | 0 .../generics.xml | 0 .../grammar.adoc | 0 .../grammar.xml | 0 docs/adk15notebook/index.adoc | 27 ++ .../joinpointsignatures.adoc | 0 .../joinpointsignatures.xml | 0 .../ltw.adoc | 2 +- docs/adk15notebook/ltw.xml | 15 ++ .../miscellaneous.adoc | 0 .../miscellaneous.xml | 0 .../pertypewithin.adoc | 0 .../pertypewithin.xml | 0 .../reflection.adoc | 0 .../reflection.xml | 0 .../varargs.adoc | 0 .../varargs.xml | 0 docs/build.xml | 24 +- docs/{devGuideDB => devguide}/aj.adoc | 0 docs/{devGuideDB => devguide}/aj.xml | 0 docs/{devGuideDB => devguide}/ajbrowser.adoc | 0 docs/{devGuideDB => devguide}/ajc.adoc | 0 docs/{devGuideDB => devguide}/ajc.xml | 0 docs/{devGuideDB => devguide}/ajdb.adoc | 0 docs/{devGuideDB => devguide}/ajdb.xml | 0 docs/{devGuideDB => devguide}/ajdee.adoc | 0 docs/{devGuideDB => devguide}/ajdee.gif | Bin docs/{devGuideDB => devguide}/ajdee.xml | 0 docs/{devGuideDB => devguide}/ajdeforte.adoc | 0 docs/{devGuideDB => devguide}/ajdeforte.xml | 0 .../ajdejbuilder.adoc | 0 .../{devGuideDB => devguide}/ajdejbuilder.xml | 0 docs/{devGuideDB => devguide}/ajdoc.adoc | 0 docs/{devGuideDB => devguide}/ajdoc.xml | 0 docs/{devGuideDB => devguide}/antsupport.adoc | 0 docs/{devGuideDB => devguide}/antsupport.xml | 0 .../{devGuideDB => devguide}/aspectj-docs.css | 0 .../aspectj-mode.adoc | 0 .../{devGuideDB => devguide}/aspectj-mode.gif | Bin .../{devGuideDB => devguide}/aspectj-mode.xml | 0 .../aspectj-mode2.gif | Bin .../compatibility.adoc | 0 .../compatibility.xml | 0 docs/{devGuideDB => devguide}/dd_arrow.gif | Bin docs/{devGuideDB => devguide}/devguide.adoc | 18 +- docs/{devGuideDB => devguide}/devguide.pdf | 0 docs/{devGuideDB => devguide}/devguide.xml | 0 docs/devguide/index.adoc | 24 ++ .../jbuilder-buildOptions.gif | Bin .../jbuilder-building.gif | Bin .../jbuilder-configs.gif | Bin .../jbuilder-structureNavigation.gif | Bin docs/{devGuideDB => devguide}/ltw.adoc | 0 docs/{devGuideDB => devguide}/ltw.xml | 0 .../netbeans-buildOptions.gif | Bin .../netbeans-building.gif | Bin .../{devGuideDB => devguide}/tools-intro.adoc | 0 docs/{devGuideDB => devguide}/tools-intro.xml | 0 docs/dist/doc/README-150.adoc | 2 +- docs/dist/doc/changes.adoc | 2 +- docs/dist/doc/index.adoc | 4 +- docs/faq/faq.adoc | 2 +- docs/{pdGuideDB => pdguide}/ajcore.adoc | 0 docs/{pdGuideDB => pdguide}/ajcore.xml | 0 .../{progGuideDB => pdguide}/aspectj-docs.css | 0 docs/pdguide/index.adoc | 44 ++++ docs/{pdGuideDB => pdguide}/ltwdump.adoc | 2 +- docs/{pdGuideDB => pdguide}/ltwdump.xml | 0 docs/{pdGuideDB => pdguide}/messages.adoc | 16 +- docs/{pdGuideDB => pdguide}/messages.xml | 0 docs/{pdGuideDB => pdguide}/pdguide.adoc | 0 docs/{pdGuideDB => pdguide}/pdguide.xml | 0 docs/{pdGuideDB => pdguide}/pointcuts.adoc | 2 +- docs/{pdGuideDB => pdguide}/pointcuts.xml | 0 docs/{pdGuideDB => pdguide}/trace.adoc | 0 docs/{pdGuideDB => pdguide}/trace.xml | 0 .../{pdGuideDB => progguide}/aspectj-docs.css | 176 ++++++------- .../{progGuideDB => progguide}/aspectjdoc.dsl | 248 +++++++++--------- docs/{progGuideDB => progguide}/aspects.gif | Bin docs/{progGuideDB => progguide}/build.sh | 0 docs/{progGuideDB => progguide}/dd_arrow.gif | Bin docs/{progGuideDB => progguide}/examples.adoc | 0 docs/{progGuideDB => progguide}/examples.xml | 0 docs/{progGuideDB => progguide}/figureUML.gif | Bin .../gettingstarted.adoc | 0 .../gettingstarted.xml | 0 docs/{progGuideDB => progguide}/idioms.adoc | 0 docs/{progGuideDB => progguide}/idioms.xml | 0 .../implementation.adoc | 0 .../implementation.xml | 0 docs/progguide/index.adoc | 30 +++ docs/{progGuideDB => progguide}/language.adoc | 0 docs/{progGuideDB => progguide}/language.xml | 0 docs/{progGuideDB => progguide}/overview.gif | Bin docs/{progGuideDB => progguide}/pitfalls.adoc | 0 docs/{progGuideDB => progguide}/pitfalls.xml | 0 docs/{progGuideDB => progguide}/preface.adoc | 0 docs/{progGuideDB => progguide}/preface.xml | 0 .../{progGuideDB => progguide}/progguide.adoc | 0 .../progguide.html.xsl | 0 docs/{progGuideDB => progguide}/progguide.xml | 0 .../quickreference.adoc | 0 .../quickreference.xml | 0 .../{progGuideDB => progguide}/semantics.adoc | 0 docs/{progGuideDB => progguide}/semantics.xml | 0 docs/{progGuideDB => progguide}/telecom.gif | Bin docs/readme-docs-module.adoc | 6 +- 122 files changed, 392 insertions(+), 268 deletions(-) delete mode 100644 docs/adk15ProgGuideDB/ltw.xml rename docs/{adk15ProgGuideDB => adk15notebook}/adk15notebook.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/adk15notebook.xml (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/annotations.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/annotations.xml (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/aspectj-docs.css (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/ataspectj.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/ataspectj.xml (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/autoboxing.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/autoboxing.xml (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/covariance.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/covariance.xml (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/dd_arrow.gif (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/enumeratedtypes.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/enumeratedtypes.xml (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/generics.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/generics.xml (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/grammar.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/grammar.xml (100%) create mode 100644 docs/adk15notebook/index.adoc rename docs/{adk15ProgGuideDB => adk15notebook}/joinpointsignatures.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/joinpointsignatures.xml (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/ltw.adoc (59%) create mode 100644 docs/adk15notebook/ltw.xml rename docs/{adk15ProgGuideDB => adk15notebook}/miscellaneous.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/miscellaneous.xml (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/pertypewithin.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/pertypewithin.xml (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/reflection.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/reflection.xml (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/varargs.adoc (100%) rename docs/{adk15ProgGuideDB => adk15notebook}/varargs.xml (100%) rename docs/{devGuideDB => devguide}/aj.adoc (100%) rename docs/{devGuideDB => devguide}/aj.xml (100%) rename docs/{devGuideDB => devguide}/ajbrowser.adoc (100%) rename docs/{devGuideDB => devguide}/ajc.adoc (100%) rename docs/{devGuideDB => devguide}/ajc.xml (100%) rename docs/{devGuideDB => devguide}/ajdb.adoc (100%) rename docs/{devGuideDB => devguide}/ajdb.xml (100%) rename docs/{devGuideDB => devguide}/ajdee.adoc (100%) rename docs/{devGuideDB => devguide}/ajdee.gif (100%) rename docs/{devGuideDB => devguide}/ajdee.xml (100%) rename docs/{devGuideDB => devguide}/ajdeforte.adoc (100%) rename docs/{devGuideDB => devguide}/ajdeforte.xml (100%) rename docs/{devGuideDB => devguide}/ajdejbuilder.adoc (100%) rename docs/{devGuideDB => devguide}/ajdejbuilder.xml (100%) rename docs/{devGuideDB => devguide}/ajdoc.adoc (100%) rename docs/{devGuideDB => devguide}/ajdoc.xml (100%) rename docs/{devGuideDB => devguide}/antsupport.adoc (100%) rename docs/{devGuideDB => devguide}/antsupport.xml (100%) rename docs/{devGuideDB => devguide}/aspectj-docs.css (100%) rename docs/{devGuideDB => devguide}/aspectj-mode.adoc (100%) rename docs/{devGuideDB => devguide}/aspectj-mode.gif (100%) rename docs/{devGuideDB => devguide}/aspectj-mode.xml (100%) rename docs/{devGuideDB => devguide}/aspectj-mode2.gif (100%) rename docs/{devGuideDB => devguide}/compatibility.adoc (100%) rename docs/{devGuideDB => devguide}/compatibility.xml (100%) rename docs/{devGuideDB => devguide}/dd_arrow.gif (100%) rename docs/{devGuideDB => devguide}/devguide.adoc (58%) rename docs/{devGuideDB => devguide}/devguide.pdf (100%) rename docs/{devGuideDB => devguide}/devguide.xml (100%) create mode 100644 docs/devguide/index.adoc rename docs/{devGuideDB => devguide}/jbuilder-buildOptions.gif (100%) rename docs/{devGuideDB => devguide}/jbuilder-building.gif (100%) rename docs/{devGuideDB => devguide}/jbuilder-configs.gif (100%) rename docs/{devGuideDB => devguide}/jbuilder-structureNavigation.gif (100%) rename docs/{devGuideDB => devguide}/ltw.adoc (100%) rename docs/{devGuideDB => devguide}/ltw.xml (100%) rename docs/{devGuideDB => devguide}/netbeans-buildOptions.gif (100%) rename docs/{devGuideDB => devguide}/netbeans-building.gif (100%) rename docs/{devGuideDB => devguide}/tools-intro.adoc (100%) rename docs/{devGuideDB => devguide}/tools-intro.xml (100%) rename docs/{pdGuideDB => pdguide}/ajcore.adoc (100%) rename docs/{pdGuideDB => pdguide}/ajcore.xml (100%) rename docs/{progGuideDB => pdguide}/aspectj-docs.css (100%) create mode 100644 docs/pdguide/index.adoc rename docs/{pdGuideDB => pdguide}/ltwdump.adoc (95%) rename docs/{pdGuideDB => pdguide}/ltwdump.xml (100%) rename docs/{pdGuideDB => pdguide}/messages.adoc (94%) rename docs/{pdGuideDB => pdguide}/messages.xml (100%) rename docs/{pdGuideDB => pdguide}/pdguide.adoc (100%) rename docs/{pdGuideDB => pdguide}/pdguide.xml (100%) rename docs/{pdGuideDB => pdguide}/pointcuts.adoc (98%) rename docs/{pdGuideDB => pdguide}/pointcuts.xml (100%) rename docs/{pdGuideDB => pdguide}/trace.adoc (100%) rename docs/{pdGuideDB => pdguide}/trace.xml (100%) rename docs/{pdGuideDB => progguide}/aspectj-docs.css (93%) rename docs/{progGuideDB => progguide}/aspectjdoc.dsl (97%) rename docs/{progGuideDB => progguide}/aspects.gif (100%) rename docs/{progGuideDB => progguide}/build.sh (100%) rename docs/{progGuideDB => progguide}/dd_arrow.gif (100%) rename docs/{progGuideDB => progguide}/examples.adoc (100%) rename docs/{progGuideDB => progguide}/examples.xml (100%) rename docs/{progGuideDB => progguide}/figureUML.gif (100%) rename docs/{progGuideDB => progguide}/gettingstarted.adoc (100%) rename docs/{progGuideDB => progguide}/gettingstarted.xml (100%) rename docs/{progGuideDB => progguide}/idioms.adoc (100%) rename docs/{progGuideDB => progguide}/idioms.xml (100%) rename docs/{progGuideDB => progguide}/implementation.adoc (100%) rename docs/{progGuideDB => progguide}/implementation.xml (100%) create mode 100644 docs/progguide/index.adoc rename docs/{progGuideDB => progguide}/language.adoc (100%) rename docs/{progGuideDB => progguide}/language.xml (100%) rename docs/{progGuideDB => progguide}/overview.gif (100%) rename docs/{progGuideDB => progguide}/pitfalls.adoc (100%) rename docs/{progGuideDB => progguide}/pitfalls.xml (100%) rename docs/{progGuideDB => progguide}/preface.adoc (100%) rename docs/{progGuideDB => progguide}/preface.xml (100%) rename docs/{progGuideDB => progguide}/progguide.adoc (100%) rename docs/{progGuideDB => progguide}/progguide.html.xsl (100%) rename docs/{progGuideDB => progguide}/progguide.xml (100%) rename docs/{progGuideDB => progguide}/quickreference.adoc (100%) rename docs/{progGuideDB => progguide}/quickreference.xml (100%) rename docs/{progGuideDB => progguide}/semantics.adoc (100%) rename docs/{progGuideDB => progguide}/semantics.xml (100%) rename docs/{progGuideDB => progguide}/telecom.gif (100%) diff --git a/docs/adk15ProgGuideDB/ltw.xml b/docs/adk15ProgGuideDB/ltw.xml deleted file mode 100644 index 4f3212fbc..000000000 --- a/docs/adk15ProgGuideDB/ltw.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Load-Time Weaving - - - Introduction - See Developer's Guide for information on - load-time weaving support in AspectJ 5. - - - diff --git a/docs/adk15ProgGuideDB/adk15notebook.adoc b/docs/adk15notebook/adk15notebook.adoc similarity index 100% rename from docs/adk15ProgGuideDB/adk15notebook.adoc rename to docs/adk15notebook/adk15notebook.adoc diff --git a/docs/adk15ProgGuideDB/adk15notebook.xml b/docs/adk15notebook/adk15notebook.xml similarity index 100% rename from docs/adk15ProgGuideDB/adk15notebook.xml rename to docs/adk15notebook/adk15notebook.xml diff --git a/docs/adk15ProgGuideDB/annotations.adoc b/docs/adk15notebook/annotations.adoc similarity index 100% rename from docs/adk15ProgGuideDB/annotations.adoc rename to docs/adk15notebook/annotations.adoc diff --git a/docs/adk15ProgGuideDB/annotations.xml b/docs/adk15notebook/annotations.xml similarity index 100% rename from docs/adk15ProgGuideDB/annotations.xml rename to docs/adk15notebook/annotations.xml diff --git a/docs/adk15ProgGuideDB/aspectj-docs.css b/docs/adk15notebook/aspectj-docs.css similarity index 100% rename from docs/adk15ProgGuideDB/aspectj-docs.css rename to docs/adk15notebook/aspectj-docs.css diff --git a/docs/adk15ProgGuideDB/ataspectj.adoc b/docs/adk15notebook/ataspectj.adoc similarity index 100% rename from docs/adk15ProgGuideDB/ataspectj.adoc rename to docs/adk15notebook/ataspectj.adoc diff --git a/docs/adk15ProgGuideDB/ataspectj.xml b/docs/adk15notebook/ataspectj.xml similarity index 100% rename from docs/adk15ProgGuideDB/ataspectj.xml rename to docs/adk15notebook/ataspectj.xml diff --git a/docs/adk15ProgGuideDB/autoboxing.adoc b/docs/adk15notebook/autoboxing.adoc similarity index 100% rename from docs/adk15ProgGuideDB/autoboxing.adoc rename to docs/adk15notebook/autoboxing.adoc diff --git a/docs/adk15ProgGuideDB/autoboxing.xml b/docs/adk15notebook/autoboxing.xml similarity index 100% rename from docs/adk15ProgGuideDB/autoboxing.xml rename to docs/adk15notebook/autoboxing.xml diff --git a/docs/adk15ProgGuideDB/covariance.adoc b/docs/adk15notebook/covariance.adoc similarity index 100% rename from docs/adk15ProgGuideDB/covariance.adoc rename to docs/adk15notebook/covariance.adoc diff --git a/docs/adk15ProgGuideDB/covariance.xml b/docs/adk15notebook/covariance.xml similarity index 100% rename from docs/adk15ProgGuideDB/covariance.xml rename to docs/adk15notebook/covariance.xml diff --git a/docs/adk15ProgGuideDB/dd_arrow.gif b/docs/adk15notebook/dd_arrow.gif similarity index 100% rename from docs/adk15ProgGuideDB/dd_arrow.gif rename to docs/adk15notebook/dd_arrow.gif diff --git a/docs/adk15ProgGuideDB/enumeratedtypes.adoc b/docs/adk15notebook/enumeratedtypes.adoc similarity index 100% rename from docs/adk15ProgGuideDB/enumeratedtypes.adoc rename to docs/adk15notebook/enumeratedtypes.adoc diff --git a/docs/adk15ProgGuideDB/enumeratedtypes.xml b/docs/adk15notebook/enumeratedtypes.xml similarity index 100% rename from docs/adk15ProgGuideDB/enumeratedtypes.xml rename to docs/adk15notebook/enumeratedtypes.xml diff --git a/docs/adk15ProgGuideDB/generics.adoc b/docs/adk15notebook/generics.adoc similarity index 100% rename from docs/adk15ProgGuideDB/generics.adoc rename to docs/adk15notebook/generics.adoc diff --git a/docs/adk15ProgGuideDB/generics.xml b/docs/adk15notebook/generics.xml similarity index 100% rename from docs/adk15ProgGuideDB/generics.xml rename to docs/adk15notebook/generics.xml diff --git a/docs/adk15ProgGuideDB/grammar.adoc b/docs/adk15notebook/grammar.adoc similarity index 100% rename from docs/adk15ProgGuideDB/grammar.adoc rename to docs/adk15notebook/grammar.adoc diff --git a/docs/adk15ProgGuideDB/grammar.xml b/docs/adk15notebook/grammar.xml similarity index 100% rename from docs/adk15ProgGuideDB/grammar.xml rename to docs/adk15notebook/grammar.xml diff --git a/docs/adk15notebook/index.adoc b/docs/adk15notebook/index.adoc new file mode 100644 index 000000000..9a69c9e14 --- /dev/null +++ b/docs/adk15notebook/index.adoc @@ -0,0 +1,27 @@ += The AspectJ^TM^ 5 Development Kit Developer's Notebook + +:doctype: book + +_by the AspectJ Team_ + +_Copyright (c) 2004, 2005 Contributors. All rights reserved._ + +This guide describes the changes to the AspectJ language in AspectJ 5. These include support for Java 5 features, +support for an annotation-based development style for aspects and new reflection and tools APIs. If you are new to +AspectJ, we recommend you start by reading the programming guide. + +**Table of Contents** + +* xref:joinpointsignatures.adoc[Join Point Signatures] +* xref:annotations.adoc[Annotations] +* xref:generics.adoc[Generics] +* xref:autoboxing.adoc[Autoboxing and Unboxing] +* xref:covariance.adoc[Covariance] +* xref:varargs.adoc[Varargs] +* xref:enumeratedtypes.adoc[Enumerated Types] +* xref:pertypewithin.adoc[The `pertypewithin` Aspect Instantiation Model] +* xref:ataspectj.adoc[An Annotation Based Development Style] +* xref:reflection.adoc[New Reflection Interfaces] +* xref:miscellaneous.adoc[Other Changes in AspectJ 5] +* xref:ltw.adoc[Load-Time Weaving] +* xref:grammar.adoc[A Grammar for the AspectJ 5 Language] diff --git a/docs/adk15ProgGuideDB/joinpointsignatures.adoc b/docs/adk15notebook/joinpointsignatures.adoc similarity index 100% rename from docs/adk15ProgGuideDB/joinpointsignatures.adoc rename to docs/adk15notebook/joinpointsignatures.adoc diff --git a/docs/adk15ProgGuideDB/joinpointsignatures.xml b/docs/adk15notebook/joinpointsignatures.xml similarity index 100% rename from docs/adk15ProgGuideDB/joinpointsignatures.xml rename to docs/adk15notebook/joinpointsignatures.xml diff --git a/docs/adk15ProgGuideDB/ltw.adoc b/docs/adk15notebook/ltw.adoc similarity index 59% rename from docs/adk15ProgGuideDB/ltw.adoc rename to docs/adk15notebook/ltw.adoc index 6e8a2adce..c6c3e73f4 100644 --- a/docs/adk15ProgGuideDB/ltw.adoc +++ b/docs/adk15notebook/ltw.adoc @@ -4,5 +4,5 @@ [[ltw-introduction]] === Introduction -See xref:../devGuideDB/ltw.adoc#ltw[Developer's Guide] for information on +See xref:../devguide/ltw.adoc#ltw[Developer's Guide] for information on load-time weaving support in AspectJ 5. diff --git a/docs/adk15notebook/ltw.xml b/docs/adk15notebook/ltw.xml new file mode 100644 index 000000000..ede34eeb1 --- /dev/null +++ b/docs/adk15notebook/ltw.xml @@ -0,0 +1,15 @@ + + + + + Load-Time Weaving + + + Introduction + See Developer's Guide for information on + load-time weaving support in AspectJ 5. + + diff --git a/docs/adk15ProgGuideDB/miscellaneous.adoc b/docs/adk15notebook/miscellaneous.adoc similarity index 100% rename from docs/adk15ProgGuideDB/miscellaneous.adoc rename to docs/adk15notebook/miscellaneous.adoc diff --git a/docs/adk15ProgGuideDB/miscellaneous.xml b/docs/adk15notebook/miscellaneous.xml similarity index 100% rename from docs/adk15ProgGuideDB/miscellaneous.xml rename to docs/adk15notebook/miscellaneous.xml diff --git a/docs/adk15ProgGuideDB/pertypewithin.adoc b/docs/adk15notebook/pertypewithin.adoc similarity index 100% rename from docs/adk15ProgGuideDB/pertypewithin.adoc rename to docs/adk15notebook/pertypewithin.adoc diff --git a/docs/adk15ProgGuideDB/pertypewithin.xml b/docs/adk15notebook/pertypewithin.xml similarity index 100% rename from docs/adk15ProgGuideDB/pertypewithin.xml rename to docs/adk15notebook/pertypewithin.xml diff --git a/docs/adk15ProgGuideDB/reflection.adoc b/docs/adk15notebook/reflection.adoc similarity index 100% rename from docs/adk15ProgGuideDB/reflection.adoc rename to docs/adk15notebook/reflection.adoc diff --git a/docs/adk15ProgGuideDB/reflection.xml b/docs/adk15notebook/reflection.xml similarity index 100% rename from docs/adk15ProgGuideDB/reflection.xml rename to docs/adk15notebook/reflection.xml diff --git a/docs/adk15ProgGuideDB/varargs.adoc b/docs/adk15notebook/varargs.adoc similarity index 100% rename from docs/adk15ProgGuideDB/varargs.adoc rename to docs/adk15notebook/varargs.adoc diff --git a/docs/adk15ProgGuideDB/varargs.xml b/docs/adk15notebook/varargs.xml similarity index 100% rename from docs/adk15ProgGuideDB/varargs.xml rename to docs/adk15notebook/varargs.xml diff --git a/docs/build.xml b/docs/build.xml index 2bfab1a0e..1f969df44 100644 --- a/docs/build.xml +++ b/docs/build.xml @@ -286,7 +286,7 @@ - + @@ -295,7 +295,7 @@ - + @@ -305,7 +305,7 @@ - + @@ -315,11 +315,11 @@ - + - @@ -327,7 +327,7 @@ - + @@ -337,11 +337,11 @@ - + - @@ -399,15 +399,15 @@ - + - + @@ -417,7 +417,7 @@ - + diff --git a/docs/devGuideDB/aj.adoc b/docs/devguide/aj.adoc similarity index 100% rename from docs/devGuideDB/aj.adoc rename to docs/devguide/aj.adoc diff --git a/docs/devGuideDB/aj.xml b/docs/devguide/aj.xml similarity index 100% rename from docs/devGuideDB/aj.xml rename to docs/devguide/aj.xml diff --git a/docs/devGuideDB/ajbrowser.adoc b/docs/devguide/ajbrowser.adoc similarity index 100% rename from docs/devGuideDB/ajbrowser.adoc rename to docs/devguide/ajbrowser.adoc diff --git a/docs/devGuideDB/ajc.adoc b/docs/devguide/ajc.adoc similarity index 100% rename from docs/devGuideDB/ajc.adoc rename to docs/devguide/ajc.adoc diff --git a/docs/devGuideDB/ajc.xml b/docs/devguide/ajc.xml similarity index 100% rename from docs/devGuideDB/ajc.xml rename to docs/devguide/ajc.xml diff --git a/docs/devGuideDB/ajdb.adoc b/docs/devguide/ajdb.adoc similarity index 100% rename from docs/devGuideDB/ajdb.adoc rename to docs/devguide/ajdb.adoc diff --git a/docs/devGuideDB/ajdb.xml b/docs/devguide/ajdb.xml similarity index 100% rename from docs/devGuideDB/ajdb.xml rename to docs/devguide/ajdb.xml diff --git a/docs/devGuideDB/ajdee.adoc b/docs/devguide/ajdee.adoc similarity index 100% rename from docs/devGuideDB/ajdee.adoc rename to docs/devguide/ajdee.adoc diff --git a/docs/devGuideDB/ajdee.gif b/docs/devguide/ajdee.gif similarity index 100% rename from docs/devGuideDB/ajdee.gif rename to docs/devguide/ajdee.gif diff --git a/docs/devGuideDB/ajdee.xml b/docs/devguide/ajdee.xml similarity index 100% rename from docs/devGuideDB/ajdee.xml rename to docs/devguide/ajdee.xml diff --git a/docs/devGuideDB/ajdeforte.adoc b/docs/devguide/ajdeforte.adoc similarity index 100% rename from docs/devGuideDB/ajdeforte.adoc rename to docs/devguide/ajdeforte.adoc diff --git a/docs/devGuideDB/ajdeforte.xml b/docs/devguide/ajdeforte.xml similarity index 100% rename from docs/devGuideDB/ajdeforte.xml rename to docs/devguide/ajdeforte.xml diff --git a/docs/devGuideDB/ajdejbuilder.adoc b/docs/devguide/ajdejbuilder.adoc similarity index 100% rename from docs/devGuideDB/ajdejbuilder.adoc rename to docs/devguide/ajdejbuilder.adoc diff --git a/docs/devGuideDB/ajdejbuilder.xml b/docs/devguide/ajdejbuilder.xml similarity index 100% rename from docs/devGuideDB/ajdejbuilder.xml rename to docs/devguide/ajdejbuilder.xml diff --git a/docs/devGuideDB/ajdoc.adoc b/docs/devguide/ajdoc.adoc similarity index 100% rename from docs/devGuideDB/ajdoc.adoc rename to docs/devguide/ajdoc.adoc diff --git a/docs/devGuideDB/ajdoc.xml b/docs/devguide/ajdoc.xml similarity index 100% rename from docs/devGuideDB/ajdoc.xml rename to docs/devguide/ajdoc.xml diff --git a/docs/devGuideDB/antsupport.adoc b/docs/devguide/antsupport.adoc similarity index 100% rename from docs/devGuideDB/antsupport.adoc rename to docs/devguide/antsupport.adoc diff --git a/docs/devGuideDB/antsupport.xml b/docs/devguide/antsupport.xml similarity index 100% rename from docs/devGuideDB/antsupport.xml rename to docs/devguide/antsupport.xml diff --git a/docs/devGuideDB/aspectj-docs.css b/docs/devguide/aspectj-docs.css similarity index 100% rename from docs/devGuideDB/aspectj-docs.css rename to docs/devguide/aspectj-docs.css diff --git a/docs/devGuideDB/aspectj-mode.adoc b/docs/devguide/aspectj-mode.adoc similarity index 100% rename from docs/devGuideDB/aspectj-mode.adoc rename to docs/devguide/aspectj-mode.adoc diff --git a/docs/devGuideDB/aspectj-mode.gif b/docs/devguide/aspectj-mode.gif similarity index 100% rename from docs/devGuideDB/aspectj-mode.gif rename to docs/devguide/aspectj-mode.gif diff --git a/docs/devGuideDB/aspectj-mode.xml b/docs/devguide/aspectj-mode.xml similarity index 100% rename from docs/devGuideDB/aspectj-mode.xml rename to docs/devguide/aspectj-mode.xml diff --git a/docs/devGuideDB/aspectj-mode2.gif b/docs/devguide/aspectj-mode2.gif similarity index 100% rename from docs/devGuideDB/aspectj-mode2.gif rename to docs/devguide/aspectj-mode2.gif diff --git a/docs/devGuideDB/compatibility.adoc b/docs/devguide/compatibility.adoc similarity index 100% rename from docs/devGuideDB/compatibility.adoc rename to docs/devguide/compatibility.adoc diff --git a/docs/devGuideDB/compatibility.xml b/docs/devguide/compatibility.xml similarity index 100% rename from docs/devGuideDB/compatibility.xml rename to docs/devguide/compatibility.xml diff --git a/docs/devGuideDB/dd_arrow.gif b/docs/devguide/dd_arrow.gif similarity index 100% rename from docs/devGuideDB/dd_arrow.gif rename to docs/devguide/dd_arrow.gif diff --git a/docs/devGuideDB/devguide.adoc b/docs/devguide/devguide.adoc similarity index 58% rename from docs/devGuideDB/devguide.adoc rename to docs/devguide/devguide.adoc index f7d32246b..2602b29da 100644 --- a/docs/devGuideDB/devguide.adoc +++ b/docs/devguide/devguide.adoc @@ -8,7 +8,7 @@ _Copyright (c) 1998-2001 Xerox Corporation, 2002 Palo Alto Research Center, Inco All rights reserved._ This guide describes how to build and deploy AspectJ programs using the AspectJ tools and facilities. See also the -xref:../progGuideDB/progguide.adoc[AspectJ Programming Guide], the documentation available with the AspectJ support +xref:../progguide/progguide.adoc[AspectJ Programming Guide], the documentation available with the AspectJ support available for various integrated development environments (e.g. https://www.eclipse.org/ajdt/[Eclipse AJDT]), and the most-recent documentation available from the https://eclipse.org/aspectj[AspectJ project page]. @@ -16,18 +16,18 @@ most-recent documentation available from the https://eclipse.org/aspectj[AspectJ ATTENTION: Please do not remove blank lines in between 'include::' statements. Otherwise, section numbers in the table of contents (TOC) can be wrong and the first section of each document missing completely. //// -include::tools-intro.adoc[] +include::tools-intro.adoc[Introduction to the AspectJ tools] -include::ajc.adoc[] +include::ajc.adoc[`ajc`, the AspectJ compiler/weaver] -include::ajdoc.adoc[] +include::ajdoc.adoc[`ajdoc`, the AspectJ API documentation generator] -include::aj.adoc[] +include::aj.adoc[`aj`, the AspectJ load-time weaving launcher] -include::ajbrowser.adoc[] +include::ajbrowser.adoc[AspectJ Browser] -include::antsupport.adoc[] +include::antsupport.adoc[AspectJ Ant Tasks] -include::ltw.adoc[] +include::ltw.adoc[Load-Time Weaving] -include::compatibility.adoc[] +include::compatibility.adoc[AspectJ version compatibility] diff --git a/docs/devGuideDB/devguide.pdf b/docs/devguide/devguide.pdf similarity index 100% rename from docs/devGuideDB/devguide.pdf rename to docs/devguide/devguide.pdf diff --git a/docs/devGuideDB/devguide.xml b/docs/devguide/devguide.xml similarity index 100% rename from docs/devGuideDB/devguide.xml rename to docs/devguide/devguide.xml diff --git a/docs/devguide/index.adoc b/docs/devguide/index.adoc new file mode 100644 index 000000000..38d20ec64 --- /dev/null +++ b/docs/devguide/index.adoc @@ -0,0 +1,24 @@ += The AspectJ^TM^ Development Environment Guide + +:doctype: book + +_by the AspectJ Team_ + +_Copyright (c) 1998-2001 Xerox Corporation, 2002 Palo Alto Research Center, Incorporated, 2003-2005 Contributors. +All rights reserved._ + +This guide describes how to build and deploy AspectJ programs using the AspectJ tools and facilities. See also the +xref:../progguide/progguide.adoc[AspectJ Programming Guide], the documentation available with the AspectJ support +available for various integrated development environments (e.g. https://www.eclipse.org/ajdt/[Eclipse AJDT]), and the +most-recent documentation available from the https://eclipse.org/aspectj[AspectJ project page]. + +**Table of Contents** + +* xref:tools-intro.adoc[Introduction to the AspectJ tools] +* xref:ajc.adoc[`ajc`, the AspectJ compiler/weaver] +* xref:ajdoc.adoc[`ajdoc`, the AspectJ API documentation generator] +* xref:aj.adoc[`aj`, the AspectJ load-time weaving launcher] +* xref:ajbrowser.adoc[AspectJ Browser] +* xref:antsupport.adoc[AspectJ Ant Tasks] +* xref:ltw.adoc[Load-Time Weaving] +* xref:compatibility.adoc[AspectJ version compatibility] diff --git a/docs/devGuideDB/jbuilder-buildOptions.gif b/docs/devguide/jbuilder-buildOptions.gif similarity index 100% rename from docs/devGuideDB/jbuilder-buildOptions.gif rename to docs/devguide/jbuilder-buildOptions.gif diff --git a/docs/devGuideDB/jbuilder-building.gif b/docs/devguide/jbuilder-building.gif similarity index 100% rename from docs/devGuideDB/jbuilder-building.gif rename to docs/devguide/jbuilder-building.gif diff --git a/docs/devGuideDB/jbuilder-configs.gif b/docs/devguide/jbuilder-configs.gif similarity index 100% rename from docs/devGuideDB/jbuilder-configs.gif rename to docs/devguide/jbuilder-configs.gif diff --git a/docs/devGuideDB/jbuilder-structureNavigation.gif b/docs/devguide/jbuilder-structureNavigation.gif similarity index 100% rename from docs/devGuideDB/jbuilder-structureNavigation.gif rename to docs/devguide/jbuilder-structureNavigation.gif diff --git a/docs/devGuideDB/ltw.adoc b/docs/devguide/ltw.adoc similarity index 100% rename from docs/devGuideDB/ltw.adoc rename to docs/devguide/ltw.adoc diff --git a/docs/devGuideDB/ltw.xml b/docs/devguide/ltw.xml similarity index 100% rename from docs/devGuideDB/ltw.xml rename to docs/devguide/ltw.xml diff --git a/docs/devGuideDB/netbeans-buildOptions.gif b/docs/devguide/netbeans-buildOptions.gif similarity index 100% rename from docs/devGuideDB/netbeans-buildOptions.gif rename to docs/devguide/netbeans-buildOptions.gif diff --git a/docs/devGuideDB/netbeans-building.gif b/docs/devguide/netbeans-building.gif similarity index 100% rename from docs/devGuideDB/netbeans-building.gif rename to docs/devguide/netbeans-building.gif diff --git a/docs/devGuideDB/tools-intro.adoc b/docs/devguide/tools-intro.adoc similarity index 100% rename from docs/devGuideDB/tools-intro.adoc rename to docs/devguide/tools-intro.adoc diff --git a/docs/devGuideDB/tools-intro.xml b/docs/devguide/tools-intro.xml similarity index 100% rename from docs/devGuideDB/tools-intro.xml rename to docs/devguide/tools-intro.xml diff --git a/docs/dist/doc/README-150.adoc b/docs/dist/doc/README-150.adoc index 1fddafaf3..e3f7c1196 100644 --- a/docs/dist/doc/README-150.adoc +++ b/docs/dist/doc/README-150.adoc @@ -4,7 +4,7 @@ _© Copyright 2005 Contributors. All rights reserved._ AspectJ 5 introduces several important changes to the language and tools in order to support Java 5 and extend the capabilities of AspectJ in -general. For language changes, see xref:../../adk15ProgGuideDB/adk15notebook.adoc[AspectJ 5 Developer's Notebook]. For tools changes, see the +general. For language changes, see xref:../../adk15notebook/adk15notebook.adoc[AspectJ 5 Developer's Notebook]. For tools changes, see the link:devguide/index.html[AspectJ Development Environment Guide], especially the section on link:devguide/ltw.html[Load-time weaving]. The changes are summarized in the faq.html#q:aspectj5features[FAQ entry on diff --git a/docs/dist/doc/changes.adoc b/docs/dist/doc/changes.adoc index 11ff5bfa6..9034ac0d1 100644 --- a/docs/dist/doc/changes.adoc +++ b/docs/dist/doc/changes.adoc @@ -86,7 +86,7 @@ Bugzilla This release contains nearly 400 bug fixes and enhancements since the 1.2.1 release. Major updates to the language are documented in the -xref:../../adk15ProgGuideDB/adk15notebook.adoc[AspectJ 5 Developer's Notebook]. There are +xref:../../adk15notebook/adk15notebook.adoc[AspectJ 5 Developer's Notebook]. There are also a number of enhancements to accompanying tools documented in the link:devguide/index.html[Developer's Guide] diff --git a/docs/dist/doc/index.adoc b/docs/dist/doc/index.adoc index 53f047719..8576bba57 100644 --- a/docs/dist/doc/index.adoc +++ b/docs/dist/doc/index.adoc @@ -14,7 +14,7 @@ for AspectJ 5. |xref:#documentation[Documentation] |xref:../../faq/faq.adoc#faq[FAQ], link:quick5.pdf[Quick Reference (AspectJ 5)], link:quick.pdf[Quick Reference (1.2.1)], -xref:../../adk15ProgGuideDB/adk15notebook.adoc[AspectJ 5 Developer's Notebook], +xref:../../adk15notebook/adk15notebook.adoc[AspectJ 5 Developer's Notebook], link:progguide/index.html[programming], link:devguide/index.html[development] and link:pdguide/index.html[problem diagnosis] guides, @@ -44,7 +44,7 @@ reference for the AspectJ 5 language. |link:quick.pdf[AspectJ Quick Reference] |This is a two-page quick reference for the AspectJ language. -|xref:../../adk15ProgGuideDB/adk15notebook.adoc[AspectJ 5 Developer's Notebook] + +|xref:../../adk15notebook/adk15notebook.adoc[AspectJ 5 Developer's Notebook] + (printable link:adk15notebook/printable.html[html]) |This describes the changes to the AspectJ language and tools introduced in the AspectJ 5 Development Kit. These changes are additive, and are not yet reflected diff --git a/docs/faq/faq.adoc b/docs/faq/faq.adoc index 1a5f727ae..edc265c11 100644 --- a/docs/faq/faq.adoc +++ b/docs/faq/faq.adoc @@ -2591,7 +2591,7 @@ JBuilder, and NetBeans through a common API, AJDE. *Q:* What are the new features of AspectJ 5? *A:* All the new features are documented in the -xref:../adk15ProgGuideDB/adk15notebook.adoc[AspectJ 5 Developer's Notebook] and the +xref:../adk15notebook/adk15notebook.adoc[AspectJ 5 Developer's Notebook] and the link:devguide/index.html[AspectJ Development Environment Guide]. To summarize: diff --git a/docs/pdGuideDB/ajcore.adoc b/docs/pdguide/ajcore.adoc similarity index 100% rename from docs/pdGuideDB/ajcore.adoc rename to docs/pdguide/ajcore.adoc diff --git a/docs/pdGuideDB/ajcore.xml b/docs/pdguide/ajcore.xml similarity index 100% rename from docs/pdGuideDB/ajcore.xml rename to docs/pdguide/ajcore.xml diff --git a/docs/progGuideDB/aspectj-docs.css b/docs/pdguide/aspectj-docs.css similarity index 100% rename from docs/progGuideDB/aspectj-docs.css rename to docs/pdguide/aspectj-docs.css diff --git a/docs/pdguide/index.adoc b/docs/pdguide/index.adoc new file mode 100644 index 000000000..79940f9ff --- /dev/null +++ b/docs/pdguide/index.adoc @@ -0,0 +1,44 @@ += The AspectJ^TM^ Problem Diagnosis Guide + +:doctype: book + +_by the AspectJ Team_ + +_Copyright (c) 2006 IBM Corporation and others. 2006 Contributors. All rights reserved._ + +This guide describes how to configure the AspectJ compiler/weaver to provide +information for diagnosing problems in the input programs, the +compiler/weaver or its configuration. + +The AspectJ compiler and weaver can provide lots of information for diagnosing +problems in building AspectJ programs. For problems in the input program, +there are a number of default warning and error messages, as well as many +configurable "lint" messages, all of which can be emitted normally, +logged using standard facilities, or intercepted programmatically. +These are discussed in xref:messages.adoc#messages[Messages]. Since most errors +relate to writing pointcuts incorrectly, there is a section on +xref:pointcuts.adoc#pointcuts[Debugging Pointcuts]. + +For problems with the compiler/weaver itself there are three facilities +that enable the AspectJ developers to resolve bugs even when it is +too hard to deliver a reproducible test case: + +* xref:trace.adoc#trace[Tracing] can be enabled to track progress up to the time of a failure; +* xref:ajcore.adoc#ajcore[AspectJ Core Files] can give a relatively complete picture of the state of + the world at the time of a failure; and +* xref:ltwdump.adoc#ltwdump[Dumping classes during load-time weaving] is a way to capture both input and output classes during load-time weaving. + +This guide describes how to configure messages to get the right information +and how to configure traces, dumps, and core files. Although the compiler/weaver +operates in roughly three modes (from the command-line, embedded in an IDE, +and enabled as load-time weaving), the principles are basically the same for +all modes. The differences lie in how to set up diagnostics and what +information is likely to be relevant. + +**Table of Contents** + +* xref:messages.adoc[Messages] +* xref:pointcuts.adoc[Debugging Pointcuts] +* xref:trace.adoc[Tracing] +* xref:ajcore.adoc[AspectJ Core Files] +* xref:ltwdump.adoc[Dumping classes during load-time weaving] diff --git a/docs/pdGuideDB/ltwdump.adoc b/docs/pdguide/ltwdump.adoc similarity index 95% rename from docs/pdGuideDB/ltwdump.adoc rename to docs/pdguide/ltwdump.adoc index 627be6635..8442a36a3 100644 --- a/docs/pdGuideDB/ltwdump.adoc +++ b/docs/pdguide/ltwdump.adoc @@ -20,7 +20,7 @@ configure the weaver to dump the input classes as well. For details of how to configure byte-code dumping, see the AspectJ Development Environment Guide section on -xref:../devguide/ltw-configuration.html#configuring-load-time-weaving-with-aopxml-files[Configuring +xref:../devguide/ltw.html#configuring-load-time-weaving-with-aopxml-files[Configuring Load-time Weaving]. Following is a simple example. [[ltwdump-examples]] diff --git a/docs/pdGuideDB/ltwdump.xml b/docs/pdguide/ltwdump.xml similarity index 100% rename from docs/pdGuideDB/ltwdump.xml rename to docs/pdguide/ltwdump.xml diff --git a/docs/pdGuideDB/messages.adoc b/docs/pdguide/messages.adoc similarity index 94% rename from docs/pdGuideDB/messages.adoc rename to docs/pdguide/messages.adoc index efff9be24..b9b1779d5 100644 --- a/docs/pdGuideDB/messages.adoc +++ b/docs/pdguide/messages.adoc @@ -19,9 +19,9 @@ summarizes some of the more relevant messages. The compiler offers `-verbose`, `-warning`, and `-XLint` options when invoked using the command-line, Ant, or embedded in an IDE. All options are listed in the AspectJ Development Environment Guide sections for -xref:../devGuideDB/ajc.adoc#ajc[Ajc] and -xref:../devGuideDB/antsupport.adoc#antTasks[Ant Tasks]. The -xref:../devGuideDB/ltw.adoc#ltw[Load-time Weaving] section describes how to +xref:../devguide/ajc.adoc#ajc[Ajc] and +xref:../devguide/antsupport.adoc#antTasks[Ant Tasks]. The +xref:../devguide/ltw.adoc#ltw[Load-time Weaving] section describes how to use XML configuration files and system properties to pass options to the weaver. (You can also pass options to the weaver using system properties in build- time weaving.) The `-verbose` option has the effect of @@ -38,9 +38,9 @@ compiler and weaver messages. The tables below list some options, System Properties (for LTW only) and Java 5 annotations used to control AspectJ messages. The method of configuration depends on your environment so please refer to the -relevant documentation for xref:../devGuideDB/ajc.adoc[ajc], -xref:../devGuideDB/antsupport.adoc#antTasks[Ant] or -xref:../devGuideDB/ltw.adoc#weaver-options[LTW]. +relevant documentation for xref:../devguide/ajc.adoc[ajc], +xref:../devguide/antsupport.adoc#antTasks[Ant] or +xref:../devguide/ltw.adoc#weaver-options[LTW]. [cols=",",options="header",] |=== @@ -59,9 +59,9 @@ output .class files.) |`messageHolderClass`/ `-XmessageHolderClass:` |In Ant tasks and LTW respectively specify the class to receive all messages. See -xref:../devGuideDB/antsupport.adoc#antTasks-iajc-options[iajc task +xref:../devguide/antsupport.adoc#antTasks-iajc-options[iajc task options] or -xref:../devGuideDB/ltw.adoc#weaver-options[Weaver Options]. +xref:../devguide/ltw.adoc#weaver-options[Weaver Options]. |=== [cols=",",options="header",] diff --git a/docs/pdGuideDB/messages.xml b/docs/pdguide/messages.xml similarity index 100% rename from docs/pdGuideDB/messages.xml rename to docs/pdguide/messages.xml diff --git a/docs/pdGuideDB/pdguide.adoc b/docs/pdguide/pdguide.adoc similarity index 100% rename from docs/pdGuideDB/pdguide.adoc rename to docs/pdguide/pdguide.adoc diff --git a/docs/pdGuideDB/pdguide.xml b/docs/pdguide/pdguide.xml similarity index 100% rename from docs/pdGuideDB/pdguide.xml rename to docs/pdguide/pdguide.xml diff --git a/docs/pdGuideDB/pointcuts.adoc b/docs/pdguide/pointcuts.adoc similarity index 98% rename from docs/pdGuideDB/pointcuts.adoc rename to docs/pdguide/pointcuts.adoc index 7f17ae94b..ecd964c57 100644 --- a/docs/pdGuideDB/pointcuts.adoc +++ b/docs/pdguide/pointcuts.adoc @@ -49,7 +49,7 @@ each join point? This translates to `this()`, `target()`, `args()`, . Are there any advice or implementation limitations at issue? This involves knowing the few constraints on AspectJ imposed by Java bytecode as listed in the AspectJ Programming Guide section on -xref:../progGuideDB/implementation.adoc#implementation[Implementation Notes]. +xref:../progguide/implementation.adoc#implementation[Implementation Notes]. It's much faster to iterate a pointcut at compile-time using declare warning (even better, some errors are identified at parse-time in the diff --git a/docs/pdGuideDB/pointcuts.xml b/docs/pdguide/pointcuts.xml similarity index 100% rename from docs/pdGuideDB/pointcuts.xml rename to docs/pdguide/pointcuts.xml diff --git a/docs/pdGuideDB/trace.adoc b/docs/pdguide/trace.adoc similarity index 100% rename from docs/pdGuideDB/trace.adoc rename to docs/pdguide/trace.adoc diff --git a/docs/pdGuideDB/trace.xml b/docs/pdguide/trace.xml similarity index 100% rename from docs/pdGuideDB/trace.xml rename to docs/pdguide/trace.xml diff --git a/docs/pdGuideDB/aspectj-docs.css b/docs/progguide/aspectj-docs.css similarity index 93% rename from docs/pdGuideDB/aspectj-docs.css rename to docs/progguide/aspectj-docs.css index 98842dfcd..9c2f5d4fc 100644 --- a/docs/pdGuideDB/aspectj-docs.css +++ b/docs/progguide/aspectj-docs.css @@ -1,89 +1,89 @@ -body { - font-family: "Lucida Grande", "Trebuchet MS", sans-serif; - line-height: 1.1em; - } - -h1 { - margin-bottom: 3px; - padding-bottom: 0px; - line-height: 1.1em; -} - -h2 { - font-size: 130%; - font-weight: bold ; - line-height: 16px; - color: #FFFFFF; - background-color: #0080C0; - padding: 5px; -} - -h3 { - font-size: 110%; - font-weight: bold ; - line-height: 14px; - color: #FFFFFF; - background-color: orange; - padding: 5px; -} - -tt { - font-size: 120%; - color: #00AAF0; - } - -tt tt { - font-size: 100%; - } - -.programlisting { - padding-top: 5px; - border: 2px solid #ccc; - background: #eee; - font-size: 120%; - color: #111199; - - } - -.term { - color: #111199; - } - -.variablelist dd { - margin-left: 18px; - padding-left: 20px; - background: url(dd_arrow.gif) no-repeat 0 2px; - } - -.toc dt { - font-size: 110%; - padding-bottom: 0px; - margin-bottom: 5px; - } - -.toc dl dd dt { - font-size: 100%; - } - -.toc dt { - font-size: 100% - margin-bottom: 0; - } - -.informaltable table { - margin-left: 5%; - } - -.informaltable th { - background-color: orange; - padding: 1px; - } - -ul li { - line-height: 1.2em; - } - -.keyword { - font-weight: bold; - color: purple; +body { + font-family: "Lucida Grande", "Trebuchet MS", sans-serif; + line-height: 1.1em; + } + +h1 { + margin-bottom: 3px; + padding-bottom: 0px; + line-height: 1.1em; +} + +h2 { + font-size: 130%; + font-weight: bold ; + line-height: 16px; + color: #FFFFFF; + background-color: #0080C0; + padding: 5px; +} + +h3 { + font-size: 110%; + font-weight: bold ; + line-height: 14px; + color: #FFFFFF; + background-color: orange; + padding: 5px; +} + +tt { + font-size: 120%; + color: #00AAF0; + } + +tt tt { + font-size: 100%; + } + +.programlisting { + padding-top: 5px; + border: 2px solid #ccc; + background: #eee; + font-size: 120%; + color: #111199; + + } + +.term { + color: #111199; + } + +.variablelist dd { + margin-left: 18px; + padding-left: 20px; + background: url(dd_arrow.gif) no-repeat 0 2px; + } + +.toc dt { + font-size: 110%; + padding-bottom: 0px; + margin-bottom: 5px; + } + +.toc dl dd dt { + font-size: 100%; + } + +.toc dt { + font-size: 100% + margin-bottom: 0; + } + +.informaltable table { + margin-left: 5%; + } + +.informaltable th { + background-color: orange; + padding: 1px; + } + +ul li { + line-height: 1.2em; + } + +.keyword { + font-weight: bold; + color: purple; } \ No newline at end of file diff --git a/docs/progGuideDB/aspectjdoc.dsl b/docs/progguide/aspectjdoc.dsl similarity index 97% rename from docs/progGuideDB/aspectjdoc.dsl rename to docs/progguide/aspectjdoc.dsl index 37ce64bd6..4db3b678e 100644 --- a/docs/progGuideDB/aspectjdoc.dsl +++ b/docs/progguide/aspectjdoc.dsl @@ -1,124 +1,124 @@ - - -]> - - - - - - - - -;; Specify the CSS stylesheet to use -(define %stylesheet% "../../style.css") - -;; Suppress Lists of Tables, Examples, ... -(define ($generate-book-lot-list$) - '()) - -;; Display only the first two section levels in the table of contents -(define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 2 - 1)) - -;; Make references be appendices (or chapters), not parts. -(define (en-label-number-format-list) - (list - (list (normalize "set") "1") - (list (normalize "book") "1") - (list (normalize "prefix") "1") - (list (normalize "part") "I") - (list (normalize "chapter") "1") - (list (normalize "appendix") "A") - ;;(list (normalize "reference") "1") ; references-as-chapters - (list (normalize "reference") "A") ; references-as-appendices - (list (normalize "example") "1") - (list (normalize "figure") "1") - (list (normalize "table") "1") - (list (normalize "procedure") "1") - (list (normalize "step") "1") - (list (normalize "refsect1") "1") - (list (normalize "refsect2") "1") - (list (normalize "refsect3") "1") - (list (normalize "sect1") "1") - (list (normalize "sect2") "1") - (list (normalize "sect3") "1") - (list (normalize "sect4") "1") - (list (normalize "sect5") "1") - (list (normalize "section") "1") - )) - ;;; for references-as-appendices - (define (reference-number-sibling-list cmp) (list (normalize "appendix"))) - (define (appendix-number-sibling-list cmp) (list (normalize "reference"))) - ;;; for references-as-chapters - ;;(define (reference-number-sibling-list cmp) (list (normalize "chapter"))) - ;;(define (chapter-number-sibling-list cmp) (list (normalize "reference"))) - - - - - - - - - - - - -;; Suppress Lists of Tables, Examples, ... -(define ($generate-book-lot-list$) - '()) - -;; Display only the first two section levels in the table of contents -(define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 2 - 1)) - -(define %two-side% #t) -(define bop-footnotes #t) ; doesn't seem to work - -;; Make references be appendices (or chapters), not parts. -(define (en-label-number-format-list) - (list - (list (normalize "set") "1") - (list (normalize "book") "1") - (list (normalize "prefix") "1") - (list (normalize "part") "I") - (list (normalize "chapter") "1") - (list (normalize "appendix") "A") - ;;(list (normalize "reference") "1") ; references-as-chapters - (list (normalize "reference") "A") ; references-as-appendices - (list (normalize "example") "1") - (list (normalize "figure") "1") - (list (normalize "table") "1") - (list (normalize "procedure") "1") - (list (normalize "step") "1") - (list (normalize "refsect1") "1") - (list (normalize "refsect2") "1") - (list (normalize "refsect3") "1") - (list (normalize "sect1") "1") - (list (normalize "sect2") "1") - (list (normalize "sect3") "1") - (list (normalize "sect4") "1") - (list (normalize "sect5") "1") - (list (normalize "section") "1") - )) - ;;; for references-as-appendices - (define (reference-number-sibling-list cmp) (list (normalize "appendix"))) - (define (appendix-number-sibling-list cmp) (list (normalize "reference"))) - ;;; for references-as-chapters - ;;(define (reference-number-sibling-list cmp) (list (normalize "chapter"))) - ;;(define (chapter-number-sibling-list cmp) (list (normalize "reference"))) - - - - - - - - - - + + +]> + + + + + + + + +;; Specify the CSS stylesheet to use +(define %stylesheet% "../../style.css") + +;; Suppress Lists of Tables, Examples, ... +(define ($generate-book-lot-list$) + '()) + +;; Display only the first two section levels in the table of contents +(define (toc-depth nd) + (if (string=? (gi nd) (normalize "book")) + 2 + 1)) + +;; Make references be appendices (or chapters), not parts. +(define (en-label-number-format-list) + (list + (list (normalize "set") "1") + (list (normalize "book") "1") + (list (normalize "prefix") "1") + (list (normalize "part") "I") + (list (normalize "chapter") "1") + (list (normalize "appendix") "A") + ;;(list (normalize "reference") "1") ; references-as-chapters + (list (normalize "reference") "A") ; references-as-appendices + (list (normalize "example") "1") + (list (normalize "figure") "1") + (list (normalize "table") "1") + (list (normalize "procedure") "1") + (list (normalize "step") "1") + (list (normalize "refsect1") "1") + (list (normalize "refsect2") "1") + (list (normalize "refsect3") "1") + (list (normalize "sect1") "1") + (list (normalize "sect2") "1") + (list (normalize "sect3") "1") + (list (normalize "sect4") "1") + (list (normalize "sect5") "1") + (list (normalize "section") "1") + )) + ;;; for references-as-appendices + (define (reference-number-sibling-list cmp) (list (normalize "appendix"))) + (define (appendix-number-sibling-list cmp) (list (normalize "reference"))) + ;;; for references-as-chapters + ;;(define (reference-number-sibling-list cmp) (list (normalize "chapter"))) + ;;(define (chapter-number-sibling-list cmp) (list (normalize "reference"))) + + + + + + + + + + + + +;; Suppress Lists of Tables, Examples, ... +(define ($generate-book-lot-list$) + '()) + +;; Display only the first two section levels in the table of contents +(define (toc-depth nd) + (if (string=? (gi nd) (normalize "book")) + 2 + 1)) + +(define %two-side% #t) +(define bop-footnotes #t) ; doesn't seem to work + +;; Make references be appendices (or chapters), not parts. +(define (en-label-number-format-list) + (list + (list (normalize "set") "1") + (list (normalize "book") "1") + (list (normalize "prefix") "1") + (list (normalize "part") "I") + (list (normalize "chapter") "1") + (list (normalize "appendix") "A") + ;;(list (normalize "reference") "1") ; references-as-chapters + (list (normalize "reference") "A") ; references-as-appendices + (list (normalize "example") "1") + (list (normalize "figure") "1") + (list (normalize "table") "1") + (list (normalize "procedure") "1") + (list (normalize "step") "1") + (list (normalize "refsect1") "1") + (list (normalize "refsect2") "1") + (list (normalize "refsect3") "1") + (list (normalize "sect1") "1") + (list (normalize "sect2") "1") + (list (normalize "sect3") "1") + (list (normalize "sect4") "1") + (list (normalize "sect5") "1") + (list (normalize "section") "1") + )) + ;;; for references-as-appendices + (define (reference-number-sibling-list cmp) (list (normalize "appendix"))) + (define (appendix-number-sibling-list cmp) (list (normalize "reference"))) + ;;; for references-as-chapters + ;;(define (reference-number-sibling-list cmp) (list (normalize "chapter"))) + ;;(define (chapter-number-sibling-list cmp) (list (normalize "reference"))) + + + + + + + + + + diff --git a/docs/progGuideDB/aspects.gif b/docs/progguide/aspects.gif similarity index 100% rename from docs/progGuideDB/aspects.gif rename to docs/progguide/aspects.gif diff --git a/docs/progGuideDB/build.sh b/docs/progguide/build.sh similarity index 100% rename from docs/progGuideDB/build.sh rename to docs/progguide/build.sh diff --git a/docs/progGuideDB/dd_arrow.gif b/docs/progguide/dd_arrow.gif similarity index 100% rename from docs/progGuideDB/dd_arrow.gif rename to docs/progguide/dd_arrow.gif diff --git a/docs/progGuideDB/examples.adoc b/docs/progguide/examples.adoc similarity index 100% rename from docs/progGuideDB/examples.adoc rename to docs/progguide/examples.adoc diff --git a/docs/progGuideDB/examples.xml b/docs/progguide/examples.xml similarity index 100% rename from docs/progGuideDB/examples.xml rename to docs/progguide/examples.xml diff --git a/docs/progGuideDB/figureUML.gif b/docs/progguide/figureUML.gif similarity index 100% rename from docs/progGuideDB/figureUML.gif rename to docs/progguide/figureUML.gif diff --git a/docs/progGuideDB/gettingstarted.adoc b/docs/progguide/gettingstarted.adoc similarity index 100% rename from docs/progGuideDB/gettingstarted.adoc rename to docs/progguide/gettingstarted.adoc diff --git a/docs/progGuideDB/gettingstarted.xml b/docs/progguide/gettingstarted.xml similarity index 100% rename from docs/progGuideDB/gettingstarted.xml rename to docs/progguide/gettingstarted.xml diff --git a/docs/progGuideDB/idioms.adoc b/docs/progguide/idioms.adoc similarity index 100% rename from docs/progGuideDB/idioms.adoc rename to docs/progguide/idioms.adoc diff --git a/docs/progGuideDB/idioms.xml b/docs/progguide/idioms.xml similarity index 100% rename from docs/progGuideDB/idioms.xml rename to docs/progguide/idioms.xml diff --git a/docs/progGuideDB/implementation.adoc b/docs/progguide/implementation.adoc similarity index 100% rename from docs/progGuideDB/implementation.adoc rename to docs/progguide/implementation.adoc diff --git a/docs/progGuideDB/implementation.xml b/docs/progguide/implementation.xml similarity index 100% rename from docs/progGuideDB/implementation.xml rename to docs/progguide/implementation.xml diff --git a/docs/progguide/index.adoc b/docs/progguide/index.adoc new file mode 100644 index 000000000..eb1b42375 --- /dev/null +++ b/docs/progguide/index.adoc @@ -0,0 +1,30 @@ += The AspectJ^TM^ Programming Guide + +:doctype: book + +_by the AspectJ Team_ + +_Copyright (c) 1998-2001 Xerox Corporation, 2002 Palo Alto Research Center, Incorporated, 2003-2005 Contributors. +All rights reserved._ + +This programming guide describes the AspectJ language. A companion guide describes the tools which are part of the +AspectJ development environment. + +* If you are completely new to AspectJ, please read the xref:gettingstarted.adoc#starting[getting started] chapter for a + broad overview of AspectJ programming. +* If you are already familiar with AspectJ, but want a deeper understanding, you can learn more about the + xref:language.adoc#language[AspectJ language] and look at the examples in the chapter. +* If you want a more formal definition of AspectJ, please refer to the xref:semantics.adoc#semantics[language semantics] + section. + +**Table of Contents** + +* xref:preface.adoc[Preface] +* xref:gettingstarted.adoc[Getting Started with AspectJ] +* xref:language.adoc[The AspectJ Language] +* xref:examples.adoc[Examples] +* xref:idioms.adoc[Idioms] +* xref:pitfalls.adoc[Pitfalls] +* xref:quickreference.adoc[AspectJ Quick Reference] +* xref:semantics.adoc[Language Semantics] +* xref:implementation.adoc[Implementation Notes] diff --git a/docs/progGuideDB/language.adoc b/docs/progguide/language.adoc similarity index 100% rename from docs/progGuideDB/language.adoc rename to docs/progguide/language.adoc diff --git a/docs/progGuideDB/language.xml b/docs/progguide/language.xml similarity index 100% rename from docs/progGuideDB/language.xml rename to docs/progguide/language.xml diff --git a/docs/progGuideDB/overview.gif b/docs/progguide/overview.gif similarity index 100% rename from docs/progGuideDB/overview.gif rename to docs/progguide/overview.gif diff --git a/docs/progGuideDB/pitfalls.adoc b/docs/progguide/pitfalls.adoc similarity index 100% rename from docs/progGuideDB/pitfalls.adoc rename to docs/progguide/pitfalls.adoc diff --git a/docs/progGuideDB/pitfalls.xml b/docs/progguide/pitfalls.xml similarity index 100% rename from docs/progGuideDB/pitfalls.xml rename to docs/progguide/pitfalls.xml diff --git a/docs/progGuideDB/preface.adoc b/docs/progguide/preface.adoc similarity index 100% rename from docs/progGuideDB/preface.adoc rename to docs/progguide/preface.adoc diff --git a/docs/progGuideDB/preface.xml b/docs/progguide/preface.xml similarity index 100% rename from docs/progGuideDB/preface.xml rename to docs/progguide/preface.xml diff --git a/docs/progGuideDB/progguide.adoc b/docs/progguide/progguide.adoc similarity index 100% rename from docs/progGuideDB/progguide.adoc rename to docs/progguide/progguide.adoc diff --git a/docs/progGuideDB/progguide.html.xsl b/docs/progguide/progguide.html.xsl similarity index 100% rename from docs/progGuideDB/progguide.html.xsl rename to docs/progguide/progguide.html.xsl diff --git a/docs/progGuideDB/progguide.xml b/docs/progguide/progguide.xml similarity index 100% rename from docs/progGuideDB/progguide.xml rename to docs/progguide/progguide.xml diff --git a/docs/progGuideDB/quickreference.adoc b/docs/progguide/quickreference.adoc similarity index 100% rename from docs/progGuideDB/quickreference.adoc rename to docs/progguide/quickreference.adoc diff --git a/docs/progGuideDB/quickreference.xml b/docs/progguide/quickreference.xml similarity index 100% rename from docs/progGuideDB/quickreference.xml rename to docs/progguide/quickreference.xml diff --git a/docs/progGuideDB/semantics.adoc b/docs/progguide/semantics.adoc similarity index 100% rename from docs/progGuideDB/semantics.adoc rename to docs/progguide/semantics.adoc diff --git a/docs/progGuideDB/semantics.xml b/docs/progguide/semantics.xml similarity index 100% rename from docs/progGuideDB/semantics.xml rename to docs/progguide/semantics.xml diff --git a/docs/progGuideDB/telecom.gif b/docs/progguide/telecom.gif similarity index 100% rename from docs/progGuideDB/telecom.gif rename to docs/progguide/telecom.gif diff --git a/docs/readme-docs-module.adoc b/docs/readme-docs-module.adoc index 6eda74250..34a2bc077 100644 --- a/docs/readme-docs-module.adoc +++ b/docs/readme-docs-module.adoc @@ -6,9 +6,9 @@ This module contains the sources for the documentation delivered with the AspectJ distribution and for various internal, teaching, and online works: -* `devGuideDB`: DocBook sources for the AspectJ Development Environment Guide -* `progGuideDB`: DocBook sources for the AspectJ Programming Language Guide -* `faq`: DocBook sources for the AspectJ Frequently Asked Questions +* `devguide`: AsciiDoc sources for the AspectJ Development Environment Guide +* `progguide`: AsciiDoc sources for the AspectJ Programming Language Guide +* `faq`: AsciiDoc sources for the AspectJ Frequently Asked Questions * `sandbox`: a collection of sample AspectJ programs, tools built on the AspectJ API's, script snippets, and instructional trails, all intended to serve as sources for documentation. See xref:sandbox/readme-sandbox.adoc[]. -- 2.39.5