add symlinks under JDK_HOME/jre/bin and make javaws work without them too

2010-12-15  Omair Majid  <[email protected]>

    * Makefile.am
    (install-exec-local): Install plugin.jar as data. If $(prefix)/jre/bin
    exists, then install symlinks to real javaws and itweb-settings binaries
    under it.
    ($(NETX_DIR)/launcher/%.o): Set system property java.icedtea-web.bin to
    point to the installed location of the javaws binary.
    * netx/net/sourceforge/jnlp/Launcher.java (launchExternal): Use the system
    property java.icedtea-web.bin to locate javaws binary.

1 files changed, 2 insertions, 5 deletions

diff --git a/netx/net/sourceforge/jnlp/Launcher.java b/netx/net/sourceforge/jnlp/Launcher.java
index 4d80252..11f0e12 100644
--- a/netx/net/sourceforge/jnlp/Launcher.java
+++ b/netx/net/sourceforge/jnlp/Launcher.java
@@ -329,11 +329,8 @@ public class Launcher {
 
             List<String> commands = new LinkedList<String>();
 
-            String pathToWebstartBinary = System.getProperty("java.home") +
-                                      File.separatorChar +
-                                      "bin" +
-                                      File.separatorChar +
-                                      "javaws";
+            // this property is set by the javaws launcher to point to the javaws binary
+            String pathToWebstartBinary = System.getProperty("java.icedtea-web.bin");
             commands.add(pathToWebstartBinary);
             // use -Jargument format to pass arguments to the JVM through the launcher
             for (String arg : vmArgs) {