124460: simple basic control of weaving via aop.xml

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index d17692fd88eb7de5ab6413450cc5d2f46fcc134e..a5d1d33aa8fe1784e8a41c770381862e8b43acbd 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -787,6 +787,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
                BcelWorld bcelWorld = new BcelWorld(cp, handler, null);
                bcelWorld.setBehaveInJava5Way(buildConfig.getBehaveInJava5Way());
                bcelWorld.setAddSerialVerUID(buildConfig.isAddSerialVerUID());
+               bcelWorld.setXmlFiles(buildConfig.getXmlFiles());
                bcelWorld.performExtraConfiguration(buildConfig.getXconfigurationInfo());
                bcelWorld.setTargetAspectjRuntimeLevel(buildConfig.getTargetAspectjRuntimeLevel());
                bcelWorld.setOptionalJoinpoints(buildConfig.getXJoinpoints());

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
index f0ccb306f53416eb7696d059676e77abee54bd6e..474e56027a58a7fbfecf2fa94fe3fb3b0759adbe 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
@@ -363,6 +363,14 @@ public class Ajc {
                                File f = new File(args[i]);
                                // newArgs[i] = new File(baseDir,args[i]).getAbsolutePath(); // might be quicker?
                                newArgs[i] = adjustFileOrDir(f, doCopy).getAbsolutePath();
+                       } else if (args[i].endsWith(".xml") && !args[i].startsWith("-")) {
+                               if (i > 0 && args[i - 1].equals("-outxmlfile")) {
+                                       // dont adjust it
+                               } else {
+                                       File f = new File(args[i]);
+                                       // newArgs[i] = new File(baseDir,args[i]).getAbsolutePath(); // might be quicker?
+                                       newArgs[i] = adjustFileOrDir(f, doCopy).getAbsolutePath();
+                               }
                        } else {
                                if ((args[i].equals("-aspectpath") || args[i].equals("-inpath") || args[i].equals("-injars")
                                                || args[i].equals("-outjar") || args[i].equals("-classpath") || args[i].equals("-sourceroots")