Fix for Bugzilla Bug 57666

	  	duplicate manifests cause resource-copying to gack
(Contributed by Matthew Webster)

1 files changed, 30 insertions, 0 deletions

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
index 40e81eeda..96a5021ae 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
@@ -38,6 +38,8 @@ public class BcweaverJarMaker {
 		makeTestJars();
 
 		makeURLWeavingClassLoaderJars();
+		
+		makeDuplicateManifestTestJars();
 	}
 	
 	public static void makeJar0() throws IOException {
@@ -294,5 +296,33 @@ public class BcweaverJarMaker {
 		args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWPerthis.aj");
 		CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
 	}	
+
 	
+	public static void makeDuplicateManifestTestJars() throws IOException {
+		List args = new ArrayList();
+
+		/*
+		 * injar
+		 */
+		args.add("-classpath"); 
+		args.add("../lib/test/aspectjrt.jar;../lib/test/testing-client.jar" +
+		   File.pathSeparator + System.getProperty("aspectjrt.path"));
+		args.add("-outjar");
+		args.add("../ajde/testdata/DuplicateManifestTest/injar.jar");
+		args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/Hello.java");
+		CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
+
+		/*
+		 * aspectjar
+		 */
+		args = new ArrayList();
+		args.add("-classpath"); 
+		args.add("../lib/test/aspectjrt.jar;../lib/test/testing-client.jar" +
+		   File.pathSeparator + System.getProperty("aspectjrt.path"));
+		args.add("-outjar");
+		args.add("../ajde/testdata/DuplicateManifestTest/aspectjar.jar");
+		args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/Trace.java");
+		args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/TraceHello.java");
+		CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
+	}	
 }