From fc7db25dad5d302221669c7cfdb4890f061d2e9e Mon Sep 17 00:00:00 2001
From: acolyer <acolyer>
Date: Tue, 16 May 2006 12:30:08 +0000
Subject: [PATCH] fix for pr141945, misleading message re. aop.xml

---
 .../ataspectj/ltwreweavable/MainReweavableLogging.java          | 2 +-
 weaver/src/org/aspectj/weaver/weaver-messages.properties        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/java5/ataspectj/ataspectj/ltwreweavable/MainReweavableLogging.java b/tests/java5/ataspectj/ataspectj/ltwreweavable/MainReweavableLogging.java
index caa4a9ac7..3bb30da74 100644
--- a/tests/java5/ataspectj/ataspectj/ltwreweavable/MainReweavableLogging.java
+++ b/tests/java5/ataspectj/ataspectj/ltwreweavable/MainReweavableLogging.java
@@ -37,7 +37,7 @@ public class MainReweavableLogging implements Advisable {
     }
 
     public static void main (String[] args) {
-        String ERROR_STRING = "error aspect 'ataspectj.ltwreweavable.AspectReweavableLogging' woven into 'ataspectj.ltwreweavable.MainReweavableLogging' must be declared in an aop.xml file.";
+        String ERROR_STRING = "error aspect 'ataspectj.ltwreweavable.AspectReweavableLogging' woven into 'ataspectj.ltwreweavable.MainReweavableLogging' must be defined to the weaver (placed on the aspectpath, or defined in an aop.xml file if using LTW).";
         if(Boolean.getBoolean("aspectDeclared")){
             //if the aspect is declared there should not be an error
             if (MessageHolder.startsAs( Arrays.asList(  new String[]{ ERROR_STRING }  )) ) {
diff --git a/weaver/src/org/aspectj/weaver/weaver-messages.properties b/weaver/src/org/aspectj/weaver/weaver-messages.properties
index 3787c2693..2abdc2def 100644
--- a/weaver/src/org/aspectj/weaver/weaver-messages.properties
+++ b/weaver/src/org/aspectj/weaver/weaver-messages.properties
@@ -74,7 +74,7 @@ processingReweavable=processing reweavable type {0}: {1}
 missingReweavableType=type {0} is needed by reweavable type {1}
 verifiedReweavableType=successfully verified type {0} exists.  Originates from {1}
 aspectNeeded=aspect {0} is needed when using type {1}
-reweavableAspectNotRegistered=aspect ''{0}'' woven into ''{1}'' must be declared in an aop.xml file.
+reweavableAspectNotRegistered=aspect ''{0}'' woven into ''{1}'' must be defined to the weaver (placed on the aspectpath, or defined in an aop.xml file if using LTW).
 
 # The infamous and deserving a category all of its own...
 cantFindType=can''t find type {0}
-- 
2.39.5