changeset in /hg/icedtea: Remove gcjwebplugin.
Andrew John Hughes
gnu_andrew at member.fsf.org
Wed Nov 19 17:59:07 PST 2008
changeset c5f13156e70a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c5f13156e70a
description:
Remove gcjwebplugin.
2008-11-20 Andrew John Hughes <ahughes at redhat.com>
PR icedtea/236:
* gcjwebplugin.cc,
* Makefile.am,
* configure.ac:
Remove gcjwebplugin.
diffstat:
4 files changed, 15 insertions(+), 1723 deletions(-)
ChangeLog | 8
Makefile.am | 61 --
configure.ac | 8
gcjwebplugin.cc | 1661 -------------------------------------------------------
diffs (truncated from 1844 to 500 lines):
diff -r 1ae3ef81f9b2 -r c5f13156e70a ChangeLog
--- a/ChangeLog Thu Nov 20 00:41:27 2008 +0000
+++ b/ChangeLog Thu Nov 20 01:58:47 2008 +0000
@@ -1,3 +1,11 @@ 2008-09-04 C. K. Jester-Young <cky944@
+2008-11-20 Andrew John Hughes <ahughes at redhat.com>
+
+ PR icedtea/236:
+ * gcjwebplugin.cc,
+ * Makefile.am,
+ * configure.ac:
+ Remove gcjwebplugin.
+
2008-09-04 C. K. Jester-Young <cky944 at gmail.com>
* Makefile.am,
diff -r 1ae3ef81f9b2 -r c5f13156e70a Makefile.am
--- a/Makefile.am Thu Nov 20 00:41:27 2008 +0000
+++ b/Makefile.am Thu Nov 20 01:58:47 2008 +0000
@@ -9,12 +9,6 @@ NETBEANS_PROFILER_MD5SUM = ff8e8abc42df6
NETBEANS_PROFILER_MD5SUM = ff8e8abc42df6c6749e6b02bcf7bb0a5
VISUALVM_MD5SUM = 4b55bc623418818793392bb233da2927
-if ENABLE_GCJWEBPLUGIN
-GCJWEBPLUGIN_CLEAN = clean-gcjwebplugin
-GCJWEBPLUGIN_TARGET = gcjwebplugin.so
-else
-GCJWEBPLUGIN_CLEAN =
-GCJWEBPLUGIN_TARGET =
if ENABLE_PLUGIN
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
@@ -25,7 +19,6 @@ ICEDTEAPLUGIN_TARGET =
ICEDTEAPLUGIN_TARGET =
PLUGIN_PATCH = patches/icedtea-plugin.patch
LIVECONNECT_DIR =
-endif
endif
if ENABLE_PULSE_JAVA
@@ -68,10 +61,6 @@ distclean-local: clean-copy clean-jtreg
rm -rf rt/netscape
if ENABLE_PLUGIN
rm -f IcedTeaPlugin.o IcedTeaPlugin.so
-else
-if ENABLE_GCJWEBPLUGIN
- rm -f gcjwebplugin.so
-endif
endif
rm -rf cacao
rm -rf visualvm
@@ -93,9 +82,9 @@ install:
clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
clean-tools-jar clean-shared-objects \
- clean-copy clean-hotspot-tools clean-rt $(GCJWEBPLUGIN_CLEAN) \
- $(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper clean-extra \
- clean-jtreg clean-jtreg-reports clean-visualvm clean-nbplatform
+ clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \
+ hotspot hotspot-helper clean-extra clean-jtreg clean-jtreg-reports \
+ clean-visualvm clean-nbplatform
GENERATED_FILES = generated/com/sun/java/swing/plaf/gtk/resources/gtk_it.java \
generated/com/sun/java/swing/plaf/gtk/resources/gtk_de.java \
@@ -1352,8 +1341,7 @@ PULSEAUDIO_SOURCES = $(top_srcdir)/pulse
$(top_srcdir)/pulseaudio/COPYING
EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/icedtea-*.patch \
- gcjwebplugin.cc tools-copy contrib ports \
- extra overlays \
+ tools-copy contrib ports extra overlays \
javaws.png javaws.desktop visualvm.desktop \
jconsole.desktop policytool.desktop \
$(JTREG_SOURCES) \
@@ -2351,25 +2339,17 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
- $(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \
- extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
- stamps/pulse-java.stamp
+ $(ICEDTEAPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \
+ stamps/visualvm.stamp stamps/pulse-java.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
$(ICEDTEA_BUILD_TARGET)
-if ENABLE_GCJWEBPLUGIN
- cp -pPRf gcjwebplugin.so \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf gcjwebplugin.so \
- $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-else
if ENABLE_PLUGIN
cp -pPRf IcedTeaPlugin.so \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
cp -pPRf IcedTeaPlugin.so \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-endif
endif
if ENABLE_PULSE_JAVA
cp -pPRf libpulse-java.so \
@@ -2414,25 +2394,17 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
- $(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \
- extra-lib/about.jar stamps/cacao.stamp \
+ $(ICEDTEAPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \
stamps/pulse-java.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
$(ICEDTEA_DEBUG_BUILD_TARGET)
-if ENABLE_GCJWEBPLUGIN
- cp -pPRf gcjwebplugin.so \
- $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf gcjwebplugin.so \
- $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
-else
if ENABLE_PLUGIN
cp -pPRf IcedTeaPlugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
cp -pPRf IcedTeaPlugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
-endif
endif
if ENABLE_PULSE_JAVA
cp -pPRf libpulse-java.so \
@@ -2792,24 +2764,6 @@ clean-cacao:
rm -rf cacao
rm -f stamps/cacao.stamp
-if ENABLE_GCJWEBPLUGIN
-# gcjwebplugin.so.
-gcjwebplugin.so: gcjwebplugin.cc
- if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
- revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
- fi ; \
- if [ -n "$(PKGVERSION)" ]; then plugin_version=" ($(PKGVERSION))"; fi; \
- plugin_version=" $(PACKAGE_VERSION)$$revision$$plugin_version"; \
- $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
- $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
- $(GTK_CFLAGS) $(GTK_LIBS) \
- -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
- -DPLUGIN_VERSION="\"$$plugin_version\"" \
- -fPIC -shared -o $@ $<
-
-clean-gcjwebplugin:
- rm -f gcjwebplugin.so
-else
if ENABLE_PLUGIN
# IcedTeaPlugin.so.
# Separate compile and link invocations to ensure intermediate object
@@ -2837,7 +2791,6 @@ clean-IcedTeaPlugin:
clean-IcedTeaPlugin:
rm -f IcedTeaPlugin.o
rm -f IcedTeaPlugin.so
-endif
endif
diff -r 1ae3ef81f9b2 -r c5f13156e70a configure.ac
--- a/configure.ac Thu Nov 20 00:41:27 2008 +0000
+++ b/configure.ac Thu Nov 20 01:58:47 2008 +0000
@@ -135,14 +135,6 @@ AC_ARG_ENABLE([liveconnect],
[enable_plugin="${enableval}"], [enable_plugin="yes"])
AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes")
AC_MSG_RESULT(${enable_plugin})
-
-AC_MSG_CHECKING([whether to build gcjwebplugin])
-AC_ARG_ENABLE([gcjwebplugin],
- [AS_HELP_STRING([--enable-gcjwebplugin],
- [Build the GCJ Web Plugin plugin (deprecated)])],
- [enable_gcjwebplugin="${enableval}"], [enable_gcjwebplugin="no"])
-AM_CONDITIONAL(ENABLE_GCJWEBPLUGIN, test "x${enable_gcjwebplugin}" = "xyes")
-AC_MSG_RESULT(${enable_gcjwebplugin})
AC_MSG_CHECKING([whether to include PulseAudio support])
AC_ARG_ENABLE([pulse-java],
diff -r 1ae3ef81f9b2 -r c5f13156e70a gcjwebplugin.cc
--- a/gcjwebplugin.cc Thu Nov 20 00:41:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1661 +0,0 @@
-/* gcjwebplugin.cc -- web browser plugin to execute Java applets
- Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-// System includes.
-#include <dlfcn.h>
-#include <errno.h>
-#include <libgen.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-// Netscape plugin API includes.
-#include <npapi.h>
-#include <npupp.h>
-
-// GLib includes.
-#include <glib.h>
-#include <glib/gstdio.h>
-
-// GTK includes.
-#include <gtk/gtk.h>
-
-// Documentbase retrieval includes.
-#include <nsIPluginInstance.h>
-#include <nsIPluginInstancePeer.h>
-#include <nsIPluginTagInfo2.h>
-
-// Debugging macros.
-#define PLUGIN_DEBUG(message) \
- g_print ("GCJ PLUGIN: thread %p: %s\n", g_thread_self (), message)
-
-#define PLUGIN_DEBUG_TWO(first, second) \
- g_print ("GCJ PLUGIN: thread %p: %s %s\n", g_thread_self (), \
- first, second)
-
-// Error reporting macros.
-#define PLUGIN_ERROR(message) \
- g_printerr ("%s:%d: thread %p: Error: %s\n", __FILE__, __LINE__, \
- g_thread_self (), message)
-
-#define PLUGIN_ERROR_TWO(first, second) \
- g_printerr ("%s:%d: thread %p: Error: %s: %s\n", __FILE__, __LINE__, \
- g_thread_self (), first, second)
-
-#define PLUGIN_ERROR_THREE(first, second, third) \
- g_printerr ("%s:%d: thread %p: Error: %s: %s: %s\n", __FILE__, \
- __LINE__, g_thread_self (), first, second, third)
-
-// Plugin information passed to about:plugins.
-#define PLUGIN_NAME "GCJ Web Browser Plugin (using IcedTea)"
-#define PLUGIN_DESC "The " PLUGIN_NAME PLUGIN_VERSION " executes Java applets."
-#define PLUGIN_MIME_DESC \
- "application/x-java-vm:class,jar:IcedTea;" \
- "application/x-java-applet:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.1:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.1.1:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.1.2:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.1.3:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.2:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.2.1:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.2.2:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.3:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.3.1:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.4:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.4.1:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.4.2:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.5:class,jar:IcedTea;" \
- "application/x-java-applet;version=1.6:class,jar:IcedTea;" \
- "application/x-java-applet;jpi-version=1.6.0_00:class,jar:IcedTea;" \
- "application/x-java-bean:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.1:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.1.1:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.1.2:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.1.3:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.2:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.2.1:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.2.2:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.3:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.3.1:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.4:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.4.1:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.4.2:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.5:class,jar:IcedTea;" \
- "application/x-java-bean;version=1.6:class,jar:IcedTea;" \
- "application/x-java-bean;jpi-version=1.6.0_00:class,jar:IcedTea;"
-#define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE
-#define PLUGIN_MIME_TYPE "application/x-java-vm"
-#define PLUGIN_FILE_EXTS "class,jar,zip"
-#define PLUGIN_MIME_COUNT 1
-
-#define FAILURE_MESSAGE "gcjwebplugin error: Failed to run %s." \
- " For more detail rerun \"firefox -g\" in a terminal window."
-
-// Documentbase retrieval required definition.
-static NS_DEFINE_IID (kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID);
-
-// Browser function table.
-static NPNetscapeFuncs browserFunctions;
-
-// Data directory for plugin.
-static gchar* data_directory = NULL;
-
-// Fully-qualified appletviewer executable.
-static gchar* appletviewer_executable = NULL;
-
-// Keeps track of initialization. NP_Initialize should only be
-// called once.
-gboolean initialized = false;
-
-// GCJPluginData stores all the data associated with a single plugin
-// instance. A separate plugin instance is created for each <APPLET>
-// tag. For now, each plugin instance spawns its own applet viewer
-// process but this may need to change if we find pages containing
-// multiple applets that expect to be running in the same VM.
-struct GCJPluginData
-{
- // A unique identifier for this plugin window.
- gchar* instance_string;
- // Applet viewer input pipe name.
- gchar* in_pipe_name;
- // Applet viewer input channel.
- GIOChannel* in_from_appletviewer;
- // Applet viewer input watch source.
- gint in_watch_source;
- // Applet viewer output pipe name.
- gchar* out_pipe_name;
- // Applet viewer output channel.
- GIOChannel* out_to_appletviewer;
- // Applet viewer output watch source.
- gint out_watch_source;
- // Mutex to protect appletviewer_alive.
- GMutex* appletviewer_mutex;
- // Back-pointer to the plugin instance to which this data belongs.
- // This should not be freed but instead simply set to NULL.
- NPP owner;
- // FALSE if the applet viewer process has died. All code
- // communicating with the applet viewer should check this flag
- // before attempting to read from/write to the applet viewer pipes.
- gboolean appletviewer_alive;
- // The address of the plugin window. This should not be freed but
- // instead simply set to NULL.
- gpointer window_handle;
- // The last plugin window width sent to us by the browser.
- guint32 window_width;
- // The last plugin window height sent to us by the browser.
- guint32 window_height;
-};
-
-// Documentbase retrieval type-punning union.
-typedef union
-{
- void** void_field;
- nsIPluginTagInfo2** info_field;
-} info_union;
-
-// Static instance helper functions.
-// Have the browser allocate a new GCJPluginData structure.
-static void plugin_data_new (GCJPluginData** data);
-// Retrieve the current document's documentbase.
-static gchar* plugin_get_documentbase (NPP instance);
-// Notify the user that the appletviewer is not installed correctly.
-static void plugin_display_failure_dialog ();
-// Callback used to monitor input pipe status.
-static gboolean plugin_in_pipe_callback (GIOChannel* source,
- GIOCondition condition,
- gpointer plugin_data);
-// Callback used to monitor output pipe status.
-static gboolean plugin_out_pipe_callback (GIOChannel* source,
- GIOCondition condition,
- gpointer plugin_data);
-static NPError plugin_start_appletviewer (GCJPluginData* data);
-static gchar* plugin_create_applet_tag (int16 argc, char* argn[],
- char* argv[]);
-static void plugin_send_message_to_appletviewer (GCJPluginData* data,
- gchar const* message);
-static void plugin_stop_appletviewer (GCJPluginData* data);
-// Uninitialize GCJPluginData structure and delete pipes.
-static void plugin_data_destroy (GCJPluginData** data);
-
-// Global instance counter.
-// Mutex to protect plugin_instance_counter.
-static GMutex* plugin_instance_mutex = NULL;
-// A counter used to create uniquely named pipes.
-static gulong plugin_instance_counter = 0;
-// A global variable for reporting GLib errors. This must be free'd
-// and set to NULL after each use.
-static GError* channel_error = NULL;
-
-// Functions prefixed by GCJ_ are instance functions. They are called
-// by the browser and operate on instances of GCJPluginData.
-// Functions prefixed by plugin_ are static helper functions.
-// Functions prefixed by NP_ are factory functions. They are called
-// by the browser and provide functionality needed to create plugin
-// instances.
-
-// INSTANCE FUNCTIONS
-
-// Creates a new gcjwebplugin instance. This function creates a
-// GCJPluginData* and stores it in instance->pdata. The following
-// GCJPluginData fiels are initialized: instance_string, in_pipe_name,
-// in_from_appletviewer, in_watch_source, out_pipe_name,
-// out_to_appletviewer, out_watch_source, appletviewer_mutex, owner,
-// appletviewer_alive. In addition two pipe files are created. All
-// of those fields must be properly destroyed, and the pipes deleted,
-// by GCJ_Destroy. If an error occurs during initialization then this
-// function will free anything that's been allocated so far, set
-// instance->pdata to NULL and return an error code.
-NPError
-GCJ_New (NPMIMEType pluginType, NPP instance, uint16 mode,
- int16 argc, char* argn[], char* argv[],
- NPSavedData* saved)
-{
- PLUGIN_DEBUG ("GCJ_New");
-
- NPError np_error = NPERR_NO_ERROR;
- GCJPluginData* data = NULL;
-
- gchar* documentbase = NULL;
- gchar* read_message = NULL;
- gchar* applet_tag = NULL;
- gchar* tag_message = NULL;
-
- if (!instance)
- {
- PLUGIN_ERROR ("Browser-provided instance pointer is NULL.");
- np_error = NPERR_INVALID_INSTANCE_ERROR;
- goto cleanup_done;
- }
-
- // data
- plugin_data_new (&data);
- if (data == NULL)
- {
- PLUGIN_ERROR ("Failed to allocate plugin data.");
- np_error = NPERR_OUT_OF_MEMORY_ERROR;
- goto cleanup_done;
- }
-
- // Initialize data->instance_string.
- //
- // instance_string should be unique for this process so we use a
- // combination of getpid and plugin_instance_counter.
- //
- // Critical region. Reference and increment plugin_instance_counter
- // global.
- g_mutex_lock (plugin_instance_mutex);
-
- // data->instance_string
- data->instance_string = g_strdup_printf ("instance-%d-%ld",
- getpid (),
- plugin_instance_counter++);
-
- g_mutex_unlock (plugin_instance_mutex);
-
- // data->appletviewer_mutex
- data->appletviewer_mutex = g_mutex_new ();
-
- // Documentbase retrieval.
- documentbase = plugin_get_documentbase (instance);
- if (!documentbase)
- {
- PLUGIN_ERROR ("Documentbase retrieval failed."
- " Browser not Mozilla-based?");
- goto cleanup_appletviewer_mutex;
- }
-
- // Create appletviewer-to-plugin pipe which we refer to as the input
- // pipe.
-
- // data->in_pipe_name
- data->in_pipe_name = g_strdup_printf ("%s/gcj-%s-appletviewer-to-plugin",
- data_directory, data->instance_string);
- if (!data->in_pipe_name)
- {
- PLUGIN_ERROR ("Failed to create input pipe name.");
- np_error = NPERR_OUT_OF_MEMORY_ERROR;
- // If data->in_pipe_name is NULL then the g_free at
- // cleanup_in_pipe_name will simply return.
- goto cleanup_in_pipe_name;
- }
-
More information about the distro-pkg-dev
mailing list