/hg/icedtea: Bump to b117. Move to using drops from the IcedTea...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Nov 24 05:14:13 PST 2010
changeset ca86748424fa in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ca86748424fa
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Nov 24 13:13:23 2010 +0000
Bump to b117. Move to using drops from the IcedTea server.
2010-11-24 Andrew John Hughes <ahughes at redhat.com>
Bump to b117.
* patches/boot/corba-libgcj.patch,
* patches/icedtea-stroker-finish.patch,
* Makefile.am: (OPENJDK_VERSION): Set to b117.
(CORBA_CHANGESET): Updated. (HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM):
Likewise. (JAXWS_DROP_URL): Set to IcedTea server.
(JAXWS_DROP_ZIP): Updated. (JAXWS_DROP_SHA256SUM): Likewise.
(JAF_DROP_URL): Set to IcedTea server. (JAF_DROP_ZIP):
Updated. (JAF_DROP_SHA256SUM): Likewise.
(JAXP_DROP_URL): Set to IcedTea server. (JAXP_DROP_ZIP):
Updated. (JAXP_DROP_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Drop stroker-finish (upstream).
(ICEDTEA_BOOT_PATCHES): Drop corba-libgcj (redundant due to
native elements of corba build being removed). Add new
patches to work around new bootstrap issues.
* patches/boot/corba-defs.patch: Rerolled.
* patches/boot/ecj-diamond.patch: Handle use in java.util.jar.
* patches/boot/ecj-stringswitch.patch: New patch to replace
switch statement using a String in NTLM driver.
* patches/boot/genstubs-nofork.patch: Rerolled.
* patches/boot/icedteart.patch: Drop dead ICEDTEA_JCE. Put
CLASSDESTDIR first so that new classes are found first.
* patches/boot/revert-6941137.patch: Revert change to use
java.nio.file.FileSystems in ZoneInfoFile. Avoids trying to
load file system providers and failing.
* patches/boot/xbootclasspath.patch: Rerolled.
* patches/cacao/arch.patch: Remove CORBA chunk.
* patches/extensions/netx.patch: Rerolled.
* patches/icedtea-gcc-suffix.patch: Remove CORBA chunk.
* patches/icedtea-lc_ctype.patch: Recreated.
* patches/icedtea-libraries.patch: Rerolled.
* patches/sh4-support.patch: Remove CORBA chunk.
diffstat:
17 files changed, 693 insertions(+), 374 deletions(-)
ChangeLog | 52 +++++
Makefile.am | 54 ++---
patches/boot/corba-defs.patch | 14 -
patches/boot/corba-libgcj.patch | 12 -
patches/boot/ecj-diamond.patch | 330 ++++++++++++++++++++++++++++++++++
patches/boot/ecj-stringswitch.patch | 38 +++
patches/boot/genstubs-nofork.patch | 12 -
patches/boot/icedteart.patch | 4
patches/boot/revert-6941137.patch | 12 +
patches/boot/xbootclasspath.patch | 41 +---
patches/cacao/arch.patch | 41 ----
patches/extensions/netx.patch | 28 +-
patches/icedtea-gcc-suffix.patch | 25 --
patches/icedtea-lc_ctype.patch | 50 ++---
patches/icedtea-libraries.patch | 304 +++++++++++++++----------------
patches/icedtea-stroker-finish.patch | 20 --
patches/sh4-support.patch | 30 ---
diffs (truncated from 2187 to 500 lines):
diff -r edaaf37351c4 -r ca86748424fa ChangeLog
--- a/ChangeLog Tue Sep 14 15:59:59 2010 +0100
+++ b/ChangeLog Wed Nov 24 13:13:23 2010 +0000
@@ -1,3 +1,55 @@ 2010-09-14 Andrew John Hughes <ahughes
+2010-11-24 Andrew John Hughes <ahughes at redhat.com>
+
+ Bump to b117. Move to using drops from
+ the IcedTea server.
+ * patches/boot/corba-libgcj.patch,
+ * patches/icedtea-stroker-finish.patch,
+ * Makefile.am:
+ (OPENJDK_VERSION): Set to b117.
+ (CORBA_CHANGESET): Updated.
+ (HOTSPOT_CHANGESET): Likewise.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (JAXWS_DROP_URL): Set to IcedTea server.
+ (JAXWS_DROP_ZIP): Updated.
+ (JAXWS_DROP_SHA256SUM): Likewise.
+ (JAF_DROP_URL): Set to IcedTea server.
+ (JAF_DROP_ZIP): Updated.
+ (JAF_DROP_SHA256SUM): Likewise.
+ (JAXP_DROP_URL): Set to IcedTea server.
+ (JAXP_DROP_ZIP): Updated.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Drop stroker-finish (upstream).
+ (ICEDTEA_BOOT_PATCHES): Drop corba-libgcj (redundant
+ due to native elements of corba build being removed).
+ Add new patches to work around new bootstrap issues.
+ * patches/boot/corba-defs.patch: Rerolled.
+ * patches/boot/ecj-diamond.patch: Handle use in java.util.jar.
+ * patches/boot/ecj-stringswitch.patch:
+ New patch to replace switch statement using a String in NTLM driver.
+ * patches/boot/genstubs-nofork.patch: Rerolled.
+ * patches/boot/icedteart.patch: Drop dead ICEDTEA_JCE. Put CLASSDESTDIR
+ first so that new classes are found first.
+ * patches/boot/revert-6941137.patch: Revert change to use java.nio.file.FileSystems
+ in ZoneInfoFile. Avoids trying to load file system providers and failing.
+ * patches/boot/xbootclasspath.patch: Rerolled.
+ * patches/cacao/arch.patch: Remove CORBA chunk.
+ * patches/extensions/netx.patch: Rerolled.
+ * patches/icedtea-gcc-suffix.patch: Remove CORBA chunk.
+ * patches/icedtea-lc_ctype.patch: Recreated.
+ * patches/icedtea-libraries.patch: Rerolled.
+ * patches/sh4-support.patch: Remove CORBA chunk.
+
2010-09-14 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am,
diff -r edaaf37351c4 -r ca86748424fa Makefile.am
--- a/Makefile.am Tue Sep 14 15:59:59 2010 +0100
+++ b/Makefile.am Wed Nov 24 13:13:23 2010 +0000
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b106
+OPENJDK_VERSION = b117
-CORBA_CHANGESET = 00a2834117ff
-HOTSPOT_CHANGESET = 7f4113719dc5
-JAXP_CHANGESET = 679653c22ae1
-JAXWS_CHANGESET = 191a3ec51d79
-JDK_CHANGESET = a094068f4c7b
-LANGTOOLS_CHANGESET = 68035813467d
-OPENJDK_CHANGESET = b79fce47b7c6
+CORBA_CHANGESET = 06146786b141
+HOTSPOT_CHANGESET = 81685aa89446
+JAXP_CHANGESET = 43658f98c582
+JAXWS_CHANGESET = f3444af18aff
+JDK_CHANGESET = c981a387cd86
+LANGTOOLS_CHANGESET = fdf1b74d3437
+OPENJDK_CHANGESET = c94d1673451e
-CORBA_SHA256SUM = 5648b189c94df46bbec9bc7c8640957befffbde68ff7ef9f8f8de9bd7fbe8e7d
-HOTSPOT_SHA256SUM = 8ff4445304680ca7b09edd2b5713e5c04b0f68308c593d84429691ff4f7e8cfb
-JAXP_SHA256SUM = c7d58a5dd2859ccb8b2d0897a26ce9b37895f530a94a5912179afc25cc1d14ea
-JAXWS_SHA256SUM = 6fd65fd23c085c9c89f904da1b6448460af32d97d76bb0ba49630ee61d70a4d6
-JDK_SHA256SUM = 8b20e0686667a03cf028d57695b4bc2196c51db2d9c0873db7694624c384c446
-LANGTOOLS_SHA256SUM = 81b48f5f5782e62b0555735be24e294d3274c48fa1e027a63eb005465a505385
-OPENJDK_SHA256SUM = edb332586e2442bdbd4eed19c059535ade56dba5b436257031a0e5e827b89f12
+CORBA_SHA256SUM = 8d5a566e2d51d791d75f1ff25d5ae499317ec9391ed6bbc86eef483d15551d55
+HOTSPOT_SHA256SUM = 7ca6831eb7505c21b8607c7cf8d12cb182fca21c3a40c4696db737d56d80e54b
+JAXP_SHA256SUM = e0aa77b166b30d4d4052110956da831c59c43e22f8d6feeac62a06775bb083b6
+JAXWS_SHA256SUM = ff4124f3765ac5ebac5ecfd0391cb2a54857d80ac7f967f60630ce0879cfd1f4
+JDK_SHA256SUM = d211d0f1ec2baae5560e076eb60e313421c087e85ead4592256c2885a99d8b85
+LANGTOOLS_SHA256SUM = d200c9bcf1c1805e0800a8cd8017e99ff6d12db14a1fcca8e9b67c59dc5ed448
+OPENJDK_SHA256SUM = d7a3a531f0e064898e511f08f1127447b9171adce21ae4cecb3bca84b3f7b531
CACAO_VERSION = e321b101a9ee
CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444
@@ -24,15 +24,15 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VE
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
-JAXWS_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150896
-JAXWS_DROP_ZIP = jdk7-jaxws-b100.zip
-JAXWS_DROP_SHA256SUM = 06e5f564430954211322fca353b0b8d916ffa8ae051412b7d9b5a5398090d887
-JAF_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
-JAF_DROP_ZIP = jdk7-jaf-2009_08_28.zip
-JAF_DROP_SHA256SUM = 8c81940b3017c0058367d7e7453123442f2cdd77c2bfe74acd9035f97e4db8e8
-JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150785
-JAXP_DROP_ZIP = jdk7-jaxp-m7.zip
-JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
+JAXWS_DROP_URL = http://icedtea.classpath.org/download/drops
+JAXWS_DROP_ZIP = jdk7-jaxws2_2-2010_08_19.zip
+JAXWS_DROP_SHA256SUM = b8877aafbb15a348babcaee4ee372fb3e2ea0282f8fe93d306272fd24d7847de
+JAF_DROP_URL = http://icedtea.classpath.org/download/drops
+JAF_DROP_ZIP = jdk7-jaf-2010_08_19.zip
+JAF_DROP_SHA256SUM = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e
+JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
+JAXP_DROP_ZIP = jaxp-1_4_4.zip
+JAXP_DROP_SHA256SUM = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
@@ -319,7 +319,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-signed-types.patch \
patches/icedtea-lc_ctype.patch \
patches/icedtea-tests-jdk.patch \
- patches/icedtea-stroker-finish.patch \
patches/icedtea-linker-libs-order.patch \
patches/icedtea-testenv.patch \
patches/icedtea-samejvm-safe.patch \
@@ -397,7 +396,6 @@ ICEDTEA_BOOT_PATCHES = patches/boot/ant-
ICEDTEA_BOOT_PATCHES = patches/boot/ant-javac.patch \
patches/boot/corba-defs.patch \
patches/boot/corba-idlj.patch \
- patches/boot/corba-libgcj.patch \
patches/boot/corba-no-gen.patch \
patches/boot/corba-orb.patch \
patches/boot/demos.patch \
@@ -419,7 +417,9 @@ ICEDTEA_BOOT_PATCHES = patches/boot/ant-
patches/boot/genstubs-nofork.patch \
patches/boot/getannotation-cast.patch \
patches/boot/break-processbuilder-dependency.patch \
- patches/boot/revert-6973616.patch
+ patches/boot/revert-6973616.patch \
+ patches/boot/revert-6941137.patch \
+ patches/boot/ecj-stringswitch.patch
if CP39408_JAVAH
ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch
diff -r edaaf37351c4 -r ca86748424fa patches/boot/corba-defs.patch
--- a/patches/boot/corba-defs.patch Tue Sep 14 15:59:59 2010 +0100
+++ b/patches/boot/corba-defs.patch Wed Nov 24 13:13:23 2010 +0000
@@ -1,6 +1,6 @@ diff -Nru ../openjdk.orig/openjdk-boot/c
-diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
---- ../openjdk.orig/openjdk-boot/corba/make/common/Defs.gmk 2009-10-03 00:02:43.000000000 +0100
-+++ openjdk-boot/corba/make/common/Defs.gmk 2009-10-30 16:59:16.000000000 +0000
+diff -Nru openjdk.orig/corba/make/common/Defs.gmk openjdk/corba/make/common/Defs.gmk
+--- openjdk-boot.orig/corba/make/common/Defs.gmk 2010-11-12 01:18:17.000000000 +0000
++++ openjdk-boot/corba/make/common/Defs.gmk 2010-11-19 22:40:28.154937216 +0000
@@ -53,6 +53,13 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -15,16 +15,16 @@ diff -Nru ../openjdk.orig/openjdk-boot/c
#
# Get platform definitions
#
-@@ -129,8 +136,6 @@
+@@ -85,8 +92,6 @@
# for build tool jar files
BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars
ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
-# for generated java source files
-GENSRCDIR = $(OUTPUTDIR)/gensrc
- # for generated C source files (not javah)
- GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc
# for imported source files
-@@ -231,7 +236,7 @@
+ IMPORTSRCDIR = $(OUTPUTDIR)/impsrc
+ # for imported documents
+@@ -167,7 +172,7 @@
# We define an intermediate variable for Java files because
# we use its value later to help define $SOURCEPATH
diff -r edaaf37351c4 -r ca86748424fa patches/boot/corba-libgcj.patch
--- a/patches/boot/corba-libgcj.patch Tue Sep 14 15:59:59 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -Nru openjdk-boot.orig/corba/make/common/Defs-linux.gmk openjdk-boot/corba/make/common/Defs-linux.gmk
---- openjdk-boot.orig/corba/make/common/Defs-linux.gmk 2009-12-13 23:10:09.000000000 +0000
-+++ openjdk-boot/corba/make/common/Defs-linux.gmk 2009-12-14 15:54:17.000000000 +0000
-@@ -271,7 +271,7 @@
- #
- VM_NAME = server
- JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
--JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
-+JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB)
-
- #
- # We want to privatize JVM symbols on Solaris. This is so the user can
diff -r edaaf37351c4 -r ca86748424fa patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Tue Sep 14 15:59:59 2010 +0100
+++ b/patches/boot/ecj-diamond.patch Wed Nov 24 13:13:23 2010 +0000
@@ -156,3 +156,333 @@ diff -r a094068f4c7b src/share/classes/c
for (int i = 0; i < urls.length; i++) {
String server = urls[i].getHost();
+diff -r 240d4d3f2db7 src/share/classes/com/sun/java/util/jar/pack/Attribute.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java Tue Sep 14 17:29:58 2010 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java Wed Sep 15 00:00:17 2010 +0100
+@@ -96,9 +96,9 @@
+ }
+
+ private static final byte[] noBytes = {};
+- private static final Map<List<Attribute>, List<Attribute>> canonLists = new HashMap<>();
+- private static final Map<Layout, Attribute> attributes = new HashMap<>();
+- private static final Map<Layout, Attribute> standardDefs = new HashMap<>();
++ private static final Map<List<Attribute>, List<Attribute>> canonLists = new HashMap<List<Attribute>,List<Attribute>>();
++ private static final Map<Layout, Attribute> attributes = new HashMap<Layout, Attribute>();
++ private static final Map<Layout, Attribute> standardDefs = new HashMap<Layout, Attribute>();
+
+ // Canonicalized lists of trivial attrs (Deprecated, etc.)
+ // are used by trimToSize, in order to reduce footprint
+@@ -108,7 +108,7 @@
+ synchronized (canonLists) {
+ List<Attribute> cl = canonLists.get(al);
+ if (cl == null) {
+- cl = new ArrayList<>(al.size());
++ cl = new ArrayList<Attribute>(al.size());
+ cl.addAll(al);
+ cl = Collections.unmodifiableList(cl);
+ canonLists.put(al, cl);
+@@ -329,9 +329,9 @@
+
+ public void addAttribute(Attribute a) {
+ if (attributes == null)
+- attributes = new ArrayList<>(3);
++ attributes = new ArrayList<Attribute>(3);
+ else if (!(attributes instanceof ArrayList))
+- attributes = new ArrayList<>(attributes); // unfreeze it
++ attributes = new ArrayList<Attribute>(attributes); // unfreeze it
+ attributes.add(a);
+ }
+
+@@ -339,7 +339,7 @@
+ if (attributes == null) return null;
+ if (!attributes.contains(a)) return null;
+ if (!(attributes instanceof ArrayList))
+- attributes = new ArrayList<>(attributes); // unfreeze it
++ attributes = new ArrayList<Attribute>(attributes); // unfreeze it
+ attributes.remove(a);
+ return a;
+ }
+@@ -824,7 +824,7 @@
+ */
+ static //private
+ Layout.Element[] tokenizeLayout(Layout self, int curCble, String layout) {
+- ArrayList<Layout.Element> col = new ArrayList<>(layout.length());
++ ArrayList<Layout.Element> col = new ArrayList<Layout.Element>(layout.length());
+ tokenizeLayout(self, curCble, layout, col);
+ Layout.Element[] res = new Layout.Element[col.size()];
+ col.toArray(res);
+@@ -889,7 +889,7 @@
+ case 'T': // union: 'T' any_int union_case* '(' ')' '[' body ']'
+ kind = EK_UN;
+ i = tokenizeSInt(e, layout, i);
+- ArrayList<Layout.Element> cases = new ArrayList<>();
++ ArrayList<Layout.Element> cases = new ArrayList<Layout.Element>();
+ for (;;) {
+ // Keep parsing cases until we hit the default case.
+ if (layout.charAt(i++) != '(')
+@@ -1043,7 +1043,7 @@
+ }
+ static //private
+ String[] splitBodies(String layout) {
+- ArrayList<String> bodies = new ArrayList<>();
++ ArrayList<String> bodies = new ArrayList<String>();
+ // Parse several independent layout bodies: "[foo][bar]...[baz]"
+ for (int i = 0; i < layout.length(); i++) {
+ if (layout.charAt(i++) != '[')
+diff -r 240d4d3f2db7 src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java Tue Sep 14 17:29:58 2010 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java Wed Sep 15 00:00:17 2010 +0100
+@@ -909,7 +909,7 @@
+ public static
+ Index[] partition(Index ix, int[] keys) {
+ // %%% Should move this into class Index.
+- ArrayList<List<Entry>> parts = new ArrayList<>();
++ ArrayList<List<Entry>> parts = new ArrayList<List<Entry>>();
+ Entry[] cpMap = ix.cpMap;
+ assert(keys.length == cpMap.length);
+ for (int i = 0; i < keys.length; i++) {
+@@ -920,7 +920,7 @@
+ }
+ List<Entry> part = parts.get(key);
+ if (part == null) {
+- parts.set(key, part = new ArrayList<>());
++ parts.set(key, part = new ArrayList<Entry>());
+ }
+ part.add(cpMap[i]);
+ }
+diff -r 240d4d3f2db7 src/share/classes/com/sun/java/util/jar/pack/Package.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java Tue Sep 14 17:29:58 2010 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java Wed Sep 15 00:00:17 2010 +0100
+@@ -90,7 +90,7 @@
+ public static final Attribute.Layout attrSourceFileSpecial;
+ public static final Map attrDefs;
+ static {
+- HashMap<Layout, Attribute> ad = new HashMap<>(3);
++ HashMap<Layout, Attribute> ad = new HashMap<Layout, Attribute>(3);
+ attrCodeEmpty = Attribute.define(ad, ATTR_CONTEXT_METHOD,
+ "Code", "").layout();
+ attrInnerClassesEmpty = Attribute.define(ad, ATTR_CONTEXT_CLASS,
+@@ -160,7 +160,7 @@
+ }
+ }
+
+- ArrayList<Package.Class> classes = new ArrayList<>();
++ ArrayList<Package.Class> classes = new ArrayList<Package.Class>();
+
+ public List<Package.Class> getClasses() {
+ return classes;
+@@ -271,7 +271,7 @@
+ if (a != olda) {
+ if (verbose > 2)
+ Utils.log.fine("recoding obvious SourceFile="+obvious);
+- List<Attribute> newAttrs = new ArrayList<>(getAttributes());
++ List<Attribute> newAttrs = new ArrayList<Attribute>(getAttributes());
+ int where = newAttrs.indexOf(olda);
+ newAttrs.set(where, a);
+ setAttributes(newAttrs);
+@@ -320,7 +320,7 @@
+ * with that of Package.this.allInnerClasses.
+ */
+ public List<InnerClass> computeGloballyImpliedICs() {
+- HashSet<Entry> cpRefs = new HashSet<>();
++ HashSet<Entry> cpRefs = new HashSet<Entry>();
+ { // This block temporarily displaces this.innerClasses.
+ ArrayList<InnerClass> innerClassesSaved = innerClasses;
+ innerClasses = null; // ignore for the moment
+@@ -329,7 +329,7 @@
+ }
+ ConstantPool.completeReferencesIn(cpRefs, true);
+
+- HashSet<Entry> icRefs = new HashSet<>();
++ HashSet<Entry> icRefs = new HashSet<Entry>();
+ for (Entry e : cpRefs) {
+ // Restrict cpRefs to InnerClasses entries only.
+ if (!(e instanceof ClassEntry)) continue;
+@@ -345,7 +345,7 @@
+ // This loop is structured this way so as to accumulate
+ // entries into impliedICs in an order which reflects
+ // the order of allInnerClasses.
+- ArrayList<InnerClass> impliedICs = new ArrayList<>();
++ ArrayList<InnerClass> impliedICs = new ArrayList<InnerClass>();
+ for (InnerClass ic : allInnerClasses) {
+ // This one is locally relevant if it describes
+ // a member of the current class, or if the current
+@@ -388,8 +388,8 @@
+ // Diff is A since I is empty.
+ }
+ // (I*A) is non-trivial
+- HashSet<InnerClass> center = new HashSet<>(actualICs);
+- center.retainAll(new HashSet<>(impliedICs));
++ HashSet<InnerClass> center = new HashSet<InnerClass>(actualICs);
++ center.retainAll(new HashSet<InnerClass>(impliedICs));
+ impliedICs.addAll(actualICs);
+ impliedICs.removeAll(center);
+ // Diff is now I^A = (I+A)-(I*A).
+@@ -518,7 +518,7 @@
+ super(flags, descriptor);
+ assert(!descriptor.isMethod());
+ if (fields == null)
+- fields = new ArrayList<>();
++ fields = new ArrayList<Field>();
+ boolean added = fields.add(this);
+ assert(added);
+ order = fields.size();
+@@ -543,7 +543,7 @@
+ super(flags, descriptor);
+ assert(descriptor.isMethod());
+ if (methods == null)
+- methods = new ArrayList<>();
++ methods = new ArrayList<Method>();
+ boolean added = methods.add(this);
+ assert(added);
+ }
+@@ -713,14 +713,14 @@
+ }
+
+ // What non-class files are in this unit?
+- ArrayList<File> files = new ArrayList<>();
++ ArrayList<File> files = new ArrayList<File>();
+
+ public List<File> getFiles() {
+ return files;
+ }
+
+ public List<File> getClassStubs() {
+- ArrayList<File> classStubs = new ArrayList<>(classes.size());
++ ArrayList<File> classStubs = new ArrayList<File>(classes.size());
+ for (Class cls : classes) {
+ assert(cls.file.isClassStub());
+ classStubs.add(cls.file);
+@@ -839,7 +839,7 @@
+ public InputStream getInputStream() {
+ InputStream in = new ByteArrayInputStream(append.toByteArray());
+ if (prepend.size() == 0) return in;
+- ArrayList<InputStream> isa = new ArrayList<>(prepend.size()+1);
++ ArrayList<InputStream> isa = new ArrayList<InputStream>(prepend.size()+1);
+ for (Iterator i = prepend.iterator(); i.hasNext(); ) {
+ byte[] bytes = (byte[]) i.next();
+ isa.add(new ByteArrayInputStream(bytes));
+@@ -876,7 +876,7 @@
+ }
+
+ // Is there a globally declared table of inner classes?
+- ArrayList<InnerClass> allInnerClasses = new ArrayList<>();
++ ArrayList<InnerClass> allInnerClasses = new ArrayList<InnerClass>();
+ HashMap<ClassEntry, InnerClass> allInnerClassesByThis;
+
+ public
+@@ -891,7 +891,7 @@
+ allInnerClasses.addAll(ics);
+
+ // Make an index:
+- allInnerClassesByThis = new HashMap<>(allInnerClasses.size());
++ allInnerClassesByThis = new HashMap<ClassEntry,InnerClass>(allInnerClasses.size());
+ for (InnerClass ic : allInnerClasses) {
+ Object pic = allInnerClassesByThis.put(ic.thisClass, ic);
+ assert(pic == null); // caller must ensure key uniqueness!
+@@ -1288,7 +1288,7 @@
+
+ // Use this before writing the class files.
+ void ensureAllClassFiles() {
+- HashSet<File> fileSet = new HashSet<>(files);
++ HashSet<File> fileSet = new HashSet<File>(files);
+ for (Class cls : classes) {
+ // Add to the end of ths list:
+ if (!fileSet.contains(cls.file))
+diff -r 240d4d3f2db7 src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java Tue Sep 14 17:29:58 2010 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java Wed Sep 15 00:00:17 2010 +0100
+@@ -599,7 +599,7 @@
+
+ List<InFile> scanJar(JarFile jf) throws IOException {
+ // Collect jar entries, preserving order.
+- List<InFile> inFiles = new ArrayList<>();
++ List<InFile> inFiles = new ArrayList<InFile>();
+ for (JarEntry je : Collections.list(jf.entries())) {
+ InFile inFile = new InFile(jf, je);
+ assert(je.isDirectory() == inFile.name.endsWith("/"));
+diff -r 240d4d3f2db7 src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java Tue Sep 14 17:29:58 2010 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java Wed Sep 15 00:00:17 2010 +0100
+@@ -58,12 +58,12 @@
+ private final Map<String, MemberEntry> memberEntries;
+
+ TLGlobals() {
+- utf8Entries = new HashMap<>();
+- classEntries = new HashMap<>();
+- literalEntries = new HashMap<>();
+- signatureEntries = new HashMap<>();
+- descriptorEntries = new HashMap<>();
+- memberEntries = new HashMap<>();
++ utf8Entries = new HashMap<String,Utf8Entry>();
++ classEntries = new HashMap<String,ClassEntry>();
++ literalEntries = new HashMap<Object,LiteralEntry>();
++ signatureEntries = new HashMap<String,SignatureEntry>();
++ descriptorEntries = new HashMap<String,DescriptorEntry>();
++ memberEntries = new HashMap<String,MemberEntry>();
+ props = new PropMap();
+ }
+
+diff -r 240d4d3f2db7 src/share/classes/com/sun/java/util/jar/pack/Utils.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java Tue Sep 14 17:29:58 2010 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java Wed Sep 15 00:00:17 2010 +0100
+@@ -123,7 +123,7 @@
+ // Keep a TLS point to the global data and environment.
+ // This makes it simpler to supply environmental options
+ // to the engine code, especially the native code.
+- static final ThreadLocal<TLGlobals> currentInstance = new ThreadLocal<>();
++ static final ThreadLocal<TLGlobals> currentInstance = new ThreadLocal<TLGlobals>();
+
+ // convenience methods to access the TL globals
+ static TLGlobals getTLGlobals() {
+diff -r 240d4d3f2db7 src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java Tue Sep 14 17:29:58 2010 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java Wed Sep 15 14:34:26 2010 +0100
+@@ -199,7 +199,7 @@
+ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
+ pkg.ensureAllClassFiles();
+ // Now write out the files.
+- HashSet<Package.Class> classesToWrite = new HashSet<>(pkg.getClasses());
++ HashSet<Package.Class> classesToWrite = new HashSet<Package.Class>(pkg.getClasses());
+ for (Iterator i = pkg.getFiles().iterator(); i.hasNext(); ) {
+ Package.File file = (Package.File) i.next();
+ String name = file.nameString;
More information about the distro-pkg-dev
mailing list