diff options
| author | aclement <aclement> | 2004-08-02 15:47:02 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2004-08-02 15:47:02 +0000 |
| commit | 2b8fa314f21eddf8551715fdd571da2b611411d0 (patch) | |
| tree | b1d79b311bdd55ff5a6c5fb205c77896dc5222b5 /ajde/testdata/DuplicateManifestTest | |
| parent | 7f19ab47a3df5327c6246420354089d1db1c765f (diff) | |
| download | aspectj-2b8fa314f21eddf8551715fdd571da2b611411d0.tar.gz aspectj-2b8fa314f21eddf8551715fdd571da2b611411d0.zip | |
Fix for Bugzilla Bug 57666
duplicate manifests cause resource-copying to gack
(Contributed by Matthew Webster)
Diffstat (limited to 'ajde/testdata/DuplicateManifestTest')
| -rw-r--r-- | ajde/testdata/DuplicateManifestTest/META-INF/MANIFEST.MF | 3 | ||||
| -rw-r--r-- | ajde/testdata/DuplicateManifestTest/META-INF/test.xml | 4 | ||||
| -rw-r--r-- | ajde/testdata/DuplicateManifestTest/aspectjar.jar | bin | 0 -> 2544 bytes | |||
| -rw-r--r-- | ajde/testdata/DuplicateManifestTest/build.ajsym | bin | 0 -> 1270 bytes | |||
| -rw-r--r-- | ajde/testdata/DuplicateManifestTest/build.lst | 0 | ||||
| -rw-r--r-- | ajde/testdata/DuplicateManifestTest/injar.jar | bin | 0 -> 927 bytes | |||
| -rw-r--r-- | ajde/testdata/DuplicateManifestTest/outjar.jar | bin | 0 -> 1273 bytes | |||
| -rw-r--r-- | ajde/testdata/DuplicateManifestTest/update-injar.xml | 33 |
8 files changed, 40 insertions, 0 deletions
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 Binary files differnew file mode 100644 index 000000000..6cc196c3e --- /dev/null +++ b/ajde/testdata/DuplicateManifestTest/aspectjar.jar diff --git a/ajde/testdata/DuplicateManifestTest/build.ajsym b/ajde/testdata/DuplicateManifestTest/build.ajsym Binary files differnew file mode 100644 index 000000000..898f8bee0 --- /dev/null +++ b/ajde/testdata/DuplicateManifestTest/build.ajsym diff --git a/ajde/testdata/DuplicateManifestTest/build.lst b/ajde/testdata/DuplicateManifestTest/build.lst new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ajde/testdata/DuplicateManifestTest/build.lst diff --git a/ajde/testdata/DuplicateManifestTest/injar.jar b/ajde/testdata/DuplicateManifestTest/injar.jar Binary files differnew file mode 100644 index 000000000..8613c3686 --- /dev/null +++ b/ajde/testdata/DuplicateManifestTest/injar.jar diff --git a/ajde/testdata/DuplicateManifestTest/outjar.jar b/ajde/testdata/DuplicateManifestTest/outjar.jar Binary files differnew file mode 100644 index 000000000..ee5000733 --- /dev/null +++ b/ajde/testdata/DuplicateManifestTest/outjar.jar 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> |