/hg/icedtea6: Final plugin and NetX cleanup.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Nov 24 14:44:39 PST 2010
changeset 0aab3837f513 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0aab3837f513
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Nov 24 22:44:32 2010 +0000
Final plugin and NetX cleanup.
2010-11-24 Andrew John Hughes <ahughes at redhat.com>
Final plugin & NetX cleanup.
* patches/extensions/netx-umask.patch: Dropped. NetX is no
longer in IcedTea6 and IcedTea-Web uses java to do the same
thing.
* patches/extensions/netx.patch: Remove javaws binary and
javax.jnlp documentation production; the requisite classes
no longer exist. Move rest to applet_hole.patch.
* Makefile.am: (ICEDTEA_PATCHES): Updated.
* NEWS: Move NetX and plugin sections for 1.10 to IcedTea-Web.
* patches/applet_hole.patch: Remainder of netx.patch which
makes AppletViewerPanel accessible.
diffstat:
6 files changed, 126 insertions(+), 312 deletions(-)
ChangeLog | 17 +++
Makefile.am | 3
NEWS | 9 -
patches/applet_hole.patch | 108 +++++++++++++++++++++++
patches/extensions/netx-umask.patch | 164 -----------------------------------
patches/extensions/netx.patch | 137 -----------------------------
diffs (477 lines):
diff -r c80d9c5bbe27 -r 0aab3837f513 ChangeLog
--- a/ChangeLog Wed Nov 24 16:53:20 2010 +0000
+++ b/ChangeLog Wed Nov 24 22:44:32 2010 +0000
@@ -1,3 +1,20 @@ 2010-11-24 Andrew John Hughes <ahughes
+2010-11-24 Andrew John Hughes <ahughes at redhat.com>
+
+ Final plugin & NetX cleanup.
+ * patches/extensions/netx-umask.patch:
+ Dropped. NetX is no longer in IcedTea6
+ and IcedTea-Web uses java to do the same thing.
+ * patches/extensions/netx.patch:
+ Remove javaws binary and javax.jnlp documentation
+ production; the requisite classes no longer exist.
+ Move rest to applet_hole.patch.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Updated.
+ * NEWS: Move NetX and plugin sections for 1.10
+ to IcedTea-Web.
+ * patches/applet_hole.patch: Remainder of netx.patch
+ which makes AppletViewerPanel accessible.
+
2010-11-24 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Add 1.7.6, 1.8.3 and 1.9.2 releases.
diff -r c80d9c5bbe27 -r 0aab3837f513 Makefile.am
--- a/Makefile.am Wed Nov 24 16:53:20 2010 +0000
+++ b/Makefile.am Wed Nov 24 22:44:32 2010 +0000
@@ -264,8 +264,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-policy-evaluation.patch \
patches/hotspot/$(HSBUILD)/update-bootclasspath.patch \
patches/libpng.patch \
- patches/extensions/netx.patch \
- patches/extensions/netx-umask.patch \
+ patches/applet_hole.patch \
patches/icedtea-jtreg-httpTest.patch \
patches/arm.patch \
patches/openjdk/6678385-window_movement_crasher.patch \
diff -r c80d9c5bbe27 -r 0aab3837f513 NEWS
--- a/NEWS Wed Nov 24 16:53:20 2010 +0000
+++ b/NEWS Wed Nov 24 22:44:32 2010 +0000
@@ -47,15 +47,6 @@ New in release 1.10 (2010-XX-XX):
- S6967433: dashed lines broken when using scaling transforms.
- S6976265: No STROKE_CONTROL
- S6967434, PR450, RH530642: Round joins/caps of scaled up lines have poor quality.
-* NetX
- - A new man page for javaws.
- - Add a new option -Xclearcache
-* Plugin
- - PR554: System.err writes content two times
- - PR556: Applet initialization code is prone to race conditions
- - PR557: Applet opens in a separate window if tab is closed when the applet loads
- - PR519: 100% CPU usage when displaying applets in Webkit based browsers
- - PR565: UIDefaults.getUI fails with jgoodies:looks 2.3.1
New in release 1.9.2 (2010-11-24):
diff -r c80d9c5bbe27 -r 0aab3837f513 patches/applet_hole.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/applet_hole.patch Wed Nov 24 22:44:32 2010 +0000
@@ -0,0 +1,108 @@
+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;
diff -r c80d9c5bbe27 -r 0aab3837f513 patches/extensions/netx-umask.patch
--- a/patches/extensions/netx-umask.patch Wed Nov 24 16:53:20 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
---- openjdk/jdk/make/launchers/Makefile.launcher.orig 2008-07-09 12:49:00.000000000 -0400
-+++ openjdk/jdk/make/launchers/Makefile.launcher 2008-07-09 12:49:40.000000000 -0400
-@@ -148,6 +148,16 @@
- endif
- endif
-
-+# pluginappletviewer only
-+ifeq ($(PROGRAM), pluginappletviewer)
-+ OTHER_CPPFLAGS += -DUSE_UMASK=\"077\"
-+endif
-+
-+# javaws only
-+ifeq ($(PROGRAM), javaws)
-+ OTHER_CPPFLAGS += -DUSE_UMASK=\"077\"
-+endif
-+
- # GUI tools
- ifeq ($(GUI_TOOL),true)
- ifneq ($(PLATFORM), windows)
---- openjdk/jdk/src/share/bin/java.c.orig 2008-07-09 12:48:35.000000000 -0400
-+++ openjdk/jdk/src/share/bin/java.c 2008-07-09 12:36:11.000000000 -0400
-@@ -56,6 +56,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/stat.h>
-
- #include <jni.h>
- #include <jvm.h>
-@@ -69,6 +70,8 @@
- #define FULL_VERSION JDK_MAJOR_VERSION "." JDK_MINOR_VERSION
- #endif
-
-+#define MAXMASK 4095 /* Same as octal 07777 */
-+
- /*
- * The following environment variable is used to influence the behavior
- * of the jre exec'd through the SelectVersion routine. The command line
-@@ -184,6 +187,10 @@
-
- int JNICALL JavaMain(void * args); /* entry point */
-
-+/* umask things */
-+static int FindUMask(int *, char ***, int *);
-+static int VerifyMask(char *, int*);
-+
- struct JavaMainArgs {
- int argc;
- char ** argv;
-@@ -307,6 +314,26 @@
- SetClassPath(s);
- #endif
-
-+#ifdef USE_UMASK
-+ /* Set umask */
-+ int mask;
-+ // Check to see if we can find a umask on the command line.
-+ if (FindUMask(&argc, &argv, &mask) < 0)
-+ {
-+ // We didn't find a umask, so fall back to the default one.
-+ char * defaultMask = (char *) JLI_MemAlloc(5 * sizeof(char));
-+ strcpy(defaultMask, USE_UMASK);
-+ int converted;
-+ VerifyMask(defaultMask, &converted);
-+ JLI_MemFree(defaultMask);
-+ umask(converted); /* from sys/stat.h */
-+ }
-+ else
-+ {
-+ umask(mask);
-+ }
-+#endif
-+
- /*
- * Parse command line options; if the return value of
- * ParseArguments is false, the program should exit.
-@@ -2011,3 +2038,87 @@
- }
- DoSplashSetFileJarName(file_name, jar_name);
- }
-+
-+/**
-+ * Searches argv to find any parameters that start with "-umask=".
-+ * Sets maskToSet with the mask if a -umask is found, and if the mask
-+ * supplied is valid. Returns 1 if a valid mask was found and set,
-+ * -1 otherwise.
-+ */
-+int FindUMask(int *pargc, char *** pargv, int *maskToSet)
-+{
-+ int found_mask = -1;
-+
-+ // our handles to the original list
-+ int argc = *pargc;
-+ char **argv = *pargv;
-+
-+ // the new set
-+ int nargc = argc;
-+ char ** nargv = (char **) JLI_MemAlloc((nargc + 1) * sizeof(char *));
-+
-+ // set the original set to the new set
-+ *pargv = nargv;
-+ *pargc = nargc;
-+
-+ char *maskString = (char *) JLI_MemAlloc(6 * sizeof(char *));
-+ int i;
-+ for (i = 0; i < argc; i++)
-+ {
-+ char *arg = argv[i];
-+ if (strncmp(arg, "-umask=",7) == 0)
-+ {
-+ strncpy(maskString, arg+7, 5);
-+
-+ if (VerifyMask(maskString, maskToSet) < 0)
-+ {
-+ printf("Invalid umask %s, application stopped.\n", maskString);
-+ exit(1);
-+ }
-+
-+ found_mask = 1;
-+ nargc--;
-+ (*pargc)--;
-+ }
-+ else
-+ {
-+ *nargv++ = arg;
-+ }
-+ }
-+
-+ JLI_MemFree(maskString);
-+
-+ return found_mask;
-+}
-+
-+/**
-+ * Takes an octal mask in string form, and converts it to
-+ * decimal form in convertedMask. The decimal form can then be
-+ * easily passed to umask(). Returns 1 if the mask is valid, -1 otherwise.
-+ */
-+int VerifyMask(char * maskString, int * convertedMask)
-+{
-+ // Borrowed from coreutils modechange.c
-+ if ('0' <= *maskString && *maskString < '8')
-+ {
-+ unsigned int decimal_mode = 0;
-+
-+ do {
-+ decimal_mode = 8 * decimal_mode + *maskString++ - '0';
-+ } while ('0' <= *maskString && *maskString < '8');
-+
-+ if (decimal_mode > MAXMASK)
-+ return -1;
-+ else if (*maskString)
-+ return -1;
-+ else
-+ *convertedMask = decimal_mode;
-+
-+ return 1;
-+ }
-+ else
-+ {
-+ return -1;
-+ }
-+
-+}
diff -r c80d9c5bbe27 -r 0aab3837f513 patches/extensions/netx.patch
--- a/patches/extensions/netx.patch Wed Nov 24 16:53:20 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-diff -c openjdk.orig/jdk/make/launchers/Makefile openjdk/jdk/make/launchers/Makefile
---- openjdk.orig/jdk/make/launchers/Makefile 2008-06-29 09:45:56.000000000 -0400
-+++ openjdk/jdk/make/launchers/Makefile 2008-06-29 09:47:01.000000000 -0400
-@@ -67,6 +67,7 @@
- $(call make-launcher, javadoc, com.sun.tools.javadoc.Main, , )
- $(call make-launcher, javah, com.sun.tools.javah.Main, , )
- $(call make-launcher, javap, sun.tools.javap.Main, , )
-+$(call make-launcher, javaws, net.sourceforge.jnlp.runtime.Boot, , )
- $(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 @@
-
- SMARTCARDIO_PKGS = javax.smartcardio
-
-+JNLP_PKGS = javax.jnlp
-+
- # non-core packages in rt.jar
- NON_CORE_PKGS = $(DOMAPI_PKGS) \
- $(MGMT_PKGS) \
-@@ -91,4 +93,5 @@
- $(JGSS_PKGS) \
- $(OLD_JSSE_PKGS) \
- $(HTTPSERVER_PKGS) \
-- $(SMARTCARDIO_PKGS)
-+ $(SMARTCARDIO_PKGS) \
-+ $(JNLP_PKGS)
More information about the distro-pkg-dev
mailing list