diff options
author | mwebster <mwebster> | 2006-08-23 14:34:28 +0000 |
---|---|---|
committer | mwebster <mwebster> | 2006-08-23 14:34:28 +0000 |
commit | fa7ca52b5278bd824a43a08e3ecd5f038696bb1a (patch) | |
tree | e062147344cf481eb5639b4817fca1519107d2db /loadtime/src | |
parent | 0f98c3d06b755e1474a556cea2928e6ccd49f041 (diff) | |
download | aspectj-fa7ca52b5278bd824a43a08e3ecd5f038696bb1a.tar.gz aspectj-fa7ca52b5278bd824a43a08e3ecd5f038696bb1a.zip |
Bug 149289 "Support system and user aop.xml configuration files" (add META-INF/aop-ajc.xml)
Diffstat (limited to 'loadtime/src')
-rw-r--r-- | loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java index 20d57f3e7..2e53d0cfa 100644 --- a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java +++ b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java @@ -28,6 +28,7 @@ import java.util.StringTokenizer; import org.aspectj.asm.IRelationship; import org.aspectj.bridge.AbortException; +import org.aspectj.bridge.Constants; import org.aspectj.bridge.ISourceLocation; import org.aspectj.util.LangUtil; import org.aspectj.weaver.ICrossReferenceHandler; @@ -52,7 +53,7 @@ import org.aspectj.weaver.tools.WeavingAdaptor; */ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor { - private final static String AOP_XML = "META-INF/aop.xml"; + private final static String AOP_XML = Constants.AOP_USER_XML + ";" + Constants.AOP_AJC_XML; private boolean initialized; |