Mercurial > hg > release > icedtea-web-1.6
changeset 1162:5efce17cc54c
All manifests in reproducers' jars have now Application-Name attribute
* Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp) added logic to include Application-Name: $reproducerName key: value to each non-custom manifest file
* tests/reproducers/*/MANIFEST.MF*: all custom manifests enhanced by the same key: value. They do not relay on it.
line wrap: on
line diff
--- a/ChangeLog Fri Feb 27 14:59:53 2015 +0100 +++ b/ChangeLog Fri Feb 27 15:05:42 2015 +0100 @@ -1,8 +1,17 @@ +2015-02-27 Jiri Vanek <jvanek@redhat.com> + + All manifests in reproducers' jars have now Application-Name attribute + * Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp) added logic + to include Application-Name: $reproducerName key: value to each non-custom + manifest file + * tests/reproducers/*/MANIFEST.MF*: all custom manifests enhanced by the same + key: value. They do not relay on it. + 2015-02-27 Jiri Vanek <jvanek@redhat.com> Fixed third party tests. * netx/net/sourceforge/jnlp/resources/Messages.properties: (JREversionDontMatch) - don't changed to does not. The aposthrophe was causing last variable to not expanding. + don't changed to does not. The apostrophe was causing last variable to not expanding. * netx/net/sourceforge/jnlp/runtime/ManifestAttributesChecker.java: shared string moved to constant of MANIFEST_CHECK_DISABLED_MESSAGE * tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java:
--- a/Makefile.am Fri Feb 27 14:59:53 2015 +0100 +++ b/Makefile.am Fri Feb 27 15:05:42 2015 +0100 @@ -771,6 +771,16 @@ else \ $(SYSTEM_JDK_DIR)/bin/jar cf "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" * ; \ fi; \ + AN="Application-Name:" ; \ + grep $$AN $(META_MANIFEST) 2>/dev/null >/dev/null ; \ + GREP_R=$$?; \ + if [ ! -f $(META_MANIFEST) -o $$GREP_R -ne 0 ]; \ + then \ + TMP_MANIFEST=`mktemp` ; \ + echo "$$AN $$dir" > $$TMP_MANIFEST ; \ + $(SYSTEM_JDK_DIR)/bin/jar ufm "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $$TMP_MANIFEST ; \ + rm -f $$TMP_MANIFEST ; \ + fi ; \ cd "$$d" ; \ fi; \ done ; \
--- a/tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/MANIFEST.MF.1 Fri Feb 27 14:59:53 2015 +0100 +++ b/tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/MANIFEST.MF.1 Fri Feb 27 15:05:42 2015 +0100 @@ -1,2 +1,4 @@ Permissions: sandbox Application-Library-Allowable-Codebase: http://localhost +Application-Name: PartiallySignedAppletManifestSpecifiesSandbox +
--- a/tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/MANIFEST.MF.2 Fri Feb 27 14:59:53 2015 +0100 +++ b/tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/MANIFEST.MF.2 Fri Feb 27 15:05:42 2015 +0100 @@ -1,2 +1,4 @@ Permissions: all-permissions Application-Library-Allowable-Codebase: http://localhost +Application-Name: PartiallySignedAppletManifestSpecifiesSandbox +
--- a/tests/reproducers/custom/TrustedOnlyAttribute/srcs/MANIFEST.MF Fri Feb 27 14:59:53 2015 +0100 +++ b/tests/reproducers/custom/TrustedOnlyAttribute/srcs/MANIFEST.MF Fri Feb 27 15:05:42 2015 +0100 @@ -1,1 +1,3 @@ Trusted-only: true +Application-Name: TrustedOnlyAttribute +
--- a/tests/reproducers/signed/ClasspathManifestTest/srcs/META-INF/MANIFEST.MF Fri Feb 27 14:59:53 2015 +0100 +++ b/tests/reproducers/signed/ClasspathManifestTest/srcs/META-INF/MANIFEST.MF Fri Feb 27 15:05:42 2015 +0100 @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Class-Path: Classpath/Manifest/Test/Helper.jar +Application-Name: ClasspathManifestTest
--- a/tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/srcs/META-INF/MANIFEST.MF Fri Feb 27 14:59:53 2015 +0100 +++ b/tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/srcs/META-INF/MANIFEST.MF Fri Feb 27 15:05:42 2015 +0100 @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Codebase: http://localhost https://localhost +Application-Name: CodeBaseManifestEntrySignedMatching
--- a/tests/reproducers/signed/CodeBaseManifestEntrySignedNotMatching/srcs/META-INF/MANIFEST.MF Fri Feb 27 14:59:53 2015 +0100 +++ b/tests/reproducers/signed/CodeBaseManifestEntrySignedNotMatching/srcs/META-INF/MANIFEST.MF Fri Feb 27 15:05:42 2015 +0100 @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Codebase: somthingWhatShould mustNeverMatch +Application-Name: CodeBaseManifestEntrySignedNotMatching
--- a/tests/reproducers/signed/SignedAppletManifestSpecifiesSandbox/srcs/META-INF/MANIFEST.MF Fri Feb 27 14:59:53 2015 +0100 +++ b/tests/reproducers/signed/SignedAppletManifestSpecifiesSandbox/srcs/META-INF/MANIFEST.MF Fri Feb 27 15:05:42 2015 +0100 @@ -1,3 +1,5 @@ Manifest-Version: 1.0 Permissions: sandbox Application-Library-Allowable-Codebase: http://localhost +Application-Name: SignedAppletManifestSpecifiesSandbox +
--- a/tests/reproducers/simple/CodeBaseManifestEntryUnsignedMatching/srcs/META-INF/MANIFEST.MF Fri Feb 27 14:59:53 2015 +0100 +++ b/tests/reproducers/simple/CodeBaseManifestEntryUnsignedMatching/srcs/META-INF/MANIFEST.MF Fri Feb 27 15:05:42 2015 +0100 @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Codebase: http://localhost https://localhost +Application-Name: CodeBaseManifestEntryUnsignedMatching
--- a/tests/reproducers/simple/CodeBaseManifestEntryUnsignedNotMatching/srcs/META-INF/MANIFEST.MF Fri Feb 27 14:59:53 2015 +0100 +++ b/tests/reproducers/simple/CodeBaseManifestEntryUnsignedNotMatching/srcs/META-INF/MANIFEST.MF Fri Feb 27 15:05:42 2015 +0100 @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Codebase: somthingWhatShould mustNeverMatch +Application-Name: CodeBaseManifestEntryUnsignedNotMatching
--- a/tests/reproducers/simple/ManifestedJar1/srcs/META-INF/MANIFEST.MF Fri Feb 27 14:59:53 2015 +0100 +++ b/tests/reproducers/simple/ManifestedJar1/srcs/META-INF/MANIFEST.MF Fri Feb 27 15:05:42 2015 +0100 @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Main-Class: ManifestedJar1 +Application-Name: ManifestedJar1
--- a/tests/reproducers/simple/ManifestedJar2/srcs/META-INF/MANIFEST.MF Fri Feb 27 14:59:53 2015 +0100 +++ b/tests/reproducers/simple/ManifestedJar2/srcs/META-INF/MANIFEST.MF Fri Feb 27 15:05:42 2015 +0100 @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Main-Class: ManifestedJar2 +Application-Name: ManifestedJar2