diff options
| author | aclement <aclement> | 2009-02-09 20:13:05 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2009-02-09 20:13:05 +0000 |
| commit | 8b1b62db36b8076aaa2e794694119523f761f402 (patch) | |
| tree | ce660e022d7e39bf9d44733ca5fe9c862471abf0 /org.aspectj.ajdt.core | |
| parent | 42c34e2fa348eb453be2c953b72f13391d5a9997 (diff) | |
| download | aspectj-8b1b62db36b8076aaa2e794694119523f761f402.tar.gz aspectj-8b1b62db36b8076aaa2e794694119523f761f402.zip | |
124460: simple basic control of weaving via aop.xml
Diffstat (limited to 'org.aspectj.ajdt.core')
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java | 1 | ||||
| -rw-r--r-- | org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java | 8 |
2 files changed, 9 insertions, 0 deletions
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") |