From: aclement <aclement>
Date: Mon, 9 Feb 2009 20:13:05 +0000 (+0000)
Subject: 124460: simple basic control of weaving via aop.xml
X-Git-Tag: pre268419~125
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8b1b62db36b8076aaa2e794694119523f761f402;p=aspectj.git

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 d17692fd8..a5d1d33aa 100644
--- 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 f0ccb306f..474e56027 100644
--- 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")