From 2f2416bd5de9a0f4f83fcf15d9b6a8f32d39bc47 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Thu, 15 Feb 2024 08:59:28 +0700 Subject: [PATCH] Replace links to https://www.eclipse.org/aspectj/doc/next This part of the website is outdated and will be deleted. Instead, link to ADOCs right in the GitHub repository. Signed-off-by: Alexander Kriegisch --- docs/developer/IDE.md | 4 ++-- docs/release/README-1.5.0.adoc | 4 +--- .../org/aspectj/weaver/patterns/SignaturePattern.java | 8 ++++---- tests/bugs164/pr265695/Asp.aj | 2 +- tests/bugs164/pr265695/AspNew.aj | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/docs/developer/IDE.md b/docs/developer/IDE.md index b8a34a04c..41d9b3041 100644 --- a/docs/developer/IDE.md +++ b/docs/developer/IDE.md @@ -9,7 +9,7 @@ are AspectJ plugins for Maven, Gradle, Mill and Ant. Of course, you can use and other IDE and build tool or simply use your trusted text editor of choice and compile using the AspectJ Compiler _ajc_ from the command line. -Please refer to the [AspectJ Development Environment Guide](https://www.eclipse.org/aspectj/doc/next/devguide/printable.html) +Please refer to the [AspectJ Development Environment Guide](../devguide/index.adoc) for more details about on-board AspectJ tools, such as _ajc_ (compiler), _ajdoc_ (aspect-enriched Javadoc), _aj_ (load-time weaving helper) as well as basic information about load-time weaving configuration and the built-in Ant task for AspectJ. @@ -107,7 +107,7 @@ Java/Scala) and AspectJ (for weaving aspects) in the same module. ### Ant As mentioned in the introduction, AspectJ features its own Ant task, which is described in -[this chapter](https://www.eclipse.org/aspectj/doc/next/devguide/printable.html#antTasks) of the Development Environment +[this chapter](../devguide/antsupport.adoc) of the Development Environment Guide. ### Command line diff --git a/docs/release/README-1.5.0.adoc b/docs/release/README-1.5.0.adoc index 1f4e377ed..f11c97d11 100644 --- a/docs/release/README-1.5.0.adoc +++ b/docs/release/README-1.5.0.adoc @@ -11,9 +11,7 @@ changes are summarized in the xref:../faq/faq.adoc#AspectJ5[FAQ entry on AspectJ 5]. Some of the other documentation has not been updated for AspectJ 5. For -the latest documentation, see -https://eclipse.org/aspectj/doc/next/index.html, linked off -https://eclipse.org/aspectj/doc/latest/index.html[the AspectJ documentation home page]. +the latest documentation, see xref:../index.adoc[the AspectJ documentation home page]. For information on bug fixes in AspectJ 5 v1.5.0, see the xref:changes.adoc[changes] document. diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java index 33f0b53eb..d04d127a4 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java @@ -325,7 +325,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern { } // if we got a "MAYBE" it's worth looking at the other signatures // The first signature is the subject signature - and against it we must match modifiers/annotations/throws - // see https://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html + // see https://github.com/eclipse-aspectj/aspectj/blob/master/docs/adk15notebook/joinpointsignatures.adoc#join-point-modifiers subjectMatch = false; // Early exit if (wantsAnnotationMatch) { @@ -346,7 +346,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern { } // Only the subject is checked for modifiers - // see https://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html + // see https://github.com/eclipse-aspectj/aspectj/blob/master/docs/adk15notebook/joinpointsignatures.adoc#join-point-modifiers if (subjectMatch && !modifiers.matches(aMember.getModifiers())) { return FuzzyBoolean.NO; } @@ -366,7 +366,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern { } // Only the subject is checked for annotations (239441/119749) - // see https://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html + // see https://github.com/eclipse-aspectj/aspectj/blob/master/docs/adk15notebook/joinpointsignatures.adoc#join-point-modifiers if (subjectMatch) { // The annotations must match if specified if (!matchesAnnotations(aMember, inAWorld).alwaysTrue()) { @@ -717,7 +717,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern { return FuzzyBoolean.YES; } else { // do NOT look at ancestor members... only the subject can have an annotation match - // see https://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html + // see https://github.com/eclipse-aspectj/aspectj/blob/master/docs/adk15notebook/joinpointsignatures.adoc#join-point-modifiers return FuzzyBoolean.NO; } } diff --git a/tests/bugs164/pr265695/Asp.aj b/tests/bugs164/pr265695/Asp.aj index 50df2bbce..e669c0e01 100644 --- a/tests/bugs164/pr265695/Asp.aj +++ b/tests/bugs164/pr265695/Asp.aj @@ -18,7 +18,7 @@ class DemoServiceImpl implements DemoService { aspect X { // None of these match, the subject at execution(secureMethod()) does not have the annotation - // see https://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html + // see https://github.com/eclipse-aspectj/aspectj/blob/master/docs/adk15notebook/joinpointsignatures.adoc#join-point-modifiers before(): execution(@Secured * *Service+.*(..)) { } before(): execution(@Secured * *Service.*(..)) { } diff --git a/tests/bugs164/pr265695/AspNew.aj b/tests/bugs164/pr265695/AspNew.aj index 3f61600e6..a7c9b6527 100644 --- a/tests/bugs164/pr265695/AspNew.aj +++ b/tests/bugs164/pr265695/AspNew.aj @@ -17,7 +17,7 @@ class DemoServiceImpl implements DemoService { aspect X { // None of these match, the subject at execution(secureMethod()) does not have the annotation - // see https://www.eclipse.org/aspectj/doc/next/adk15notebook/join-point-modifiers.html + // see https://github.com/eclipse-aspectj/aspectj/blob/master/docs/adk15notebook/joinpointsignatures.adoc#join-point-modifiers before(): execution(@Secured! * *Service+.*(..)) { } } -- 2.39.5