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 /org.aspectj.ajdt.core | |
| 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 'org.aspectj.ajdt.core')
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java | 2 | ||||
| -rw-r--r-- | org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java index 4aff85e38..4b2c82c13 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java @@ -493,7 +493,7 @@ public class BuildArgParser extends Main { showError("-outjar requires jar path argument"); } } else if (arg.equals("-outxml")) { - buildConfig.setOutxmlName("META-INF/aop.xml"); + buildConfig.setOutxmlName(org.aspectj.bridge.Constants.AOP_AJC_XML); } else if (arg.equals("-outxmlfile")) { if (args.size() > nextArgIndex) { String name = ((ConfigParser.Arg)args.get(nextArgIndex)).getValue(); diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java index 17ae5b01b..4ec4e5e78 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java @@ -497,7 +497,7 @@ public class BuildArgParserTestCase extends TestCase { IMessageHolder messageHolder = new MessageHandler(); AjBuildConfig config = genBuildConfig(new String[] { "-outxml", "-showWeaveInfo" }, messageHolder); assertTrue("Warnings: " + messageHolder,!messageHolder.hasAnyMessage(IMessage.WARNING, true)); - assertEquals("Wrong outxml","META-INF/aop.xml",config.getOutxmlName()); + assertEquals("Wrong outxml","META-INF/aop-ajc.xml",config.getOutxmlName()); assertTrue("Following option currupted",config.getShowWeavingInformation()); } |