From 2b8fa314f21eddf8551715fdd571da2b611411d0 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Mon, 2 Aug 2004 15:47:02 +0000
Subject: Fix for Bugzilla Bug 57666 	  	duplicate manifests cause
 resource-copying to gack (Contributed by Matthew Webster)

---
 .../DuplicateManifestTest/META-INF/MANIFEST.MF     |   3 ++
 .../DuplicateManifestTest/META-INF/test.xml        |   4 +++
 ajde/testdata/DuplicateManifestTest/aspectjar.jar  | Bin 0 -> 2544 bytes
 ajde/testdata/DuplicateManifestTest/build.ajsym    | Bin 0 -> 1270 bytes
 ajde/testdata/DuplicateManifestTest/build.lst      |   0
 ajde/testdata/DuplicateManifestTest/injar.jar      | Bin 0 -> 927 bytes
 ajde/testdata/DuplicateManifestTest/outjar.jar     | Bin 0 -> 1273 bytes
 .../DuplicateManifestTest/update-injar.xml         |  33 +++++++++++++++++++++
 8 files changed, 40 insertions(+)
 create mode 100644 ajde/testdata/DuplicateManifestTest/META-INF/MANIFEST.MF
 create mode 100644 ajde/testdata/DuplicateManifestTest/META-INF/test.xml
 create mode 100644 ajde/testdata/DuplicateManifestTest/aspectjar.jar
 create mode 100644 ajde/testdata/DuplicateManifestTest/build.ajsym
 create mode 100644 ajde/testdata/DuplicateManifestTest/build.lst
 create mode 100644 ajde/testdata/DuplicateManifestTest/injar.jar
 create mode 100644 ajde/testdata/DuplicateManifestTest/outjar.jar
 create mode 100644 ajde/testdata/DuplicateManifestTest/update-injar.xml

(limited to 'ajde/testdata/DuplicateManifestTest')

diff --git a/ajde/testdata/DuplicateManifestTest/META-INF/MANIFEST.MF b/ajde/testdata/DuplicateManifestTest/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..fde889593
--- /dev/null
+++ b/ajde/testdata/DuplicateManifestTest/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Created-By: DuplicateManifestTest
+
diff --git a/ajde/testdata/DuplicateManifestTest/META-INF/test.xml b/ajde/testdata/DuplicateManifestTest/META-INF/test.xml
new file mode 100644
index 000000000..f9efa1f1f
--- /dev/null
+++ b/ajde/testdata/DuplicateManifestTest/META-INF/test.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<jar name="input1.jar">
+</jar>
+
diff --git a/ajde/testdata/DuplicateManifestTest/aspectjar.jar b/ajde/testdata/DuplicateManifestTest/aspectjar.jar
new file mode 100644
index 000000000..6cc196c3e
Binary files /dev/null and b/ajde/testdata/DuplicateManifestTest/aspectjar.jar differ
diff --git a/ajde/testdata/DuplicateManifestTest/build.ajsym b/ajde/testdata/DuplicateManifestTest/build.ajsym
new file mode 100644
index 000000000..898f8bee0
Binary files /dev/null and b/ajde/testdata/DuplicateManifestTest/build.ajsym differ
diff --git a/ajde/testdata/DuplicateManifestTest/build.lst b/ajde/testdata/DuplicateManifestTest/build.lst
new file mode 100644
index 000000000..e69de29bb
diff --git a/ajde/testdata/DuplicateManifestTest/injar.jar b/ajde/testdata/DuplicateManifestTest/injar.jar
new file mode 100644
index 000000000..8613c3686
Binary files /dev/null and b/ajde/testdata/DuplicateManifestTest/injar.jar differ
diff --git a/ajde/testdata/DuplicateManifestTest/outjar.jar b/ajde/testdata/DuplicateManifestTest/outjar.jar
new file mode 100644
index 000000000..ee5000733
Binary files /dev/null and b/ajde/testdata/DuplicateManifestTest/outjar.jar differ
diff --git a/ajde/testdata/DuplicateManifestTest/update-injar.xml b/ajde/testdata/DuplicateManifestTest/update-injar.xml
new file mode 100644
index 000000000..7ce4c1452
--- /dev/null
+++ b/ajde/testdata/DuplicateManifestTest/update-injar.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" ?>
+<project name="DuplicateManifestTest" default="all" basedir=".">
+
+	<property name="injar" value="${basedir}/injar.jar"/>
+	<property name="tempdir" value="${basedir}/temp"/>
+
+	<target name="update">
+
+		<delete dir="${tempdir}"/>
+
+		<unzip
+			dest="${tempdir}"
+			src="${injar}"
+		/>
+
+		<copy todir="${tempdir}" overwrite="true">
+			<fileset dir="${basedir}">			
+				<include name="META-INF/*"/>
+			</fileset>
+		</copy>
+
+		<zip
+			destfile="${injar}"
+		>
+			<fileset dir="${basedir}/temp"/>
+		
+		</zip>	
+
+		<delete dir="${tempdir}"/>
+	</target>
+	
+	<target name="all" depends="update"/>
+</project>
-- 
cgit v1.2.3