From 00af9d3f682ce2cde44a4d37b45c97fa8ac441c1 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Thu, 10 Mar 2011 15:42:01 -0500
Subject: Replace binary launchers with shell scripts

2011-03-10  Omair Majid  <omajid@redhat.com>

    Replace native launchers with shell scripts
    * NEWS: Update.
    * Makefile.am
    (LAUNCHER_BOOTCLASSPATH): Remove leading -J.
    (LAUNCHER_SRCDIR),
    (LAUNCHER_OBJECTS),
    (NETX_LAUNCHER_OBJECTS),
    (CONTROLPANEL_LAUNCHER_OBJECTS),
    (LAUNCHER_FLAGS),
    (LAUNCHER_LINK): Remove.
    (edit_launcher_script): New function.
    (all-local): Depend on new launcher targets.
    (clean-local): Depend on clean-launchers.
    (.PHONY): Add clean-launchers.
    (install-exec-local): Use new launcher paths.
    (clean-launchers): New target.
    ($(NETX_DIR)/launcher/%.o),
    ($(NETX_DIR)/launcher/controlpanel/%.o),
    ($(NETX_DIR)/launcher/javaws),
    ($(NETX_DIR)/launcher/controlpanel/itweb-settings): Remove.
    (launcher.build/javaws): New launcher.
    (launcher.build/itweb-settings): Likewise.
    * launcher/itweb-settings.in,
    * launcher/javaws.in: New file.
    * netx/net/sourceforge/jnlp/Launcher.java (launchExternal),
    * netx/net/sourceforge/jnlp/controlpanel/CommandLine.java (CommandLine):
    Use new system properties to find paths and program names.
---
 netx/net/sourceforge/jnlp/Launcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'netx/net/sourceforge/jnlp/Launcher.java')

diff --git a/netx/net/sourceforge/jnlp/Launcher.java b/netx/net/sourceforge/jnlp/Launcher.java
index 8092840..ec0f7eb 100644
--- a/netx/net/sourceforge/jnlp/Launcher.java
+++ b/netx/net/sourceforge/jnlp/Launcher.java
@@ -327,7 +327,7 @@ public class Launcher {
             List<String> commands = new LinkedList<String>();
 
             // this property is set by the javaws launcher to point to the javaws binary
-            String pathToWebstartBinary = System.getProperty("java.icedtea-web.bin");
+            String pathToWebstartBinary = System.getProperty("icedtea-web.bin.location");
             commands.add(pathToWebstartBinary);
             // use -Jargument format to pass arguments to the JVM through the launcher
             for (String arg : vmArgs) {
-- 
cgit v1.2.3