Matthews patches for 115275

3 files changed, 10 insertions, 0 deletions

diff --git a/weaver/src/org/aspectj/weaver/Lint.java b/weaver/src/org/aspectj/weaver/Lint.java
index d0b22e47c..e8b237079 100644
--- a/weaver/src/org/aspectj/weaver/Lint.java
+++ b/weaver/src/org/aspectj/weaver/Lint.java
@@ -102,6 +102,9 @@ public class Lint {
 	public final Kind noExplicitConstructorCall = 
 		new Kind("noExplicitConstructorCall","inter-type constructor does not contain explicit constructor call: field initializers in the target type will not be executed");
 	
+	public final Kind aspectExcludedByConfiguration = 
+		new Kind("aspectExcludedByConfiguration","aspect {0} exluded for class loader {1}");
+	
     public Lint(World world) {
 		this.world = world;
 	}
diff --git a/weaver/src/org/aspectj/weaver/XlintDefault.properties b/weaver/src/org/aspectj/weaver/XlintDefault.properties
index da3856a79..bb40c00cd 100644
--- a/weaver/src/org/aspectj/weaver/XlintDefault.properties
+++ b/weaver/src/org/aspectj/weaver/XlintDefault.properties
@@ -30,3 +30,5 @@ elementAlreadyAnnotated = warning
 runtimeExceptionNotSoftened = warning
 uncheckedArgument = warning
 noExplicitConstructorCall = warning
+
+aspectExcludedByConfiguration = ignore
diff --git a/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java b/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
index b59ec5564..ea7590273 100644
--- a/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
+++ b/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
@@ -31,6 +31,7 @@ import java.util.StringTokenizer;
 import org.aspectj.bridge.AbortException;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHandler;
+import org.aspectj.bridge.Message;
 import org.aspectj.bridge.MessageUtil;
 import org.aspectj.bridge.MessageWriter;
 import org.aspectj.bridge.IMessage.Kind;
@@ -327,6 +328,10 @@ public class WeavingAdaptor {
 		return MessageUtil.warn(messageHandler,message);
 	}
 	
+	protected boolean warn (String message, Throwable th) {
+        return messageHandler.handleMessage(new Message("Register definition failed", IMessage.WARNING, th, null));
+	}
+	
 	protected boolean error (String message) {
 		return MessageUtil.error(messageHandler,message);
 	}