changeset ee0f1bb78ec6 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ee0f1bb78ec6 description: 2007-10-14 Thomas Fitzsimmons <[hidden email]> * Makefile.am (OPENJDK_VERSION): Update for b22. (OPENJDK_DATE): Likewise. (OPENJDK_MD5SUM): Likewise. (ICEDTEA_PATCHES): Remove patches/icedtea-xinerama.patch. Add patches/icedtea-xjc.patch. (OPENJDK_SOURCEPATH_DIRS): Add openjdk/jaxp/src/share/classes. (stamps/extract.stamp): Remove openjdk/jaxws. (ICEDTEA_ENV): Fix ANT_HOME, BUILD_NUMBER, JRE_RELEASE_VERSION, and HOTSPOT_RELEASE_VERSION. Add ALT_JDK_IMPORT_PATH. * Makefile.in: Regenerate. * patches/icedtea-xinerama.patch: Remove file. diffstat: 15 files changed, 368 insertions(+), 330 deletions(-) ChangeLog | 14 ++ Makefile.am | 47 +++++---- Makefile.in | 46 +++++---- patches/icedtea-ant.patch | 50 +++++++++- patches/icedtea-certbundle.patch | 35 +++---- patches/icedtea-copy-plugs.patch | 125 +++++++++++++------------- patches/icedtea-debuginfo.patch | 56 ++++++----- patches/icedtea-license-headers.patch | 45 +-------- patches/icedtea-memory-limits.patch | 28 +++-- patches/icedtea-paths.patch | 147 +++++++++++++------------------ patches/icedtea-plugin.patch | 31 +++--- patches/icedtea-speed.patch | 36 +++---- patches/icedtea-use-system-tzdata.patch | 16 +-- patches/icedtea-xinerama.patch | 12 -- patches/icedtea-xjc.patch | 10 ++ diffs (truncated from 1101 to 500 lines): diff -r f9b8887af3ab -r ee0f1bb78ec6 ChangeLog --- a/ChangeLog Fri Oct 12 12:26:19 2007 -0400 +++ b/ChangeLog Sun Oct 14 23:24:57 2007 -0400 @@ -1,3 +1,17 @@ 2007-10-12 Lillian Angel <langel@redha +2007-10-14 Thomas Fitzsimmons <[hidden email]> + + * Makefile.am (OPENJDK_VERSION): Update for b22. + (OPENJDK_DATE): Likewise. + (OPENJDK_MD5SUM): Likewise. + (ICEDTEA_PATCHES): Remove patches/icedtea-xinerama.patch. Add + patches/icedtea-xjc.patch. + (OPENJDK_SOURCEPATH_DIRS): Add openjdk/jaxp/src/share/classes. + (stamps/extract.stamp): Remove openjdk/jaxws. + (ICEDTEA_ENV): Fix ANT_HOME, BUILD_NUMBER, JRE_RELEASE_VERSION, + and HOTSPOT_RELEASE_VERSION. Add ALT_JDK_IMPORT_PATH. + * Makefile.in: Regenerate. + * patches/icedtea-xinerama.patch: Remove file. + 2007-10-12 Lillian Angel <[hidden email]> * NEWS: Updated for 1.4. diff -r f9b8887af3ab -r ee0f1bb78ec6 Makefile.am --- a/Makefile.am Fri Oct 12 12:26:19 2007 -0400 +++ b/Makefile.am Sun Oct 14 23:24:57 2007 -0400 @@ -1,6 +1,6 @@ OPENJDK_VERSION = b21 -OPENJDK_VERSION = b21 -OPENJDK_DATE = 27_sep_2007 -OPENJDK_MD5SUM = 64ac356cd24af5e52cf9fd1217e234da +OPENJDK_VERSION = b22 +OPENJDK_DATE = 12_oct_2007 +OPENJDK_MD5SUM = 7cf9c2765fb16c36c07f961b2a009cb2 # Top-Level Targets # ================= @@ -30,23 +30,25 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC # OpenJDK build environment. LINUX_DIR = linux-$(BUILD_ARCH_DIR) +BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR) ICEDTEA_BUILD_DIR = \ - $(abs_top_srcdir)/openjdk/control/build/$(LINUX_DIR)/ + $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/ ICEDTEA_RT = \ $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ICEDTEA_CLS_DIR = \ - $(abs_top_srcdir)/openjdk/control/build/$(LINUX_DIR)/classes + $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes ICEDTEA_ENDORSED_DIR = \ $(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed ICEDTEA_ENV = \ - "ANT_HOME=@SYSTEM_ANT_DIR@" \ - "BUILD_NUMBER=b21" \ - "JRE_RELEASE_VERSION=1.7.0-b21" \ - "HOTSPOT_RELEASE_VERSION=1.7.0-b21" \ + "ANT_HOME=$(SYSTEM_ANT_DIR)" \ + "BUILD_NUMBER=$(OPENJDK_VERSION)" \ + "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \ + "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \ + "ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \ "ICEDTEA_RT=$(ICEDTEA_RT)" \ "ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \ @@ -95,13 +97,14 @@ clean-download: rm -f stamps/download.stamp rm -f $(OPENJDK_SRC_ZIP) -# Extract OpenJDK sources. +# Extratc OpenJDK sources. stamps/extract.stamp: stamps/download.stamp if ! test -d openjdk ; \ then \ $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \ chmod ug+w `find openjdk/j2se/src/share/demo/jvmti \ -name sample.makefile.txt` ; \ + rm -rf openjdk/jaxws ; \ fi mkdir -p stamps touch stamps/extract.stamp @@ -139,9 +142,9 @@ ICEDTEA_PATCHES = \ patches/icedtea-gcc-suffix.patch \ patches/icedtea-bytebuffer-compact.patch \ patches/icedtea-float-double-trailing-zeros.patch \ - patches/icedtea-xinerama.patch \ patches/icedtea-gtkplaf.patch \ patches/icedtea-memory-limits.patch \ + patches/icedtea-xjc.patch \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES) @@ -195,16 +198,17 @@ clean-bootstrap-directory-symlink: # If you change anything here in the icedtea target, please make sure # you change it in the icedtea-debug target as well. -icedtea: stamps/bootstrap-directory-symlink.stamp stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ +icedtea: stamps/bootstrap-directory-symlink.stamp stamps/tools.stamp \ + stamps/plugs.stamp stamps/extract.stamp \ stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/control/make cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) - @echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR) + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) icedtea-debug: stamps/bootstrap-directory-symlink.stamp \ stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ @@ -214,11 +218,11 @@ icedtea-debug: stamps/bootstrap-director -C openjdk/control/make \ debug_build cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) + $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "IcedTea (debug build) is served:" \ - openjdk/control/build/$(LINUX_DIR)-debug + $(BUILD_OUTPUT_DIR)-debug clean-icedtea: stamps/extract.stamp $(MAKE) \ @@ -298,8 +302,13 @@ clean-copy: rm -rf rt/$$copy_dir ; \ done +SHARE = openjdk/j2se/src/share/classes +SOLARIS = openjdk/j2se/src/solaris/classes +LANGTOOLS = openjdk/langtools/src/share/classes +JAXP = openjdk/jaxp/src/share/classes + OPENJDK_SOURCEPATH_DIRS = \ - openjdk/j2se/src/share/classes:openjdk/j2se/src/solaris/classes:openjdk/langtools/src/share/classes + $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP) # tools.jar class files. stamps/tools-copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp diff -r f9b8887af3ab -r ee0f1bb78ec6 Makefile.in --- a/Makefile.in Fri Oct 12 12:26:19 2007 -0400 +++ b/Makefile.in Sun Oct 14 23:24:57 2007 -0400 @@ -180,36 +180,38 @@ target_alias = @target_alias@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -OPENJDK_VERSION = b21 -OPENJDK_DATE = 27_sep_2007 -OPENJDK_MD5SUM = 64ac356cd24af5e52cf9fd1217e234da +OPENJDK_VERSION = b22 +OPENJDK_DATE = 12_oct_2007 +OPENJDK_MD5SUM = 7cf9c2765fb16c36c07f961b2a009cb2 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) \ gcjwebplugin.cc patches/icedtea-speed.patch tools-copy-files.txt # OpenJDK build environment. LINUX_DIR = linux-$(BUILD_ARCH_DIR) +BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR) ICEDTEA_BUILD_DIR = \ - $(abs_top_srcdir)/openjdk/control/build/$(LINUX_DIR)/ + $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/ ICEDTEA_RT = \ $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ICEDTEA_CLS_DIR = \ - $(abs_top_srcdir)/openjdk/control/build/$(LINUX_DIR)/classes + $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes ICEDTEA_ENDORSED_DIR = \ $(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed ICEDTEA_ENV = \ - "ANT_HOME=@SYSTEM_ANT_DIR@" \ - "BUILD_NUMBER=b21" \ - "JRE_RELEASE_VERSION=1.7.0-b21" \ - "HOTSPOT_RELEASE_VERSION=1.7.0-b21" \ + "ANT_HOME=$(SYSTEM_ANT_DIR)" \ + "BUILD_NUMBER=$(OPENJDK_VERSION)" \ + "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \ + "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \ + "ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \ "ICEDTEA_RT=$(ICEDTEA_RT)" \ "ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \ @@ -255,9 +257,9 @@ ICEDTEA_PATCHES = \ patches/icedtea-gcc-suffix.patch \ patches/icedtea-bytebuffer-compact.patch \ patches/icedtea-float-double-trailing-zeros.patch \ - patches/icedtea-xinerama.patch \ patches/icedtea-gtkplaf.patch \ patches/icedtea-memory-limits.patch \ + patches/icedtea-xjc.patch \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES) @@ -286,8 +288,12 @@ ICEDTEA_COPY_DIRS = \ com/sun/tools/jdi \ java/util +SHARE = openjdk/j2se/src/share/classes +SOLARIS = openjdk/j2se/src/solaris/classes +LANGTOOLS = openjdk/langtools/src/share/classes +JAXP = openjdk/jaxp/src/share/classes OPENJDK_SOURCEPATH_DIRS = \ - openjdk/j2se/src/share/classes:openjdk/j2se/src/solaris/classes:openjdk/langtools/src/share/classes + $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP) all: all-am @@ -605,13 +611,14 @@ clean-download: rm -f stamps/download.stamp rm -f $(OPENJDK_SRC_ZIP) -# Extract OpenJDK sources. +# Extratc OpenJDK sources. stamps/extract.stamp: stamps/download.stamp if ! test -d openjdk ; \ then \ $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \ chmod ug+w `find openjdk/j2se/src/share/demo/jvmti \ -name sample.makefile.txt` ; \ + rm -rf openjdk/jaxws ; \ fi mkdir -p stamps touch stamps/extract.stamp @@ -665,16 +672,17 @@ clean-bootstrap-directory-symlink: # If you change anything here in the icedtea target, please make sure # you change it in the icedtea-debug target as well. -icedtea: stamps/bootstrap-directory-symlink.stamp stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ +icedtea: stamps/bootstrap-directory-symlink.stamp stamps/tools.stamp \ + stamps/plugs.stamp stamps/extract.stamp \ stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/control/make cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) - @echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR) + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) icedtea-debug: stamps/bootstrap-directory-symlink.stamp \ stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ @@ -684,11 +692,11 @@ icedtea-debug: stamps/bootstrap-director -C openjdk/control/make \ debug_build cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) + $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "IcedTea (debug build) is served:" \ - openjdk/control/build/$(LINUX_DIR)-debug + $(BUILD_OUTPUT_DIR)-debug clean-icedtea: stamps/extract.stamp $(MAKE) \ diff -r f9b8887af3ab -r ee0f1bb78ec6 patches/icedtea-ant.patch --- a/patches/icedtea-ant.patch Fri Oct 12 12:26:19 2007 -0400 +++ b/patches/icedtea-ant.patch Sun Oct 14 23:24:57 2007 -0400 @@ -1,6 +1,17 @@ ---- lang.orig 2007-10-02 11:57:53.000000000 -0400 -+++ openjdk/langtools/make/Makefile 2007-10-02 11:58:08.000000000 -0400 -@@ -129,16 +129,9 @@ +--- openjdk/corba/make/common/shared/Defs-utils.gmk.orig 2007-10-14 17:34:43.000000000 -0400 ++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2007-10-14 17:33:44.000000000 -0400 +@@ -71,7 +71,7 @@ + ifndef ANT_HOME + ANT_HOME = $(JDK_DEVTOOLS_DIR)/share/ant/latest + endif +-ANT = $(ANT_HOME)/bin/ant ++ANT = ant + ifndef FINDBUGS_HOME + FINDBUGS_HOME = $(JDK_DEVTOOLS_DIR)/share/findbugs/latest + endif +--- openjdk.orig/langtools/make/Makefile 2007-10-12 03:47:30.000000000 -0400 ++++ openjdk/langtools/make/Makefile 2007-10-12 17:11:46.000000000 -0400 +@@ -133,16 +133,9 @@ ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME) endif @@ -20,3 +31,36 @@ endif # Default target and expected 'do everything' target +--- openjdk/jaxp/make/Makefile.orig 2007-10-14 21:50:24.000000000 -0400 ++++ openjdk/jaxp/make/Makefile 2007-10-14 21:50:56.000000000 -0400 +@@ -100,16 +100,9 @@ + ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME) + endif + +-ifdef ANT_HOME +- ANT = $(ANT_HOME)/bin/ant +- ifneq ($(shell test -x $(ANT); echo $$?), 0) +- $(error "$(ANT) not found; please update ANT_HOME") +- endif +-else +- ANT = ant +- ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0) +- $(error "\"ant\" not found; please set ANT_HOME or put \"ant\" on your PATH") +- endif ++ANT = ant ++ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0) ++ $(error "\"ant\" not found; please put \"ant\" on your PATH") + endif + + # Default target and expected 'do everything' target +--- openjdk/j2se/make/common/shared/Defs-utils.gmk.orig 2007-10-14 17:35:02.000000000 -0400 ++++ openjdk/j2se/make/common/shared/Defs-utils.gmk 2007-10-14 17:34:07.000000000 -0400 +@@ -71,7 +71,7 @@ + ifndef ANT_HOME + ANT_HOME = $(JDK_DEVTOOLS_DIR)/share/ant/latest + endif +-ANT = $(ANT_HOME)/bin/ant ++ANT = ant + ifndef FINDBUGS_HOME + FINDBUGS_HOME = $(JDK_DEVTOOLS_DIR)/share/findbugs/latest + endif diff -r f9b8887af3ab -r ee0f1bb78ec6 patches/icedtea-certbundle.patch --- a/patches/icedtea-certbundle.patch Fri Oct 12 12:26:19 2007 -0400 +++ b/patches/icedtea-certbundle.patch Sun Oct 14 23:24:57 2007 -0400 @@ -1,10 +1,10 @@ ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2007-08-21 21:53:38.000000000 -0400 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2007-08-21 22:02:32.000000000 -0400 -@@ -376,6 +376,21 @@ +diff -urN openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2007-10-12 03:46:00.000000000 -0400 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2007-10-12 18:24:12.000000000 -0400 +@@ -376,6 +376,20 @@ } } -+ // Use the system zoneinfo files, if present + SystemProperty* sp = Arguments::system_properties(); + Arguments::PropertyList_add (&sp, + "javax.net.ssl.trustStore", @@ -22,19 +22,9 @@ #undef malloc #undef getenv #undef EXTENSIONS_DIR -diff -ruN openjdk.old/j2se/src/share/classes/sun/security/provider/SunEntries.java openjdk/j2se/src/share/classes/sun/security/provider/SunEntries.java ---- openjdk.old/j2se/src/share/classes/sun/security/provider/SunEntries.java 2007-09-27 04:07:14.000000000 -0400 -+++ openjdk/j2se/src/share/classes/sun/security/provider/SunEntries.java 2007-10-09 10:34:59.000000000 -0400 -@@ -178,6 +178,7 @@ - map.put("KeyStore.JKS", "sun.security.provider.JavaKeyStore$JKS"); - map.put("KeyStore.CaseExactJKS", - "sun.security.provider.JavaKeyStore$CaseExactJKS"); -+ map.put("KeyStore.CertBundle", "sun.security.provider.CertBundleKeyStoreImpl"); - - /* - * Policy ---- openjdk.old/j2se/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/j2se/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java 2007-10-09 11:06:30.000000000 -0400 +diff -urN openjdk.orig/j2se/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java openjdk/j2se/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java +--- openjdk.orig/j2se/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java 1969-12-31 19:00:00.000000000 -0500 ++++ openjdk/j2se/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java 2007-10-12 18:24:05.000000000 -0400 @@ -0,0 +1,199 @@ +/* CertBundleKeyStoreImpl.java + Copyright (C) 2007 Casey Marshall <[hidden email]> @@ -235,3 +225,14 @@ diff -ruN openjdk.old/j2se/src/share/cla + throw new UnsupportedOperationException("read-only key stores"); + } +} +diff -urN openjdk.orig/j2se/src/share/classes/sun/security/provider/SunEntries.java openjdk/j2se/src/share/classes/sun/security/provider/SunEntries.java +--- openjdk.orig/j2se/src/share/classes/sun/security/provider/SunEntries.java 2007-10-12 04:03:24.000000000 -0400 ++++ openjdk/j2se/src/share/classes/sun/security/provider/SunEntries.java 2007-10-12 18:24:05.000000000 -0400 +@@ -178,6 +178,7 @@ + map.put("KeyStore.JKS", "sun.security.provider.JavaKeyStore$JKS"); + map.put("KeyStore.CaseExactJKS", + "sun.security.provider.JavaKeyStore$CaseExactJKS"); ++ map.put("KeyStore.CertBundle", "sun.security.provider.CertBundleKeyStoreImpl"); + + /* + * Policy diff -r f9b8887af3ab -r ee0f1bb78ec6 patches/icedtea-copy-plugs.patch --- a/patches/icedtea-copy-plugs.patch Fri Oct 12 12:26:19 2007 -0400 +++ b/patches/icedtea-copy-plugs.patch Sun Oct 14 23:24:57 2007 -0400 @@ -1,43 +1,7 @@ diff -urN openjdk.orig/j2se/src/share/cl -diff -urN openjdk.orig/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java openjdk/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java ---- openjdk.orig/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2007-05-24 03:41:34.000000000 -0400 -+++ openjdk/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2007-06-22 17:06:14.000000000 -0400 -@@ -1154,7 +1154,7 @@ - Set<BitSet> getterIndexSets = newSet(); - for (Constructor constr : annotatedConstrList) { - String[] propertyNames = -- constr.getAnnotation(propertyNamesClass).value(); -+ ((ConstructorProperties)constr.getAnnotation(propertyNamesClass)).value(); - - Type[] paramTypes = constr.getGenericParameterTypes(); - if (paramTypes.length != propertyNames.length) { -diff -urN openjdk.orig/j2se/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/j2se/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java ---- openjdk.orig/j2se/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2007-05-24 03:41:34.000000000 -0400 -+++ openjdk/j2se/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2007-06-22 17:06:14.000000000 -0400 -@@ -78,6 +78,9 @@ - */ - public long timeStamp ; - -+ // TODO: IcedTea: I am a stub. -+ static public int trapAuthenticationFailure = 0; -+ - - - /** -diff -urN openjdk.orig/j2se/src/share/classes/java/beans/MetaData.java openjdk/j2se/src/share/classes/java/beans/MetaData.java ---- openjdk.orig/j2se/src/share/classes/java/beans/MetaData.java 2007-05-24 03:42:31.000000000 -0400 -+++ openjdk/j2se/src/share/classes/java/beans/MetaData.java 2007-06-22 17:06:14.000000000 -0400 -@@ -1565,7 +1565,7 @@ - } - - private static String[] getAnnotationValue(Constructor constructor) { -- ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class); -+ ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class)); - return (annotation != null) - ? annotation.value() - : null; ---- ../openjdk-b21/openjdk/j2se/make/common/internal/BinaryPlugs.gmk 2007-09-27 22:30:28.000000000 -0400 -+++ openjdk/j2se/make/common/internal/BinaryPlugs.gmk 2007-09-28 11:02:55.000000000 -0400 -@@ -53,8 +53,6 @@ +diff -urN openjdk.orig/j2se/make/common/internal/BinaryPlugs.gmk openjdk/j2se/make/common/internal/BinaryPlugs.gmk +--- openjdk.orig/j2se/make/common/internal/BinaryPlugs.gmk 2007-10-12 03:54:05.000000000 -0400 ++++ openjdk/j2se/make/common/internal/BinaryPlugs.gmk 2007-10-12 17:23:25.000000000 -0400 +@@ -51,8 +51,6 @@ com/sun/jmx/snmp/SnmpDataTypeEnums.class \ com/sun/jmx/snmp/SnmpDefinitions.class \ com/sun/jmx/snmp/SnmpOid.class \ @@ -46,7 +10,7 @@ diff -urN openjdk.orig/j2se/src/share/cl com/sun/jmx/snmp/SnmpOidRecord.class \ com/sun/jmx/snmp/SnmpOidTable.class \ com/sun/jmx/snmp/SnmpOidTableSupport.class \ -@@ -64,17 +62,9 @@ +@@ -62,17 +60,9 @@ com/sun/jmx/snmp/SnmpTimeticks.class \ com/sun/jmx/snmp/SnmpVarBind.class \ com/sun/jmx/snmp/SnmpVarBindList.class \ @@ -65,7 +29,7 @@ diff -urN openjdk.orig/j2se/src/share/cl PLUG_SOUND_CLASS_NAMES = \ com/sun/media/sound/AbstractPlayer.class \ -@@ -132,9 +122,6 @@ +@@ -130,9 +120,6 @@ java/awt/color/CMMException.class \ java/awt/color/ColorSpace.class \ java/awt/color/ICC_ColorSpace.class \ @@ -75,20 +39,22 @@ diff -urN openjdk.orig/j2se/src/share/cl java/awt/color/ICC_Profile.class \ java/awt/color/ICC_ProfileGray.class \ java/awt/color/ICC_ProfileRGB.class \ -@@ -179,8 +166,10 @@ - - # Class list temp files (used by both import and export of plugs) +@@ -160,10 +147,12 @@ + java/awt/image/renderable/RenderableImageProducer.class \ + java/awt/image/renderable/RenderedImageFactory.class +PLUG_GNU_CLASS_NAMES = gnu + + # Class list temp files (used by both import and export of plugs) + PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs --PLUG_CLASS_AREAS = jmf sound awt dc -+PLUG_CLASS_AREAS = jmf sound awt dc gnu +-PLUG_CLASS_AREAS = jmf sound awt ++PLUG_CLASS_AREAS = jmf sound awt gnu PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist) # Create jargs file command -@@ -213,6 +202,11 @@ - @for i in $(PLUG_DC_CLASS_NAMES) ; do \ +@@ -191,6 +180,11 @@ + @for i in $(PLUG_AWT_CLASS_NAMES) ; do \ $(ECHO) "$$i" >> $@ ; \ done +$(PLUG_TEMPDIR)/gnu.clist: @@ -99,16 +65,16 @@ diff -urN openjdk.orig/j2se/src/share/cl $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS) @$(prep-target) $(CAT) $(PLUG_CLISTS) > $@ -@@ -222,6 +216,8 @@ +@@ -200,6 +194,8 @@ $(plug-create-jargs) $(PLUG_TEMPDIR)/awt.jargs: $(PLUG_TEMPDIR)/awt.clist $(plug-create-jargs) +$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist |
Free forum by Nabble | Edit this page |