Mercurial > hg > release > icedtea6-1.7
changeset 2004:6c21e99512e1
Allow NetX to be disabled.
2010-11-18 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(NETX_DIR): Define only when NetX is enabled
and set to syntax for jar (like LIVECONNECT_DIR).
(ICEDTEA_PATCHES): Only apply icedtea-webstart.patch,
icedtea-copy-plugs.patch and icedtea-webstart-umask.patch
if NetX is enabled. Add snmp.patch, getannotation-cast.patch
and applet_hole.patch which have been split out from these
conditional patches.
(ICEDTEA_ECJ_PATCHES): Drop icedtea-ant.patch, redundant.
(ICEDTEA_ENV): Only add IMPORT_BINARY_PLUGS and
ALT_BINARY_PLUGS_PATH if NetX is enabled.
(distclean-local): Add clean-about.
(.PHONY): Likewise.
(icedtea): Depend on about.stamp. Add
ENABLE_NETX conditional.
(icedtea-debug): Likewise.
(netx): Add ENABLE_NETX conditional.
(netx-dist): Likewise.
(extra-class-files): Likewise.
(about): New target (from extra-lib/about.jar).
Add ENABLE_NETX conditional.
(clean-about): New target to remove about.jar.
(rt-source-files): Filter out NetX sources if not
building NetX.
(rt-class-files): Only add NetX resources if building
NetX.
(rt): Replace '-C lib/rt net' with NETX_DIR so NetX
sources are only included if NetX is enabled.
* acinclude.m4:
(IT_CHECK_OLD_PLUGIN): Remove outdated version warning
about old plugin.
(IT_CHECK_PLUGIN_DEPENDENCIES): Require IT_CHECK_NETX.
Disable both plugins if NetX is turned off.
(IT_CHECK_NETX): Add --disable-webstart option.
* patches/ecj/icedtea-ant.patch:
Dropped. Was wrongly applied to openjdk, not
openjdk-ecj and breaks when netx is turned off.
* patches/icedtea-copy-plugs.patch:
Only include segments related to plug installation
and apply only when building NetX.
* patches/getannotation-cast.patch,
* patches/snmp.patch:
New patches broken out from copy-plugs.patch which
are always applied.
* patches/applet_hole.patch:
Split applet class patching into separate
file to be applied in all builds.
* patches/icedtea-webstart.patch:
Include only the Makefile additions to build
the jaxws binary and documentation.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Thu, 18 Nov 2010 12:59:14 +0000 |
| parents | fcc8fa217369 |
| children | 2eff7c2e01d1 |
| files | ChangeLog Makefile.am acinclude.m4 patches/ecj/icedtea-ant.patch patches/getannotation-cast.patch patches/icedtea-copy-plugs.patch patches/icedtea-webstart.patch patches/snmp.patch |
| diffstat | 8 files changed, 161 insertions(+), 183 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Oct 18 12:52:22 2010 -0400 +++ b/ChangeLog Thu Nov 18 12:59:14 2010 +0000 @@ -1,3 +1,56 @@ +2010-11-18 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (NETX_DIR): Define only when NetX is enabled + and set to syntax for jar (like LIVECONNECT_DIR). + (ICEDTEA_PATCHES): Only apply icedtea-webstart.patch, + icedtea-copy-plugs.patch and icedtea-webstart-umask.patch + if NetX is enabled. Add snmp.patch, getannotation-cast.patch + and applet_hole.patch which have been split out from these + conditional patches. + (ICEDTEA_ECJ_PATCHES): Drop icedtea-ant.patch, redundant. + (ICEDTEA_ENV): Only add IMPORT_BINARY_PLUGS and + ALT_BINARY_PLUGS_PATH if NetX is enabled. + (distclean-local): Add clean-about. + (.PHONY): Likewise. + (icedtea): Depend on about.stamp. Add + ENABLE_NETX conditional. + (icedtea-debug): Likewise. + (netx): Add ENABLE_NETX conditional. + (netx-dist): Likewise. + (extra-class-files): Likewise. + (about): New target (from extra-lib/about.jar). + Add ENABLE_NETX conditional. + (clean-about): New target to remove about.jar. + (rt-source-files): Filter out NetX sources if not + building NetX. + (rt-class-files): Only add NetX resources if building + NetX. + (rt): Replace '-C lib/rt net' with NETX_DIR so NetX + sources are only included if NetX is enabled. + * acinclude.m4: + (IT_CHECK_OLD_PLUGIN): Remove outdated version warning + about old plugin. + (IT_CHECK_PLUGIN_DEPENDENCIES): Require IT_CHECK_NETX. + Disable both plugins if NetX is turned off. + (IT_CHECK_NETX): Add --disable-webstart option. + * patches/ecj/icedtea-ant.patch: + Dropped. Was wrongly applied to openjdk, not + openjdk-ecj and breaks when netx is turned off. + * patches/icedtea-copy-plugs.patch: + Only include segments related to plug installation + and apply only when building NetX. + * patches/getannotation-cast.patch, + * patches/snmp.patch: + New patches broken out from copy-plugs.patch which + are always applied. + * patches/applet_hole.patch: + Split applet class patching into separate + file to be applied in all builds. + * patches/icedtea-webstart.patch: + Include only the Makefile additions to build + the jaxws binary and documentation. + 2010-10-18 Omair Majid <omajid@redhat.com> * netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java:
--- a/Makefile.am Mon Oct 18 12:52:22 2010 -0400 +++ b/Makefile.am Thu Nov 18 12:59:14 2010 +0000 @@ -138,6 +138,10 @@ endif endif +if ENABLE_NETX +NETX_DIR = -C lib/rt net +endif + if WITH_VISUALVM NB_PLATFORM= $(shell ls /usr/share/netbeans | grep platform | tail -n1) NB_APISUPPORT=$(shell ls /usr/share/netbeans | grep apisupport | tail -n1) @@ -272,12 +276,9 @@ patches/icedtea-lucene-crash.patch \ patches/icedtea-version.patch \ patches/icedtea-version-hotspot.patch \ - patches/icedtea-copy-plugs.patch \ patches/icedtea-text-relocations.patch \ patches/icedtea-ssl.patch \ $(PLUGIN_PATCH) \ - patches/icedtea-webstart.patch \ - patches/icedtea-webstart-umask.patch \ patches/icedtea-rmi_amd64.patch \ patches/icedtea-tools.patch \ patches/icedtea-timezone.patch \ @@ -370,7 +371,10 @@ patches/openjdk/6638712-wildcard_types.patch \ patches/openjdk/6650759-missing_inference.patch \ patches/numa_on_early_glibc.patch \ - patches/openjdk/6853592-badwindow-warning-fix.patch + patches/openjdk/6853592-badwindow-warning-fix.patch \ + patches/snmp.patch \ + patches/getannotation-cast.patch \ + patches/applet_hole.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \ @@ -386,6 +390,13 @@ patches/hotspot/original/6539464-consistent-math.patch endif +if ENABLE_NETX +ICEDTEA_PATCHES += \ + patches/icedtea-webstart.patch \ + patches/icedtea-webstart-umask.patch \ + patches/icedtea-copy-plugs.patch +endif + if WITH_RHINO ICEDTEA_PATCHES += \ patches/icedtea-rhino.patch @@ -440,7 +451,7 @@ # Bootstrapping patches -ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea-ant.patch \ +ICEDTEA_ECJ_PATCHES = \ patches/ecj/icedtea.patch \ patches/ecj/icedtea-hotspot.patch \ patches/ecj/icedtea-spp.patch \ @@ -476,7 +487,6 @@ PLUGIN_VERSION = $(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG) ICEDTEA_ENV = \ - IMPORT_BINARY_PLUGS=true \ ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \ ANT="$(ANT)" \ BUILD_NUMBER="$(OPENJDK_VERSION)" \ @@ -486,7 +496,6 @@ LANG="C" \ PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \ ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \ - ALT_BINARY_PLUGS_PATH="$(abs_top_builddir)/bootstrap/jdk1.7.0" \ BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \ ICEDTEA_RT="$(ICEDTEA_RT)" \ ICEDTEA_BUILD_DIR="$(ICEDTEA_BUILD_DIR)" \ @@ -519,6 +528,12 @@ DEBUG_CLASSFILES="true" \ DEBUG_BINARIES="true" +if ENABLE_NETX +ICEDTEA_ENV += \ + IMPORT_BINARY_PLUGS=true \ + ALT_BINARY_PLUGS_PATH="$(abs_top_builddir)/bootstrap/jdk1.7.0" +endif + if WITH_CACAO ICEDTEA_ENV += \ ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)" @@ -674,7 +689,7 @@ check-local: jtregcheck #FIXME (clean): Should become clean-local. -distclean-local: clean-copy clean-jtreg clean-jtreg-reports clean-pulse-java +distclean-local: clean-copy clean-jtreg clean-jtreg-reports clean-pulse-java clean-about rm -rf stamps rm -f rt-source-files.txt \ hotspot-tools-source-files.txt \ @@ -717,7 +732,7 @@ clean-tools-jar clean-shared-objects clean-visualvm clean-nbplatform \ clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \ $(ICEDTEANPPLUGIN_CLEAN) hotspot hotspot-helper clean-extra clean-jtreg \ - clean-jtreg-reports + clean-jtreg-reports clean-about env: @echo 'unset JAVA_HOME' @@ -1304,7 +1319,7 @@ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ $(ICEDTEAPLUGIN_TARGET) \ - extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \ + stamps/about.stamp stamps/cacao.stamp stamps/visualvm.stamp \ stamps/pulse-java.stamp stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ @@ -1357,6 +1372,7 @@ cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif +if ENABLE_NETX cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ @@ -1371,6 +1387,7 @@ cp $(NETX_SRCDIR)/javaws.1 \ $(BUILD_OUTPUT_DIR)/j2re-image/man/man1 ; \ fi +endif if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1415,7 +1432,7 @@ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ $(ICEDTEAPLUGIN_TARGET) \ - extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \ + stamps/about.stamp stamps/cacao.stamp stamps/visualvm.stamp \ stamps/pulse-java.stamp stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ @@ -1468,6 +1485,7 @@ cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif +if ENABLE_NETX cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib ; \ @@ -1482,6 +1500,7 @@ cp $(NETX_SRCDIR)/javaws.1 \ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1 ; \ fi +endif if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -1685,6 +1704,7 @@ stamps/extra-class-files.stamp: extra-source-files.txt \ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar +if ENABLE_NETX mkdir -p extra-lib if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ @@ -1700,6 +1720,7 @@ fi cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \ extra-lib/net/sourceforge/jnlp/about +endif mkdir -p stamps touch $@ @@ -1708,13 +1729,21 @@ rm -f stamps/extra-class-files.stamp rm -f extra-source-files.txt -extra-lib/about.jar: stamps/extra-class-files.stamp +stamps/about.stamp: stamps/extra-class-files.stamp +if ENABLE_NETX if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ - $(JAR) cf $@ -C extra-lib net ; \ + $(JAR) cf extra-lib/about.jar -C extra-lib net ; \ else \ - $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \ + $(ICEDTEA_BOOT_DIR)/bin/jar cf extra-lib/about.jar -C extra-lib net ; \ fi +endif + mkdir -p stamps + touch $@ + +clean-about: + rm -f extra-lib/about.jar + rm -f stamps/about.stamp # PulseAudio based mixer # (pulse-java) @@ -2265,7 +2294,12 @@ # rt-closed.jar class files. rt-source-files.txt: stamps/replace-hotspot.stamp stamps/copy-source-files.stamp find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt $(LIVECONNECT_SRCS) -name '*.java' \ - | sort -u > $@ + | sort -u > rt-source-files.tmp.txt +if ENABLE_NETX + mv rt-source-files.tmp.txt $@ +else + cat rt-source-files.tmp.txt | grep -v 'sourceforge' > $@ +endif stamps/rt-class-files.stamp: rt-source-files.txt mkdir -p lib/rt @@ -2283,8 +2317,10 @@ '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \ -classpath \'\' -bootclasspath \'\' @$< ; \ fi +if ENABLE_NETX cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \ lib/rt/net/sourceforge/jnlp/ +endif mkdir -p stamps touch stamps/rt-class-files.stamp @@ -2325,10 +2361,10 @@ if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ $(JAR) cf $@ -C lib/rt com -C lib/rt java \ - -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ; \ + -C lib/rt javax $(LIVECONNECT_DIR) $(NETX_DIR) -C lib/rt sun ; \ else \ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \ - -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ; \ + -C lib/rt javax $(LIVECONNECT_DIR) $(NETX_DIR) -C lib/rt sun ; \ fi if test -d bootstrap/ecj/jre/lib ; \ then \
--- a/acinclude.m4 Mon Oct 18 12:52:22 2010 -0400 +++ b/acinclude.m4 Thu Nov 18 12:59:14 2010 +0000 @@ -1267,7 +1267,7 @@ [enable_plugin="${enableval}"], [enable_plugin="no"]) AC_MSG_RESULT(${enable_plugin}) if test "x${enable_plugin}" = "xyes"; then - AC_MSG_WARN([The old plugin is no longer maintained and will be removed in 1.7.5.]) + AC_MSG_WARN([The old plugin is no longer maintained.]) fi ]) @@ -1285,8 +1285,14 @@ [ dnl Check for plugin support headers and libraries. dnl FIXME: use unstable +AC_REQUIRE([IT_CHECK_NETX]) AC_REQUIRE([IT_CHECK_OLD_PLUGIN]) AC_REQUIRE([IT_CHECK_NEW_PLUGIN]) +if test "x${enable_netx}" = "xno" ; then + AC_MSG_WARN([Plugin can not be built without NetX; disabling plugin]) + enable_plugin=no; + enable_npplugin=no; +fi if test "x${enable_plugin}" = "xyes" -o "x${enable_npplugin}" = "xyes" ; then PKG_CHECK_MODULES(GTK, gtk+-2.0) PKG_CHECK_MODULES(GLIB, glib-2.0) @@ -1350,3 +1356,14 @@ AM_CONDITIONAL([HAS_PAX], test x"${it_cv_pax}" = "xyes") AC_PROVIDE([$0])dnl ]) + +AC_DEFUN_ONCE([IT_CHECK_NETX], +[ +AC_MSG_CHECKING([whether to build NetX]) +AC_ARG_ENABLE([webstart], + [AS_HELP_STRING([--disable-webstart], + [Disable compilation of Web Start support])], + [enable_netx="${enableval}"], [enable_netx="yes"]) +AC_MSG_RESULT(${enable_netx}) +AM_CONDITIONAL(ENABLE_NETX, test "x${enable_netx}" = "xyes") +])
--- a/patches/ecj/icedtea-ant.patch Mon Oct 18 12:52:22 2010 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ ---- iopenjdk/jaxws/make/Makefile 2007-10-12 03:52:21.000000000 -0400 -+++ openjdk/jaxws/make/Makefile 2007-11-13 11:02:07.000000000 -0500 -@@ -80,6 +80,7 @@ - endif - - ifdef ALT_BOOTDIR -+ ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH) - ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) - endif - ---- iopenjdk/jaxws/make/build.xml 2007-10-12 03:52:21.000000000 -0400 -+++ openjdk/jaxws/make/build.xml 2007-11-13 11:02:43.000000000 -0500 -@@ -109,6 +109,7 @@ - memoryMaximumSize="${javac.memoryMaximumSize}" - target="${javac.target}" - excludes="com/sun/tools/internal/txw2/**"> -+ <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/> - <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> - <compilerarg line="${javac.version.opt}"/> - <compilerarg line="${javac.no.jdk.warnings}"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/getannotation-cast.patch Thu Nov 18 12:59:14 2010 +0000 @@ -0,0 +1,24 @@ +diff -urN openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java +--- openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2008-08-28 04:12:12.000000000 -0400 ++++ openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2008-11-05 17:18:36.000000000 -0500 +@@ -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/jdk/src/share/classes/java/beans/MetaData.java openjdk/jdk/src/share/classes/java/beans/MetaData.java +--- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java 2008-08-28 04:12:48.000000000 -0400 ++++ openjdk/jdk/src/share/classes/java/beans/MetaData.java 2008-11-05 17:18:36.000000000 -0500 +@@ -1628,7 +1628,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;
--- a/patches/icedtea-copy-plugs.patch Mon Oct 18 12:52:22 2010 -0400 +++ b/patches/icedtea-copy-plugs.patch Thu Nov 18 12:59:14 2010 +0000 @@ -123,40 +123,3 @@ # Binary plug start/complete messages -diff -urN openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java ---- openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2008-08-28 04:12:12.000000000 -0400 -+++ openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2008-11-05 17:18:36.000000000 -0500 -@@ -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/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java ---- openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2008-08-28 04:12:14.000000000 -0400 -+++ openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2008-11-05 17:18:36.000000000 -0500 -@@ -78,6 +78,9 @@ - */ - public long timeStamp ; - -+ // TODO: IcedTea: I am a stub. -+ static public int trapAuthenticationFailure = 0; -+ - - - /** -diff -urN openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java openjdk/jdk/src/share/classes/java/beans/MetaData.java ---- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java 2008-08-28 04:12:48.000000000 -0400 -+++ openjdk/jdk/src/share/classes/java/beans/MetaData.java 2008-11-05 17:18:36.000000000 -0500 -@@ -1628,7 +1628,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;
--- a/patches/icedtea-webstart.patch Mon Oct 18 12:52:22 2010 -0400 +++ b/patches/icedtea-webstart.patch Thu Nov 18 12:59:14 2010 +0000 @@ -9,114 +9,6 @@ $(call make-launcher, jconsole, sun.tools.jconsole.JConsole, \ -J-Djconsole.showOutputViewer, ) $(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , ) -diff -urN openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java ---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java 2008-01-12 15:53:45.000000000 -0500 -+++ openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java 2008-02-04 11:51:20.000000000 -0500 -@@ -42,25 +42,25 @@ - * - * @author Arthur van Hoff - */ --class AppletViewerPanel extends AppletPanel { -+public class AppletViewerPanel extends AppletPanel { - - /* Are we debugging? */ -- static boolean debug = false; -+ protected static boolean debug = false; - - /** - * The document url. - */ -- URL documentURL; -+ protected URL documentURL; - - /** - * The base url. - */ -- URL baseURL; -+ protected URL baseURL; - - /** - * The attributes of the applet. - */ -- Hashtable atts; -+ protected Hashtable atts; - - /* - * JDK 1.1 serialVersionUID -@@ -70,7 +70,7 @@ - /** - * Construct an applet viewer and start the applet. - */ -- AppletViewerPanel(URL documentURL, Hashtable atts) { -+ protected AppletViewerPanel(URL documentURL, Hashtable atts) { - this.documentURL = documentURL; - this.atts = atts; - -@@ -202,12 +202,12 @@ - return (AppletContext)getParent(); - } - -- static void debug(String s) { -+ protected static void debug(String s) { - if(debug) - System.err.println("AppletViewerPanel:::" + s); - } - -- static void debug(String s, Throwable t) { -+ protected static void debug(String s, Throwable t) { - if(debug) { - t.printStackTrace(); - debug(s); -diff -urN openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java ---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java 2008-03-26 04:58:12.000000000 -0400 -+++ openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java 2008-04-07 21:55:56.000000000 -0400 -@@ -68,7 +68,7 @@ - /** - * The applet (if loaded). - */ -- Applet applet; -+ protected Applet applet; - - /** - * Applet will allow initialization. Should be -@@ -117,7 +117,7 @@ - /** - * The thread for the applet. - */ -- Thread handler; -+ protected Thread handler; - - - /** -@@ -162,7 +162,8 @@ - * Creates a thread to run the applet. This method is called - * each time an applet is loaded and reloaded. - */ -- synchronized void createAppletThread() { -+ //Overridden by NetxPanel. -+ protected synchronized void createAppletThread() { - // Create a thread group for the applet, and start a new - // thread to load the applet. - String nm = "applet-" + getCode(); -@@ -306,7 +307,7 @@ - /** - * Get an event from the queue. - */ -- synchronized AppletEvent getNextEvent() throws InterruptedException { -+ protected synchronized AppletEvent getNextEvent() throws InterruptedException { - while (queue == null || queue.isEmpty()) { - wait(); - } -@@ -695,7 +696,8 @@ - * applet event processing so that it can be gracefully interrupted from - * things like HotJava. - */ -- private void runLoader() { -+ //Overridden by NetxPanel. -+ protected void runLoader() { - if (status != APPLET_DISPOSE) { - showAppletStatus("notdisposed"); - return; --- openjdk/jdk/make/docs/NON_CORE_PKGS.gmk.orig 2009-06-04 11:02:18.000000000 -0400 +++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2009-06-04 11:02:45.000000000 -0400 @@ -84,6 +84,8 @@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/snmp.patch Thu Nov 18 12:59:14 2010 +0000 @@ -0,0 +1,13 @@ +diff -urN openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java +--- openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2008-08-28 04:12:14.000000000 -0400 ++++ openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2008-11-05 17:18:36.000000000 -0500 +@@ -78,6 +78,9 @@ + */ + public long timeStamp ; + ++ // TODO: IcedTea: I am a stub. ++ static public int trapAuthenticationFailure = 0; ++ + + + /**