Changeset 429 for trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

Timestamp:

Sep 24, 2014, 9:34:21 PM (11 years ago)

Author:

dmik

Message:

icedtea-web: Merge version 1.5.1 from vendor to trunk.

File:

• trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc (modified) (91 diffs)

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

@@ -46 +46 @@
 #include <sys/socket.h>
 #include <fcntl.h>
+#include <sstream>
 #include "OS_OS2.h"
 #endif
@@ -51 +52 @@
 // System includes.
 #include <dlfcn.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <dirent.h>
 #include <errno.h>
 #include <libgen.h>
@@ -56 +60 @@
 #include <stdlib.h>
 #include <string.h>
+#include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-
+#include <new>
+
+//IcedTea-plugin includes
+#include "IcedTeaPluginUtils.h"
+#include "IcedTeaParseProperties.h"
 // Liveconnect extension
 #include "IcedTeaScriptablePluginObject.h"
@@ -69 +78 @@
 #define DT_SOCKET_DLL "dt_socket"
 #endif
-
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-// Documentbase retrieval includes.
-#include <nsIPluginInstance.h>
-#include <nsIPluginInstancePeer.h>
-#include <nsIPluginTagInfo2.h>
-
-// API's into Mozilla
-#include <nsCOMPtr.h>
-#include <nsICookieService.h>
-#include <nsIDNSRecord.h>
-#include <nsIDNSService.h>
-#include <nsINetUtil.h>
-#include <nsIProxyInfo.h>
-#include <nsIProtocolProxyService.h>
-#include <nsIScriptSecurityManager.h>
-#include <nsIIOService.h>
-#include <nsIURI.h>
-#include <nsNetCID.h>
-#include <nsStringAPI.h>
-#include <nsServiceManagerUtils.h>
-#endif
-
-// 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.
@@ -167 +141 @@
   "  For more detail rerun \"firefox -g\" in a terminal window."
 
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-// Documentbase retrieval required definition.
-static NS_DEFINE_IID (kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID);
-#endif
-
 // Data directory for plugin.
-static gchar* data_directory = NULL;
-
-// Fully-qualified appletviewer executable.
-static gchar* appletviewer_executable = NULL;
+static std::string data_directory;
+static DIR *data_directory_descriptor;
+
+// Fully-qualified appletviewer default  executable and rt.jar
+static const char* appletviewer_default_executable = ICEDTEA_WEB_JRE "/bin/java";
+static const char* appletviewer_default_rtjar = ICEDTEA_WEB_JRE "/lib/rt.jar";
 
 // Applet viewer input channel (needs to be static because it is used in plugin_in_pipe_callback)
@@ -202 +173 @@
 #endif
 
+// Applet viewer debug pipe name.
+gchar* debug_pipe_name = NULL;
+
 // Applet viewer output watch source.
 gint out_watch_source;
@@ -211 +185 @@
 pthread_mutex_t pluginAsyncCallMutex;
 
+/*to sync pipe to apletviewer console*/
+pthread_mutex_t debug_pipe_lock = PTHREAD_MUTEX_INITIALIZER;
+
 // Applet viewer output channel.
 GIOChannel* out_to_appletviewer;
+
+// Applet viewer debug channel.
+GIOChannel* debug_to_appletviewer = NULL;
 
 // Tracks jvm status
@@ -235 +215 @@
 JavaMessageSender* java_req_proc;
 
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-// Documentbase retrieval type-punning union.
-typedef union
-{
-  void** void_field;
-  nsIPluginTagInfo2** info_field;
-} info_union;
+// Queue processing threads
+static pthread_t plugin_request_processor_thread1;
+static pthread_t plugin_request_processor_thread2;
+static pthread_t plugin_request_processor_thread3;
+
+#ifdef __OS2__
+struct QueueProcessorData
+{
+    PluginRequestProcessor *processor;
+    bool stopRequested;
+};
+
+static QueueProcessorData queue_processor_data1 = { NULL, false };
+static QueueProcessorData queue_processor_data2 = { NULL, false };
+static QueueProcessorData queue_processor_data3 = { NULL, false };
 #endif
 
 // Static instance helper functions.
-// Have the browser allocate a new ITNPPluginData structure.
-static void plugin_data_new (ITNPPluginData** 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 ();
+static std::string plugin_get_documentbase (NPP instance);
 // Callback used to monitor input pipe status.
 static gboolean plugin_in_pipe_callback (GIOChannel* source,
@@ -259 +243 @@
                                           GIOCondition condition,
                                           gpointer plugin_data);
-static NPError plugin_start_appletviewer (ITNPPluginData* data);
-static gchar* plugin_create_applet_tag (int16_t argc, char* argn[],
-                                        char* argv[]);
+std::string plugin_parameters_string (int argc, char* argn[], char* argv[]);
 static void plugin_stop_appletviewer ();
-// Uninitialize ITNPPluginData structure
-static void plugin_data_destroy (NPP instance);
 
 NPError get_cookie_info(const char* siteAddr, char** cookieString, uint32_t* len);
 NPError get_proxy_info(const char* siteAddr, char** proxy, uint32_t* len);
 void consume_message(gchar* message);
-void start_jvm_if_needed();
 static void appletviewer_monitor(GPid pid, gint status, gpointer data);
 void plugin_send_initialization_message(char* instance, gulong handle,
                                                int width, int height,
                                                char* url);
+/* Returns JVM options set in itw-settings */
+std::vector<std::string*>* get_jvm_args();
 
 // Global instance counter.
@@ -288 +269 @@
 static guint appletviewer_watch_id = -1;
 
+bool debug_initiated = false;
 int plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL;
+bool plugin_debug_headers = false;
+bool plugin_debug_to_file = false ;
+bool plugin_debug_to_streams = true ;
+bool plugin_debug_to_system = false;
+bool plugin_debug_to_console = true;
+FILE *  plugin_file_log;
+std::string plugin_file_log_name;
+
 int plugin_debug_suspend = (getenv("ICEDTEAPLUGIN_DEBUG") != NULL) &&
         (strcmp(getenv("ICEDTEAPLUGIN_DEBUG"), "suspend") == 0);
-
-pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER;
 
 
@@ -316 +304 @@
 #endif
 
-
+static std::string get_plugin_executable(){
+      std::string custom_jre;
+      bool custom_jre_defined = find_custom_jre(custom_jre);
+      if (custom_jre_defined) {
+            if (IcedTeaPluginUtilities::file_exists(custom_jre+"/bin/java")){
+                  return custom_jre+"/bin/java";
+            } else {
+                 PLUGIN_ERROR("Your custom jre (/bin/java check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+            }
+      }
+      return appletviewer_default_executable;      
+}
+
+static std::string get_plugin_rt_jar(){
+      std::string custom_jre;
+      bool custom_jre_defined = find_custom_jre(custom_jre);
+      if (custom_jre_defined) {
+            if (IcedTeaPluginUtilities::file_exists(custom_jre+"/lib/rt.jar")){
+                  return custom_jre+"/lib/rt.jar";
+            } else {
+                  PLUGIN_ERROR("Your custom jre (/lib/rt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+            }
+      }
+      return appletviewer_default_rtjar;      
+}
+
+static void cleanUpDir(){
+  //free data_directory descriptor 
+  if (data_directory_descriptor != NULL) {
+    closedir(data_directory_descriptor);
+  }
+  //clean up pipes directory
+  PLUGIN_DEBUG ("Removing runtime directory %s \n", data_directory.c_str());
+  int removed = rmdir(data_directory.c_str());
+  if (removed != 0) {
+    PLUGIN_ERROR ("Failed to remove runtime directory %s, because of  %s \n", data_directory.c_str(), strerror(errno));
+  } else {
+    PLUGIN_DEBUG ("Removed runtime directory %s \n", data_directory.c_str());
+  }
+  data_directory_descriptor = NULL;
+}
 /*
  * Find first member in GHashTable* depending on version of glib
@@ -344 +372 @@
 // Creates a new icedtea np plugin instance.  This function creates a
 // ITNPPluginData* and stores it in instance->pdata.  The following
-// ITNPPluginData fiels are initialized: instance_id, in_pipe_name,
+// ITNPPluginData fields are initialized: instance_id, in_pipe_name,
 // in_from_appletviewer, in_watch_source, out_pipe_name,
 // out_to_appletviewer, out_watch_source, appletviewer_mutex, owner,
@@ -366 +394 @@
   if (!browser_functions.hasproperty(instance, window_ptr, identifier))
   {
-        printf("%s not found!\n", "document");
+        PLUGIN_ERROR("%s not found!\n", "document");
   }
   browser_functions.getproperty(instance, window_ptr, identifier, &member_ptr);
@@ -372 +400 @@
   PLUGIN_DEBUG("Got variant %p\n", &member_ptr);
 
-
-  NPError np_error = NPERR_NO_ERROR;
-  ITNPPluginData* data = NULL;
-
-  gchar* documentbase = NULL;
-  gchar* read_message = NULL;
-  gchar* applet_tag = NULL;
-  gchar* cookie_info = NULL;
-
-  NPObject* npPluginObj = NULL;
-
   if (!instance)
-    {
-      PLUGIN_ERROR ("Browser-provided instance pointer is NULL.");
-      np_error = NPERR_INVALID_INSTANCE_ERROR;
-      goto cleanup_done;
-    }
+  {
+      PLUGIN_ERROR ("Browser-provided instance pointer is NULL.\n");
+      return NPERR_INVALID_INSTANCE_ERROR;
+  }
 
   // data
-  plugin_data_new (&data);
+  ITNPPluginData* data = plugin_data_new ();
   if (data == NULL)
-    {
-      PLUGIN_ERROR ("Failed to allocate plugin data.");
-      np_error = NPERR_OUT_OF_MEMORY_ERROR;
-      goto cleanup_done;
+  {
+      PLUGIN_ERROR ("Failed to allocate plugin data.\n");
+      return NPERR_OUT_OF_MEMORY_ERROR;
     }
 
   // start the jvm if needed
-  start_jvm_if_needed();
+   NPError startup_error = start_jvm_if_needed();
+   if (startup_error != NPERR_NO_ERROR) {
+           PLUGIN_ERROR ("Failed to start JVM\n");
+           return startup_error;
+   }
 
   // Initialize data->instance_id.
@@ -422 +441 @@
   g_mutex_lock (data->appletviewer_mutex);
 
+  std::string documentbase = plugin_get_documentbase (instance);
   // Documentbase retrieval.
-  documentbase = plugin_get_documentbase (instance);
-  if (documentbase && argc != 0)
-    {
-      // Send applet tag message to appletviewer.
-      applet_tag = plugin_create_applet_tag (argc, argn, argv);
-
-      data->applet_tag = (gchar*) malloc(strlen(applet_tag)*sizeof(gchar) + strlen(documentbase)*sizeof(gchar) + 32);
-      g_sprintf(data->applet_tag, "tag %s %s", documentbase, applet_tag);
+  if (argc != 0)
+  {
+      // Send parameters to appletviewer.
+      std::string params_string = plugin_parameters_string(argc, argn, argv);
+
+      data->parameters_string =  g_strdup_printf("tag %s %s", documentbase.c_str(), params_string.c_str());
 
       data->is_applet_instance = true;
-    }
-
-  if (argc == 0)
-    {
+  }
+  else
+  {
       data->is_applet_instance = false;
-    }
+  }
 
   g_mutex_unlock (data->appletviewer_mutex);
@@ -454 +471 @@
 
   instance->pdata = data;
-
-  goto cleanup_done;
-
- cleanup_appletviewer_mutex:
-  g_mutex_free (data->appletviewer_mutex);
-  data->appletviewer_mutex = NULL;
-
-  // cleanup_instance_string:
-  g_free (data->instance_id);
-  data->instance_id = NULL;
-
-  // cleanup applet tag:
-  g_free (data->applet_tag);
-  data->applet_tag = NULL;
-
-  // cleanup_data:
-  // Eliminate back-pointer to plugin instance.
-  data->owner = NULL;
-  (*browser_functions.memfree) (data);
-  data = NULL;
-
-  // Initialization failed so return a NULL pointer for the browser
-  // data.
-  instance->pdata = NULL;
-
- cleanup_done:
-  g_free (applet_tag);
-  applet_tag = NULL;
-  g_free (read_message);
-  read_message = NULL;
-  g_free (documentbase);
-  documentbase = NULL;
 
   // store an identifier for this plugin
@@ -495 +480 @@
   PLUGIN_DEBUG ("ITNP_New return\n");
 
-  return np_error;
+  return NPERR_NO_ERROR;
 }
 
 // Starts the JVM if it is not already running
-void start_jvm_if_needed()
+NPError start_jvm_if_needed()
 {
 
@@ -514 +499 @@
   {
       PLUGIN_DEBUG("JVM is up. Returning.\n");
-      return;
+      return  NPERR_NO_ERROR;
   }
 
@@ -536 +521 @@
   // in_pipe_name
   in_pipe_name = g_strdup_printf ("%s/%d-icedteanp-appletviewer-to-plugin",
-                                         data_directory, getpid());
+                                         data_directory.c_str(), getpid());
   if (!in_pipe_name)
     {
-      PLUGIN_ERROR ("Failed to create input pipe name.");
+      PLUGIN_ERROR ("Failed to create input pipe name.\n");
       np_error = NPERR_OUT_OF_MEMORY_ERROR;
       // If in_pipe_name is NULL then the g_free at
@@ -552 +537 @@
   if (mkfifo (in_pipe_name, 0600) == -1 && errno != EEXIST)
     {
-      PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno));
+      PLUGIN_ERROR ("Failed to create input pipe\n", strerror (errno));
       np_error = NPERR_GENERIC_ERROR;
       goto cleanup_in_pipe_name;
@@ -573 +558 @@
   // out_pipe_name
   out_pipe_name = g_strdup_printf ("%s/%d-icedteanp-plugin-to-appletviewer",
-                                         data_directory, getpid());
+                                         data_directory.c_str(), getpid());
 
   if (!out_pipe_name)
     {
-      PLUGIN_ERROR ("Failed to create output pipe name.");
+      PLUGIN_ERROR ("Failed to create output pipe name.\n");
       np_error = NPERR_OUT_OF_MEMORY_ERROR;
       goto cleanup_out_pipe_name;
@@ -588 +573 @@
   if (mkfifo (out_pipe_name, 0600) == -1 && errno != EEXIST)
     {
-      PLUGIN_ERROR_TWO ("Failed to create output pipe", strerror (errno));
+      PLUGIN_ERROR ("Failed to create output pipe\n", strerror (errno));
       np_error = NPERR_GENERIC_ERROR;
       goto cleanup_out_pipe_name;
@@ -594 +579 @@
   PLUGIN_DEBUG ("ITNP_New: created output fifo: %s\n", out_pipe_name);
 #endif
+
+  // Create plugin-debug-to-appletviewer pipe which we refer to as the
+  // debug pipe.
+  initialize_debug();//should be already initialized, but...
+  if (plugin_debug_to_console){
+    // debug_pipe_name
+    debug_pipe_name = g_strdup_printf ("%s/%d-icedteanp-plugin-debug-to-appletviewer",
+                                         data_directory.c_str(), getpid());
+
+    if (!debug_pipe_name)
+      {
+        PLUGIN_ERROR ("Failed to create debug pipe name.\n");
+        np_error = NPERR_OUT_OF_MEMORY_ERROR;
+        goto cleanup_debug_pipe_name;
+      }
+
+    // clean up any older pip
+    unlink (debug_pipe_name);
+
+    PLUGIN_DEBUG ("ITNP_New: creating debug fifo: %s\n", debug_pipe_name);
+    if (mkfifo (debug_pipe_name, 0600) == -1 && errno != EEXIST)
+      {
+        PLUGIN_ERROR ("Failed to create debug pipe\n", strerror (errno));
+        np_error = NPERR_GENERIC_ERROR;
+        goto cleanup_debug_pipe_name;
+      }
+    PLUGIN_DEBUG ("ITNP_New: created debug fifo: %s\n", debug_pipe_name);
+  }
 
   // Start a separate appletviewer process for each applet, even if
@@ -628 +641 @@
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to create output channel",
+          PLUGIN_ERROR ("Failed to create output channel, '%s'\n",
                             channel_error->message);
           g_error_free (channel_error);
@@ -634 +647 @@
         }
       else
-        PLUGIN_ERROR ("Failed to create output channel");
+        PLUGIN_ERROR ("Failed to create output channel\n");
 
       np_error = NPERR_GENERIC_ERROR;
@@ -659 +672 @@
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to create input channel",
+          PLUGIN_ERROR ("Failed to create input channel, '%s'\n",
                             channel_error->message);
           g_error_free (channel_error);
@@ -665 +678 @@
         }
       else
-        PLUGIN_ERROR ("Failed to create input channel");
+        PLUGIN_ERROR ("Failed to create input channel\n");
 
       np_error = NPERR_GENERIC_ERROR;
@@ -676 +689 @@
                     (GIOCondition) (G_IO_IN | G_IO_ERR | G_IO_HUP),
                     plugin_in_pipe_callback, (gpointer) in_from_appletviewer);
+                    
+  // Create plugin-to-appletviewer console debug channel.  The default encoding for
+  // the file is UTF-8.
+  // debug_to_appletviewer
+  if (plugin_debug_to_console){
+    debug_to_appletviewer = g_io_channel_new_file (debug_pipe_name,
+                                                 "w", &channel_error);
+    if (!debug_to_appletviewer)
+      {
+        if (channel_error)
+          {
+            PLUGIN_ERROR ("Failed to debug output channel, '%s'\n",
+                              channel_error->message);
+            g_error_free (channel_error);
+            channel_error = NULL;
+          }
+        else
+          PLUGIN_ERROR ("Failed to create debug channel\n");
+
+        np_error = NPERR_GENERIC_ERROR;
+        goto cleanup_debug_to_appletviewer;
+     }
+  }
 
   jvm_up = TRUE;
-
+  
+  if (plugin_debug_to_console){
+    //jvm is up, we can start console producer thread
+    pthread_t debug_to_console_consumer;
+    pthread_create(&debug_to_console_consumer,NULL,&flush_pre_init_messages,NULL);
+  }
   goto done;
 
-  // Free allocated data
+  // Free allocated data in case of error
+ cleanup_debug_to_appletviewer:
+  if (plugin_debug_to_console){
+    if (debug_to_appletviewer)
+      g_io_channel_unref (debug_to_appletviewer);
+    debug_to_appletviewer = NULL;
+  }
 
  cleanup_in_watch_source:
@@ -702 +749 @@
     g_io_channel_unref (out_to_appletviewer);
   out_to_appletviewer = NULL;
+
+  if (plugin_debug_to_console){
+    // cleanup_debug_pipe:
+    // Delete output pipe.
+    PLUGIN_DEBUG ("ITNP_New: deleting debug fifo: %s\n", debug_pipe_name);
+    unlink (debug_pipe_name);
+    PLUGIN_DEBUG ("ITNP_New: deleted debug fifo: %s\n", debug_pipe_name);
+  }
+ cleanup_debug_pipe_name:
+  if (plugin_debug_to_console){
+    g_free (debug_pipe_name);
+    debug_pipe_name = NULL;
+  }
+
+
 
   // cleanup_out_pipe:
@@ -735 +797 @@
 #endif
 
+  cleanUpDir();
  done:
 
+  IcedTeaPluginUtilities::printDebugStatus();
   // Now other threads may re-enter.. unlock the mutex
   g_mutex_unlock(vm_start_mutex);
+  return np_error;
 
 }
@@ -765 +830 @@
       break;
     default:
-      PLUGIN_ERROR ("Unknown plugin value requested.");
+      PLUGIN_ERROR ("Unknown plugin value requested.\n");
       np_error = NPERR_GENERIC_ERROR;
       break;
@@ -814 +879 @@
   if (instance == NULL)
     {
-      PLUGIN_ERROR ("Invalid instance.");
+      PLUGIN_ERROR ("Invalid instance.\n");
 
       return NPERR_INVALID_INSTANCE_ERROR;
@@ -927 +992 @@
       plugin_send_initialization_message(
                   data->instance_id, (gulong) data->window_handle,
-                  data->window_width, data->window_height, data->applet_tag);
+                  data->window_width, data->window_height, data->parameters_string);
 
       g_mutex_unlock (data->appletviewer_mutex);
@@ -1023 +1088 @@
     return NPERR_GENERIC_ERROR;
   }
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-  nsresult rv;
-  nsCOMPtr<nsIScriptSecurityManager> sec_man =
-    do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
-
-  if (!sec_man) {
-    return NPERR_GENERIC_ERROR;
-  }
-
-  nsCOMPtr<nsIIOService> io_svc = do_GetService("@mozilla.org/network/io-service;1", &rv);
-
-  if (NS_FAILED(rv) || !io_svc) {
-    return NPERR_GENERIC_ERROR;
-  }
-
-  nsCOMPtr<nsIURI> uri;
-  io_svc->NewURI(nsCString(siteAddr), NULL, NULL, getter_AddRefs(uri));
-
-  nsCOMPtr<nsICookieService> cookie_svc = do_GetService("@mozilla.org/cookieService;1", &rv);
-
-  if (NS_FAILED(rv) || !cookie_svc) {
-    return NPERR_GENERIC_ERROR;
-  }
-
-  rv = cookie_svc->GetCookieString(uri, NULL, cookieString);
-
-  if (NS_FAILED(rv) || !*cookieString) {
-    return NPERR_GENERIC_ERROR;
-  }
-
-#else
-
   // getvalueforurl needs an NPP instance. Quite frankly, there is no easy way
   // to know which instance needs the information, as applets on Java side can
@@ -1073 +1106 @@
   }
 
-#endif
-
   return NPERR_NO_ERROR;
 }
@@ -1095 +1126 @@
 // HELPER FUNCTIONS
 
-static void
-plugin_data_new (ITNPPluginData** data)
+ITNPPluginData*
+plugin_data_new ()
 {
   PLUGIN_DEBUG ("plugin_data_new\n");
 
-  *data = (ITNPPluginData*)
-    (*browser_functions.memalloc) (sizeof (struct ITNPPluginData));
-
-  // appletviewer_alive is false until the applet viewer is spawned.
-  if (*data)
-    memset (*data, 0, sizeof (struct ITNPPluginData));
-
+  ITNPPluginData* data = (ITNPPluginData*)browser_functions.memalloc(sizeof (struct ITNPPluginData));
+
+  if (data)
+  {
+      // Call constructor on allocated data
+      new (data) ITNPPluginData();
+  }
   PLUGIN_DEBUG ("plugin_data_new return\n");
+
+  return data;
 }
 
@@ -1115 +1148 @@
 // documentbase.  This function relies on browser-private data so it
 // will only work when the plugin is loaded in a Mozilla-based
-// browser.  We could not find a way to retrieve the documentbase
-// using the original Netscape plugin API so we use the XPCOM API
-// instead.
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-static gchar*
+// browser.
+static std::string
 plugin_get_documentbase (NPP instance)
 {
   PLUGIN_DEBUG ("plugin_get_documentbase\n");
-
-  nsIPluginInstance* xpcom_instance = NULL;
-  nsIPluginInstancePeer* peer = NULL;
-  nsresult result = 0;
-  nsIPluginTagInfo2* pluginTagInfo2 = NULL;
-  info_union u = { NULL };
-  char const* documentbase = NULL;
-  gchar* documentbase_copy = NULL;
-
-  xpcom_instance = (nsIPluginInstance*) (instance->ndata);
-  if (!xpcom_instance)
-    {
-      PLUGIN_ERROR ("xpcom_instance is NULL.");
-      goto cleanup_done;
-    }
-
-  xpcom_instance->GetPeer (&peer);
-  if (!peer)
-    {
-      PLUGIN_ERROR ("peer is NULL.");
-      goto cleanup_done;
-    }
-
-  u.info_field = &pluginTagInfo2;
-
-  result = peer->QueryInterface (kIPluginTagInfo2IID,
-                                 u.void_field);
-  if (result || !pluginTagInfo2)
-    {
-      PLUGIN_ERROR ("pluginTagInfo2 retrieval failed.");
-      goto cleanup_peer;
-    }
-
-  pluginTagInfo2->GetDocumentBase (&documentbase);
-
-  if (!documentbase)
-    {
-      // NULL => dummy instantiation for LiveConnect
-      goto cleanup_plugintaginfo2;
-    }
-
-  documentbase_copy = g_strdup (documentbase);
-
-  // Release references.
- cleanup_plugintaginfo2:
-  NS_RELEASE (pluginTagInfo2);
-
- cleanup_peer:
-  NS_RELEASE (peer);
-
- cleanup_done:
-  PLUGIN_DEBUG ("plugin_get_documentbase return\n");
-
-  PLUGIN_DEBUG("plugin_get_documentbase returning: %s\n", documentbase_copy);
-  return documentbase_copy;
-}
-#else
-static gchar*
-plugin_get_documentbase (NPP instance)
-{
-  PLUGIN_DEBUG ("plugin_get_documentbase\n");
-
-  char const* documentbase = NULL;
-  gchar* documentbase_copy = NULL;
 
   // FIXME: This method is not ideal, but there are no known NPAPI call
@@ -1207 +1173 @@
 
   std::string href_str = IcedTeaPluginUtilities::NPVariantAsString(href);
-  documentbase_copy = g_strdup (href_str.c_str());
 
   // Release references.
   browser_functions.releasevariantvalue(&href);
   browser_functions.releasevariantvalue(&location);
- cleanup_done:
+
   PLUGIN_DEBUG ("plugin_get_documentbase return\n");
-  PLUGIN_DEBUG("plugin_get_documentbase returning: %s\n", documentbase_copy);
-
-  return documentbase_copy;
-}
-#endif
-
-// This function displays an error message if the appletviewer has not
-// been installed correctly.
-static void
-plugin_display_failure_dialog ()
-{
-#ifdef __OS2__
-  gchar *msg = NULL;
-
-  PLUGIN_DEBUG ("plugin_display_failure_dialog\n");
-
-  msg = g_strdup_printf (FAILURE_MESSAGE, appletviewer_executable);
-  WinMessageBox (HWND_DESKTOP, HWND_DESKTOP,
-                 msg, "Error", 0, MB_ERROR | MB_OK | MB_MOVEABLE);
-  g_free(msg);
-#else
-  GtkWidget* dialog = NULL;
-
-  PLUGIN_DEBUG ("plugin_display_failure_dialog\n");
-
-  dialog = gtk_message_dialog_new (NULL,
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_ERROR,
-                                   GTK_BUTTONS_CLOSE,
-                                   FAILURE_MESSAGE,
-                                   appletviewer_executable);
-  gtk_widget_show_all (dialog);
-  gtk_dialog_run (GTK_DIALOG (dialog));
-  gtk_widget_destroy (dialog);
-#endif
-
-  PLUGIN_DEBUG ("plugin_display_failure_dialog return\n");
-}
-
-
+  PLUGIN_DEBUG("plugin_get_documentbase returning: %s\n", href_str.c_str());
+
+  return href_str;
+}
 
 // plugin_in_pipe_callback is called when data is available on the
@@ -1279 +1208 @@
           if (channel_error)
             {
-              PLUGIN_ERROR_TWO ("Failed to read line from input channel",
+              PLUGIN_ERROR ("Failed to read line from input channel, %s\n",
                                 channel_error->message);
               g_error_free (channel_error);
@@ -1285 +1214 @@
             }
           else
-            PLUGIN_ERROR ("Failed to read line from input channel");
+            PLUGIN_ERROR ("Failed to read line from input channel\n");
 #ifdef __OS2__
           // G_IO_ERR/HUP is not reported on file/pipe handles, simulate it
@@ -1318 +1247 @@
   if (g_str_has_prefix(parts[1], "PluginProxyInfo"))
   {
-    gchar* proxy;
+    gchar* proxy = NULL;
     uint32_t len;
 
@@ -1326 +1255 @@
 
     gchar* proxy_info;
-
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-        proxy = (char*) malloc(sizeof(char)*2048);
-#endif
 
     proxy_info = g_strconcat ("plugin PluginProxyInfo reference ", parts[3], " ", NULL);
@@ -1345 +1270 @@
     proxy_info = NULL;
 
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-        g_free(proxy);
-        proxy = NULL;
-#endif
+    g_free(proxy);
+    proxy = NULL;
 
   } else if (g_str_has_prefix(parts[1], "PluginCookieInfo"))
@@ -1356 +1279 @@
 
     gchar* cookie_info = g_strconcat ("plugin PluginCookieInfo reference ", parts[3], " ", NULL);
-    gchar* cookie_string;
+    gchar* cookie_string = NULL;
     uint32_t len;
     if (get_cookie_info(decoded_url, &cookie_string, &len) == NPERR_NO_ERROR)
@@ -1370 +1293 @@
     g_free(cookie_info);
     cookie_info = NULL;
+    g_free(cookie_string);
+    cookie_string = NULL;
   } else if (g_str_has_prefix(parts[1], "PluginSetCookie"))
   {
@@ -1498 +1423 @@
           return NPERR_GENERIC_ERROR;
   }
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-  nsresult rv;
-
-  // Initialize service variables
-  nsCOMPtr<nsIProtocolProxyService> proxy_svc = do_GetService("@mozilla.org/network/protocol-proxy-service;1", &rv);
-
-  if (!proxy_svc) {
-      printf("Cannot initialize proxy service\n");
-      return NPERR_GENERIC_ERROR;
-  }
-
-  nsCOMPtr<nsIIOService> io_svc = do_GetService("@mozilla.org/network/io-service;1", &rv);
-
-  if (NS_FAILED(rv) || !io_svc) {
-    printf("Cannot initialize io service\n");
-    return NPERR_GENERIC_ERROR;
-  }
-
-  // uri which needs to be accessed
-  nsCOMPtr<nsIURI> uri;
-  io_svc->NewURI(nsCString(siteAddr), NULL, NULL, getter_AddRefs(uri));
-
-  // find the proxy address if any
-  nsCOMPtr<nsIProxyInfo> info;
-  proxy_svc->Resolve(uri, 0, getter_AddRefs(info));
-
-  // if there is no proxy found, return immediately
-  if (!info) {
-     PLUGIN_DEBUG("%s does not need a proxy\n", siteAddr);
-     return NPERR_GENERIC_ERROR;
-  }
-
-  // if proxy info is available, extract it
-  nsCString phost;
-  PRInt32 pport;
-  nsCString ptype;
-
-  info->GetHost(phost);
-  info->GetPort(&pport);
-  info->GetType(ptype);
-
-  // resolve the proxy address to an IP
-  nsCOMPtr<nsIDNSService> dns_svc = do_GetService("@mozilla.org/network/dns-service;1", &rv);
-
-  if (!dns_svc) {
-      printf("Cannot initialize DNS service\n");
-      return NPERR_GENERIC_ERROR;
-  }
-
-  nsCOMPtr<nsIDNSRecord> record;
-  dns_svc->Resolve(phost, 0U, getter_AddRefs(record));
-
-  // TODO: Add support for multiple ips
-  nsDependentCString ipAddr;
-  record->GetNextAddrAsString(ipAddr);
-
-  if (!strcmp(ptype.get(), "http"))
-  {
-      snprintf(*proxy, sizeof(char)*1024, "%s %s:%d", "PROXY", ipAddr.get(), pport);
-  } else
-  {
-      snprintf(*proxy, sizeof(char)*1024, "%s %s:%d", "SOCKS", ipAddr.get(), pport);
-  }
-
-  *len = strlen(*proxy);
-
-  PLUGIN_DEBUG("Proxy info for %s: %s\n", siteAddr, *proxy);
-
-#else
-
   if (browser_functions.getvalueforurl)
   {
@@ -1578 +1433 @@
       return NPERR_GENERIC_ERROR;
   }
-#endif
 
   return NPERR_NO_ERROR;
@@ -1678 +1532 @@
 plugin_test_appletviewer ()
 {
-  PLUGIN_DEBUG ("plugin_test_appletviewer: %s\n", appletviewer_executable);
+
+  PLUGIN_DEBUG ("plugin_test_appletviewer: %s\n", get_plugin_executable().c_str());
   NPError error = NPERR_NO_ERROR;
 
@@ -1684 +1539 @@
   gchar** environment;
 
-  command_line[0] = g_strdup (appletviewer_executable);
+  command_line[0] = g_strdup (get_plugin_executable().c_str());
   command_line[1] = g_strdup("-version");
   command_line[2] = NULL;
@@ -1696 +1551 @@
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to spawn applet viewer",
+          PLUGIN_ERROR ("Failed to spawn applet viewer %s\n",
                             channel_error->message);
           g_error_free (channel_error);
@@ -1702 +1557 @@
         }
       else
-        PLUGIN_ERROR ("Failed to spawn applet viewer");
+        PLUGIN_ERROR ("Failed to spawn applet viewer\n");
       error = NPERR_GENERIC_ERROR;
     }
@@ -1719 +1574 @@
 }
 
-static NPError
+NPError
 plugin_start_appletviewer (ITNPPluginData* data)
 {
@@ -1725 +1580 @@
   NPError error = NPERR_NO_ERROR;
 
-  gchar** command_line;
-  gchar** environment;
-
-  int cmd_num = 0;
+  std::vector<std::string> command_line;
+  gchar** environment = NULL;
+  std::vector<std::string*>* jvm_args = get_jvm_args();
+
+  // Construct command line parameters
+
+  command_line.push_back(get_plugin_executable());
+
+  //Add JVM args to command_line
+  for (int i = 0; i < jvm_args->size(); i++)
+  {
+    command_line.push_back(*jvm_args->at(i));
+  }
+
+  command_line.push_back(PLUGIN_BOOTCLASSPATH);
+  // set the classpath to avoid using the default (cwd).
+  command_line.push_back("-classpath");
+  command_line.push_back(get_plugin_rt_jar());
+
+  // Enable coverage agent if we are running instrumented plugin
+#ifdef COVERAGE_AGENT
+  command_line.push_back(COVERAGE_AGENT);
+#endif
+
   if (plugin_debug)
   {
-      command_line = (gchar**) malloc(sizeof(gchar*)*11);
-      command_line[cmd_num++] = g_strdup(appletviewer_executable);
-      command_line[cmd_num++] = g_strdup_printf(PLUGIN_BOOTCLASSPATH);
-      // set the classpath to avoid using the default (cwd).
-      command_line[cmd_num++] = g_strdup("-classpath");
-      command_line[cmd_num++] = g_strdup_printf("%s/lib/rt.jar", ICEDTEA_WEB_JRE);
-      command_line[cmd_num++] = g_strdup("-Xdebug");
-      command_line[cmd_num++] = g_strdup("-Xnoagent");
-      if (plugin_debug_suspend)
-      {
-          command_line[cmd_num++] = g_strdup("-Xrunjdwp:transport="DT_SOCKET_DLL",address=8787,server=y,suspend=y");
-      } else
-      {
-          command_line[cmd_num++] = g_strdup("-Xrunjdwp:transport="DT_SOCKET_DLL",address=8787,server=y,suspend=n");
-      }
-      command_line[cmd_num++] = g_strdup("sun.applet.PluginMain");
-#ifdef __OS2__
-      command_line[cmd_num++] = g_strdup_printf("%d", out_pipe [1]);
-      command_line[cmd_num++] = g_strdup_printf("%d", in_pipe [1]);
+    command_line.push_back("-Xdebug");
+    command_line.push_back("-Xnoagent");
+
+    //Debug flags
+    std::string debug_flags = "-Xrunjdwp:transport="DT_SOCKET_DLL",address=8787,server=y,";
+    debug_flags += plugin_debug_suspend ? "suspend=y" : "suspend=n";
+    command_line.push_back(debug_flags);
+  }
+
+  command_line.push_back("sun.applet.PluginMain");
+#ifdef __OS2__
+  command_line.push_back((std::ostrstream() << out_pipe[1]).str());
+  command_line.push_back((std::ostrstream() << in_pipe[1]).str());
 #else
-      command_line[cmd_num++] = g_strdup(out_pipe_name);
-      command_line[cmd_num++] = g_strdup(in_pipe_name);
-#endif
-      command_line[cmd_num] = NULL;
-  } else
-  {
-      command_line = (gchar**) malloc(sizeof(gchar*)*8);
-      command_line[cmd_num++] = g_strdup(appletviewer_executable);
-      command_line[cmd_num++] = g_strdup_printf(PLUGIN_BOOTCLASSPATH);
-      command_line[cmd_num++] = g_strdup("-classpath");
-      command_line[cmd_num++] = g_strdup_printf("%s/lib/rt.jar", ICEDTEA_WEB_JRE);
-      command_line[cmd_num++] = g_strdup("sun.applet.PluginMain");
-#ifdef __OS2__
-      command_line[cmd_num++] = g_strdup_printf("%d", out_pipe [1]);
-      command_line[cmd_num++] = g_strdup_printf("%d", in_pipe [1]);
+  command_line.push_back(out_pipe_name);
+  command_line.push_back(in_pipe_name);
+#endif
+  if (plugin_debug_to_console){
+      command_line.push_back(debug_pipe_name);
+  }
+
+  // Finished command line parameters
+
+  environment = plugin_filter_environment();
+  std::vector<gchar*> vector_gchar = IcedTeaPluginUtilities::vectorStringToVectorGchar(&command_line);
+  gchar **command_line_args = &vector_gchar[0];
+
+  if (!g_spawn_async (NULL, command_line_args, environment,
+#ifdef __OS2__
+                      (GSpawnFlags) (G_SPAWN_LEAVE_DESCRIPTORS_OPEN | G_SPAWN_DO_NOT_REAP_CHILD),
 #else
-      command_line[cmd_num++] = g_strdup(out_pipe_name);
-      command_line[cmd_num++] = g_strdup(in_pipe_name);
-#endif
-      command_line[cmd_num] = NULL;
-  }
-
-  environment = plugin_filter_environment();
-
-#ifdef __OS2__
-  int flags = G_SPAWN_LEAVE_DESCRIPTORS_OPEN | G_SPAWN_DO_NOT_REAP_CHILD;
-#else
-  int flags = G_SPAWN_DO_NOT_REAP_CHILD;
-#endif
-
-  if (!g_spawn_async (NULL, command_line, environment,
-                      (GSpawnFlags) flags,
+                      (GSpawnFlags) G_SPAWN_DO_NOT_REAP_CHILD,
+#endif
                       NULL, NULL, &appletviewer_pid, &channel_error))
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to spawn applet viewer",
+          PLUGIN_ERROR ("Failed to spawn applet viewer %s\n",
                             channel_error->message);
           g_error_free (channel_error);
@@ -1793 +1649 @@
         }
       else
-        PLUGIN_ERROR ("Failed to spawn applet viewer");
+        PLUGIN_ERROR ("Failed to spawn applet viewer\n");
       error = NPERR_GENERIC_ERROR;
     }
@@ -1802 +1658 @@
   signal (SIGPIPE, SIG_IGN);
 
-  g_strfreev (environment);
-
-  for (int i = 0; i < cmd_num; i++) {
-    g_free (command_line[i]);
-    command_line[i] = NULL;
-  }
-
-  g_free(command_line);
-  command_line = NULL;
+  //Free memory
+  g_strfreev(environment);
+  IcedTeaPluginUtilities::freeStringPtrVector(jvm_args);
+  jvm_args = NULL;
+  command_line_args = NULL;
 
   if (appletviewer_pid)
@@ -1824 +1676 @@
 
 /*
- * Replaces certain characters (\r, \n, etc) with HTML escape equivalents.
- *
- * Return string is allocated on the heap. Caller assumes responsibility
- * for freeing the memory via free()
+ * Returns JVM options set in itw-settings
  */
-static char*
-encode_string(char* to_encode)
-{
-
-  // Do nothing for an empty string
-  if (to_encode == '\0')
-      return to_encode;
-
-  // worst case scenario -> all characters are newlines or
-  // returns, each of which translates to 5 substitutions
-  char* encoded = (char*) calloc(((strlen(to_encode)*5)+1), sizeof(char));
-
-  strcpy(encoded, "");
-
-  for (int i=0; i < strlen(to_encode); i++)
-  {
-      if (to_encode[i] == '\r')
-          encoded = strcat(encoded, "&#13;");
-      else if (to_encode[i] == '\n')
-          encoded = strcat(encoded, "&#10;");
-      else if (to_encode[i] == '>')
-          encoded = strcat(encoded, "&gt;");
-      else if (to_encode[i] == '<')
-          encoded = strcat(encoded, "&lt;");
-      else if (to_encode[i] == '&')
-          encoded = strcat(encoded, "&amp;");
-      else if (to_encode[i] == '"')
-          encoded = strcat(encoded, "&quot;");
+std::vector<std::string*>*
+get_jvm_args()
+{
+  std::string output;
+  std::vector<std::string*>* tokenOutput = NULL;
+  bool args_defined = read_deploy_property_value("deployment.plugin.jvm.arguments", output);
+  if (!args_defined){
+    return new std::vector<std::string*>();
+  }
+  tokenOutput = IcedTeaPluginUtilities::strSplit(output.c_str(), " \n");
+  return tokenOutput;
+}
+
+
+/*
+ * Escape characters for passing to Java.
+ * "\n" for new line, "\\" for "\", "\:" for ";"
+ */
+std::string
+escape_parameter_string(const char* to_encode) {
+  std::string encoded;
+
+  if (to_encode == NULL)
+  {
+      return encoded;
+  }
+
+  size_t length = strlen(to_encode);
+  for (int i = 0; i < length; i++)
+  {
+      if (to_encode[i] == '\n')
+          encoded += "\\n";
+      else if (to_encode[i] == '\\')
+          encoded += "\\\\";
+      else if (to_encode[i] == ';')
+          encoded += "\\:";
       else
-      {
-           char* orig_char = (char*) calloc(2, sizeof(char));
-           orig_char[0] = to_encode[i];
-           orig_char[1] = '\0';
-
-           strcat(encoded, orig_char);
-
-           free(orig_char);
-           orig_char = NULL;
-      }
+          encoded += to_encode[i];
   }
 
@@ -1873 +1721 @@
 }
 
-// Build up the applet tag string that we'll send to the applet
-// viewer.
-static gchar*
-plugin_create_applet_tag (int16_t argc, char* argn[], char* argv[])
-{
-  PLUGIN_DEBUG ("plugin_create_applet_tag\n");
-
-  gchar* applet_tag = g_strdup ("<EMBED ");
-  gchar* parameters = g_strdup ("");
-
-  for (int16_t i = 0; i < argc; i++)
-    {
-      gchar* argn_escaped = encode_string(argn[i]);
-      gchar* argv_escaped = encode_string(argv[i]);
-
-      if (!g_ascii_strcasecmp (argn_escaped, "code"))
-        {
-          gchar* code = g_strdup_printf ("CODE=\"%s\" ", argv_escaped);
-          applet_tag = g_strconcat (applet_tag, code, NULL);
-          g_free (code);
-          code = NULL;
-    }
-      else if (!g_ascii_strcasecmp (argn_escaped, "java_code"))
-    {
-          gchar* java_code = g_strdup_printf ("JAVA_CODE=\"%s\" ", argv_escaped);
-          applet_tag = g_strconcat (applet_tag, java_code, NULL);
-          g_free (java_code);
-          java_code = NULL;
-    }
-      else if (!g_ascii_strcasecmp (argn_escaped, "codebase"))
-    {
-          gchar* codebase = g_strdup_printf ("CODEBASE=\"%s\" ", argv_escaped);
-          applet_tag = g_strconcat (applet_tag, codebase, NULL);
-          g_free (codebase);
-          codebase = NULL;
-    }
-      else if (!g_ascii_strcasecmp (argn_escaped, "java_codebase"))
-    {
-          gchar* java_codebase = g_strdup_printf ("JAVA_CODEBASE=\"%s\" ", argv_escaped);
-          applet_tag = g_strconcat (applet_tag, java_codebase, NULL);
-          g_free (java_codebase);
-          java_codebase = NULL;
-    }
-      else if (!g_ascii_strcasecmp (argn_escaped, "classid"))
-    {
-          gchar* classid = g_strdup_printf ("CLASSID=\"%s\" ", argv_escaped);
-          applet_tag = g_strconcat (applet_tag, classid, NULL);
-          g_free (classid);
-          classid = NULL;
-    }
-      else if (!g_ascii_strcasecmp (argn_escaped, "archive"))
-    {
-          gchar* archive = g_strdup_printf ("ARCHIVE=\"%s\" ", argv_escaped);
-          applet_tag = g_strconcat (applet_tag, archive, NULL);
-          g_free (archive);
-          archive = NULL;
-    }
-      else if (!g_ascii_strcasecmp (argn_escaped, "java_archive"))
-    {
-          gchar* java_archive = g_strdup_printf ("JAVA_ARCHIVE=\"%s\" ", argv_escaped);
-          applet_tag = g_strconcat (applet_tag, java_archive, NULL);
-          g_free (java_archive);
-          java_archive = NULL;
-    }
-      else if (!g_ascii_strcasecmp (argn_escaped, "width"))
-    {
-          gchar* width = g_strdup_printf ("width=\"%s\" ", argv_escaped);
-          applet_tag = g_strconcat (applet_tag, width, NULL);
-          g_free (width);
-          width = NULL;
-    }
-      else if (!g_ascii_strcasecmp (argn_escaped, "height"))
-    {
-          gchar* height = g_strdup_printf ("height=\"%s\" ", argv_escaped);
-          applet_tag = g_strconcat (applet_tag, height, NULL);
-          g_free (height);
-          height = NULL;
-    }
-      else
-        {
-
-          if (argv_escaped != '\0')
-            {
-              parameters = g_strconcat (parameters, "<PARAM NAME=\"", argn_escaped,
-                                        "\" VALUE=\"", argv_escaped, "\">", NULL);
-            }
-        }
-
-      free(argn_escaped);
-      free(argv_escaped);
-
-      argn_escaped = NULL;
-      argv_escaped = NULL;
-    }
-
-  applet_tag = g_strconcat (applet_tag, ">", parameters, "</EMBED>", NULL);
-
-  g_free (parameters);
-  parameters = NULL;
-
-  PLUGIN_DEBUG ("plugin_create_applet_tag return\n");
-
-  return applet_tag;
+/*
+ * Build a string containing an encoded list of parameters to send to the applet viewer.
+ * The parameters are separated as 'key1;value1;key2;value2;'. As well, they are
+ * separated and escaped as:
+ * "\n" for new line, "\\" for "\", "\:" for ";"
+ */
+std::string
+plugin_parameters_string (int argc, char* argn[], char* argv[])
+{
+  PLUGIN_DEBUG ("plugin_parameters_string\n");
+
+  std::string parameters;
+
+  for (int i = 0; i < argc; i++)
+  {
+    if (argv[i] != NULL)
+    {
+        std::string name_escaped = escape_parameter_string(argn[i]);
+        std::string value_escaped = escape_parameter_string(argv[i]);
+
+        //Encode parameters and send as 'key1;value1;key2;value2;' etc
+        parameters += name_escaped;
+        parameters += ';';
+        parameters += value_escaped;
+        parameters += ';';
+    }
+  }
+
+  PLUGIN_DEBUG ("plugin_parameters_string return\n");
+
+  return parameters;
 }
 
@@ -2003 +1779 @@
           if (channel_error)
             {
-              PLUGIN_ERROR_TWO ("Failed to write bytes to output channel",
+              PLUGIN_ERROR ("Failed to write bytes to output channel '%s' \n",
                                 channel_error->message);
               g_error_free (channel_error);
@@ -2009 +1785 @@
             }
           else
-            PLUGIN_ERROR ("Failed to write bytes to output channel");
+            PLUGIN_ERROR ("Failed to write bytes to output channel for %s", newline_message);
         }
 
@@ -2017 +1793 @@
           if (channel_error)
             {
-              PLUGIN_ERROR_TWO ("Failed to flush bytes to output channel",
+              PLUGIN_ERROR ("Failed to flush bytes to output channel '%s'\n",
                                 channel_error->message);
               g_error_free (channel_error);
@@ -2023 +1799 @@
             }
           else
-            PLUGIN_ERROR ("Failed to flush bytes to output channel");
+            PLUGIN_ERROR ("Failed to flush bytes to output channel for %s", newline_message);
         }
       g_free (newline_message);
       newline_message = NULL;
 
-      PLUGIN_DEBUG ("  PIPE: plugin wrote: %s\n", message);
+      PLUGIN_DEBUG ("  PIPE: plugin wrote(?): %s\n", message);
     }
 
   PLUGIN_DEBUG ("plugin_send_message_to_appletviewer return\n");
+}
+
+// unlike like  plugin_send_message_to_appletviewer
+// do not debug
+// do not error
+// do not have its own line end
+// is accesed by only one thread
+// have own pipe
+// jvm must be up
+void
+plugin_send_message_to_appletviewer_console (gchar const* newline_message)
+{
+  gsize bytes_written = 0;
+  if (g_io_channel_write_chars (debug_to_appletviewer,
+                                newline_message, -1, &bytes_written,
+                                &channel_error) != G_IO_STATUS_NORMAL)  {
+          if (channel_error) {
+              //error must be freed
+              g_error_free (channel_error);
+              channel_error = NULL;
+            }
+        }
+}
+//flush only when its full
+void flush_plugin_send_message_to_appletviewer_console (){
+  if (g_io_channel_flush (debug_to_appletviewer, &channel_error)
+                                                 != G_IO_STATUS_NORMAL) {
+          if (channel_error) {
+              g_error_free (channel_error);
+              channel_error = NULL;
+            }
+        }
 }
 
@@ -2084 +1892 @@
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to write shutdown message to"
-                                    " appletviewer", channel_error->message);
+                  PLUGIN_ERROR ("Failed to write shutdown message to "
+                                    " appletviewer, %s \n", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
                 }
               else
-                PLUGIN_ERROR ("Failed to write shutdown message to");
+                PLUGIN_ERROR ("Failed to write shutdown message to\n");
             }
 
@@ -2098 +1906 @@
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to write shutdown message to"
-                                    " appletviewer", channel_error->message);
+                  PLUGIN_ERROR ("Failed to write shutdown message to"
+                                    " appletviewer %s \n", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
                 }
               else
-                PLUGIN_ERROR ("Failed to write shutdown message to");
+                PLUGIN_ERROR ("Failed to write shutdown message to\n");
             }
 
@@ -2113 +1921 @@
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to shut down appletviewer"
-                                    " output channel", channel_error->message);
+                  PLUGIN_ERROR ("Failed to shut down appletviewer"
+                                    " output channel %s \n", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
                 }
               else
-                PLUGIN_ERROR ("Failed to shut down appletviewer");
+                PLUGIN_ERROR ("Failed to shut down appletviewer\n");
             }
         }
@@ -2131 +1939 @@
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to shut down appletviewer"
-                                    " input channel", channel_error->message);
+                  PLUGIN_ERROR ("Failed to shut down appletviewer"
+                                    " input channel %s \n", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
                 }
               else
-                PLUGIN_ERROR ("Failed to shut down appletviewer");
+                PLUGIN_ERROR ("Failed to shut down appletviewer\n");
             }
         }
@@ -2156 +1964 @@
 }
 
-static void
+void
 plugin_data_destroy (NPP instance)
 {
@@ -2173 +1981 @@
     }
 
-  tofree->window_handle = NULL;
-  tofree->window_height = 0;
-  tofree->window_width = 0;
-
-  // cleanup_appletviewer_mutex:
-  g_mutex_free (tofree->appletviewer_mutex);
-  tofree->appletviewer_mutex = NULL;
-
-  // cleanup_instance_string:
-  g_free (tofree->instance_id);
-  tofree->instance_id = NULL;
-
-  // cleanup applet tag
-  g_free (tofree->applet_tag);
-  tofree->applet_tag = NULL;
-
-  g_free(tofree->source);
-  tofree->source = NULL;
-
-  // cleanup_data:
-  // Eliminate back-pointer to plugin instance.
-  tofree->owner = NULL;
+  /* Explicitly call destructor */
+  tofree->~ITNPPluginData();
+
   (*browser_functions.memfree) (tofree);
-  tofree = NULL;
 
   PLUGIN_DEBUG ("plugin_data_destroy return\n");
@@ -2204 +1992 @@
 initialize_browser_functions(const NPNetscapeFuncs* browserTable)
 {
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->pluginthreadasynccall)
-#else
 #define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->setvalueforurl)
-#endif
 
   //Determine the size in bytes, as a difference of the address past the last used field
@@ -2250 +2034 @@
   pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
   pluginTable->size = sizeof (NPPluginFuncs);
-
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-  pluginTable->newp = NewNPP_NewProc (ITNP_New);
-  pluginTable->destroy = NewNPP_DestroyProc (ITNP_Destroy);
-  pluginTable->setwindow = NewNPP_SetWindowProc (ITNP_SetWindow);
-  pluginTable->newstream = NewNPP_NewStreamProc (ITNP_NewStream);
-  pluginTable->destroystream = NewNPP_DestroyStreamProc (ITNP_DestroyStream);
-  pluginTable->asfile = NewNPP_StreamAsFileProc (ITNP_StreamAsFile);
-  pluginTable->writeready = NewNPP_WriteReadyProc (ITNP_WriteReady);
-  pluginTable->write = NewNPP_WriteProc (ITNP_Write);
-  pluginTable->print = NewNPP_PrintProc (ITNP_Print);
-  pluginTable->urlnotify = NewNPP_URLNotifyProc (ITNP_URLNotify);
-  pluginTable->getvalue = NewNPP_GetValueProc (ITNP_GetValue);
-#else
   pluginTable->newp = NPP_NewProcPtr (ITNP_New);
   pluginTable->destroy = NPP_DestroyProcPtr (ITNP_Destroy);
@@ -2275 +2045 @@
   pluginTable->urlnotify = NPP_URLNotifyProcPtr (ITNP_URLNotify);
   pluginTable->getvalue = NPP_GetValueProcPtr (ITNP_GetValue);
-#endif
 
   return true;
+}
+
+// Make sure the plugin data directory exists, creating it if necessary.
+NPError
+initialize_data_directory()
+{
+
+  data_directory = IcedTeaPluginUtilities::getRuntimePath() + "/icedteaplugin-";
+  if (getenv("USER") != NULL) {
+    data_directory = data_directory + getenv("USER") + "-";
+  }
+  data_directory += "XXXXXX";
+  // Now create a icedteaplugin subdir
+  char fileNameX[data_directory.length()+1];
+  std::strcpy (fileNameX, data_directory.c_str());
+  char * fileName = mkdtemp(fileNameX);
+  if (fileName == NULL) {
+    PLUGIN_ERROR ("Failed to create data directory %s, %s\n",
+                        data_directory.c_str(),
+                        strerror (errno));
+    return NPERR_GENERIC_ERROR;
+  }
+  data_directory = std::string(fileName);
+
+  //open uniques icedteaplugin subdir for one single run  
+  data_directory_descriptor = opendir(data_directory.c_str());
+  if (data_directory_descriptor == NULL) {
+      PLUGIN_ERROR ("Failed to open data directory %s %s\n",
+                      data_directory.c_str(), strerror (errno));
+      return NPERR_GENERIC_ERROR;
+  }
+
+  return NPERR_NO_ERROR;
 }
 
@@ -2291 +2093 @@
 // been called. There is no need to call this function more than once and
 // this workaround avoids any duplicate calls.
+__attribute__ ((visibility ("default")))
 NPError
 #if defined(_WIN32) || defined (__OS2__)
@@ -2310 +2113 @@
   if ((browserTable == NULL) || (pluginTable == NULL))
   {
-    PLUGIN_ERROR ("Browser or plugin function table is NULL.");
+    PLUGIN_ERROR ("Browser or plugin function table is NULL.\n");
 
     return NPERR_INVALID_FUNCTABLE_ERROR;
@@ -2321 +2124 @@
   if ((browserTable->version >> 8) > NP_VERSION_MAJOR)
     {
-      PLUGIN_ERROR ("Incompatible version.");
+      PLUGIN_ERROR ("Incompatible version.\n");
 
       return NPERR_INCOMPATIBLE_VERSION_ERROR;
@@ -2334 +2137 @@
   if ( !browser_functions_supported )
   {
-        PLUGIN_ERROR ("Invalid browser function table.");
+        PLUGIN_ERROR ("Invalid browser function table.\n");
 
         return NPERR_INVALID_FUNCTABLE_ERROR;
@@ -2348 +2151 @@
   if ( !plugin_functions_supported )
   {
-    PLUGIN_ERROR ("Invalid plugin function table.");
+    PLUGIN_ERROR ("Invalid plugin function table.\n");
 
     return NPERR_INVALID_FUNCTABLE_ERROR;
@@ -2371 +2174 @@
   NPError np_error = NPERR_NO_ERROR;
 #ifndef __OS2__
-  // Make sure the plugin data directory exists, creating it if
-  // necessary.
-  data_directory = g_strconcat (P_tmpdir, NULL);
-  if (!data_directory)
-    {
-      PLUGIN_ERROR ("Failed to create data directory name.");
-      return NPERR_OUT_OF_MEMORY_ERROR;
-    }
-
-  // If P_tmpdir does not exist, try /tmp directly
-
-  if (!g_file_test (data_directory,
-                    (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
-    {
-      int file_error = 0;
-
-      data_directory = g_strconcat ("/tmp", NULL);
-        if (!data_directory)
-          {
-            PLUGIN_ERROR ("Failed to create data directory name.");
-            return NPERR_OUT_OF_MEMORY_ERROR;
-          }
-
-    }
-
-  data_directory = g_strconcat (data_directory, "/icedteaplugin-", getenv("USER"), NULL);
-
-  if (!data_directory)
-  {
-      PLUGIN_ERROR ("Failed to create data directory name.");
-      return NPERR_OUT_OF_MEMORY_ERROR;
-  }
-
-  // Now create a icedteaplugin subdir
-  if (!g_file_test (data_directory,
-                    (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
-    {
-      int file_error = 0;
-
-      file_error = g_mkdir (data_directory, 0700);
-      if (file_error != 0)
-        {
-          PLUGIN_ERROR_THREE ("Failed to create data directory",
-                          data_directory,
-                          strerror (errno));
-          np_error = NPERR_GENERIC_ERROR;
-          goto cleanup_data_directory;
-        }
-    }
-
-
-  // If data directory doesn't exit by this point, bail
-  if (!g_file_test (data_directory,
-                    (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
-    {
-      PLUGIN_ERROR_THREE ("Temp directory does not exist: ",
-                          data_directory,
-                          strerror (errno));
-
-      np_error = NPERR_GENERIC_ERROR;
-            goto cleanup_data_directory;
-
+  // create directory for pipes
+  np_error =  initialize_data_directory();
+  if (np_error != NPERR_NO_ERROR)
+    {
+      PLUGIN_ERROR("Unable to create data directory %s\n", data_directory.c_str());
+      return np_error;
     }
 #endif
 
   // Set appletviewer_executable.
-  gchar* filename = g_strdup(ICEDTEA_WEB_JRE);
-  appletviewer_executable = g_strdup_printf ("%s/bin/java",
-                                             filename);
-  PLUGIN_DEBUG("Executing java at %s\n", appletviewer_executable);
-  if (!appletviewer_executable)
-    {
-      PLUGIN_ERROR ("Failed to create appletviewer executable name.");
-      np_error = NPERR_OUT_OF_MEMORY_ERROR;
-      goto cleanup_filename;
-    }
-
+  PLUGIN_DEBUG("Executing java at %s\n", get_plugin_executable().c_str());
   np_error = plugin_test_appletviewer ();
   if (np_error != NPERR_NO_ERROR)
     {
-      plugin_display_failure_dialog ();
-      goto cleanup_appletviewer_executable;
-    }
-  g_free (filename);
+      PLUGIN_ERROR("Unable to find java executable %s\n", get_plugin_executable().c_str());
+      return np_error;
+    }
 
   // Initialize threads (needed for mutexes).
@@ -2464 +2200 @@
   {
     PLUGIN_DEBUG ("Failed to integrate with PM");
-    np_error = NPERR_GENERIC_ERROR;
-    goto cleanup_appletviewer_executable;
+    return NPERR_GENERIC_ERROR;
   }
 #endif
@@ -2471 +2206 @@
   plugin_instance_mutex = g_mutex_new ();
 
-  PLUGIN_DEBUG ("NP_Initialize: using %s\n", appletviewer_executable);
+  PLUGIN_DEBUG ("NP_Initialize: using %s\n", get_plugin_executable().c_str());
 
   plugin_req_proc = new PluginRequestProcessor();
@@ -2508 +2243 @@
 
   return NPERR_NO_ERROR;
-
- cleanup_appletviewer_executable:
-  if (appletviewer_executable)
-    {
-      g_free (appletviewer_executable);
-      appletviewer_executable = NULL;
-    }
-
- cleanup_filename:
-  if (filename)
-    {
-      g_free (filename);
-      filename = NULL;
-    }
-
- cleanup_data_directory:
-  if (data_directory)
-    {
-      g_free (data_directory);
-      data_directory = NULL;
-    }
-
-
-  return np_error;
 }
 
@@ -2566 +2277 @@
 // Returns a string describing the MIME type that this plugin
 // handles.
+__attribute__ ((visibility ("default")))
 #ifdef LEGACY_XULRUNNERAPI
   char*
@@ -2573 +2285 @@
 OSCALL NP_GetMIMEDescription ()
 {
+  //this function is called severaltimes between lunches
   PLUGIN_DEBUG ("NP_GetMIMEDescription\n");
 
@@ -2582 +2295 @@
 // Returns a value relevant to the plugin as a whole.  The browser
 // calls this function to obtain information about the plugin.
+__attribute__ ((visibility ("default")))
 NPError
 OSCALL NP_GetValue (void* future, NPPVariable variable, void* value)
@@ -2603 +2317 @@
 
     default:
-      PLUGIN_ERROR ("Unknown plugin value requested.");
+      PLUGIN_ERROR ("Unknown plugin value requested.\n");
       result = NPERR_GENERIC_ERROR;
       break;
@@ -2615 +2329 @@
 // Shuts down the plugin.  Called after the last plugin instance is
 // destroyed.
+__attribute__ ((visibility ("default")))
 NPError
 OSCALL NP_Shutdown (void)
@@ -2629 +2344 @@
       g_mutex_free (plugin_instance_mutex);
       plugin_instance_mutex = NULL;
-    }
-
-  if (data_directory)
-    {
-      g_free (data_directory);
-      data_directory = NULL;
-    }
-
-  if (appletviewer_executable)
-    {
-      g_free (appletviewer_executable);
-      appletviewer_executable = NULL;
     }
 
@@ -2699 +2402 @@
 #endif
 
+  if (plugin_debug_to_console){
+    //jvm_up is now false
+    if (g_io_channel_shutdown (debug_to_appletviewer,
+                                     TRUE, &channel_error)
+              != G_IO_STATUS_NORMAL)
+            {
+              if (channel_error)
+                {
+                  PLUGIN_ERROR ("Failed to shut down appletviewer"
+                                    " debug channel\n", channel_error->message);
+                  g_error_free (channel_error);
+                  channel_error = NULL;
+                }
+              else
+                PLUGIN_ERROR ("Failed to shut down debug to appletviewer\n");
+            }
+    // cleanup_out_to_appletviewer:
+    if (debug_to_appletviewer)
+     g_io_channel_unref (debug_to_appletviewer);
+    out_to_appletviewer = NULL;
+    // cleanup_debug_pipe:
+    // Delete debug pipe.
+    PLUGIN_DEBUG ("NP_Shutdown: deleting debug fifo: %s\n", debug_pipe_name);
+    unlink (debug_pipe_name);
+    PLUGIN_DEBUG ("NP_Shutdown: deleted debug fifo: %s\n", debug_pipe_name);
+    // cleanup_out_pipe_name:
+    g_free (debug_pipe_name);
+    debug_pipe_name = NULL;
+  }
+  
   // Destroy the call queue mutex
   pthread_mutex_destroy(&pluginAsyncCallMutex);
@@ -2736 +2469 @@
   //delete internal_bus;
 
+  cleanUpDir();
+  
   PLUGIN_DEBUG ("NP_Shutdown return\n");
+  
+  if (plugin_debug_to_file){
+    fflush (plugin_file_log);
+    //fclose (plugin_file_log);
+    //keep writing untill possible!
+  }  
 
   return NPERR_NO_ERROR;
@@ -2762 +2503 @@
         if (!data->window_handle)
         {
-            plugin_send_initialization_message(data->instance_id, 0, 0, 0, data->applet_tag);
+            plugin_send_initialization_message(data->instance_id, 0, 0, 0, data->parameters_string);
         }
 
@@ -2771 +2512 @@
         if (java_result->error_occurred)
         {
-            printf("Error: Unable to fetch applet instance id from Java side.\n");
+            PLUGIN_ERROR("Error: Unable to fetch applet instance id from Java side.\n");
             return NULL;
         }
@@ -2781 +2522 @@
         if (java_result->error_occurred)
         {
-            printf("Error: Unable to fetch applet instance id from Java side.\n");
+            PLUGIN_ERROR("Error: Unable to fetch applet instance id from Java side.\n");
             return NULL;
         }
@@ -2787 +2528 @@
         applet_class_id.append(*(java_result->return_string));
 
-        obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_object(instance, applet_class_id, instance_id, false);
+        obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, applet_class_id, instance_id, false);
 
     } else
     {
-        obj = IcedTeaScriptablePluginObject::get_scriptable_java_package_object(instance, "");
+        obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(instance, "");
     }