[icedtea-web] RFC: backport changeset 9397074c2c39 to icedtea-web 1.0

[Deepak Bhole]

* Omair Majid <omajid at redhat.com> [2011-01-20 12:46]:
> Hi,
> 
> I would like to backport changeset 9397074c2c39 from icedtea-web
> HEAD to icedtea-web 1.0.
> 
> This changeset adds symlinks for javaws and itweb-settings under
> JDK_HOME/jre/bin. Without this patch, JNLPs which require a new VM
> to start will fail:
> 
> $ javaws SweetHome3D.jnlp
> net.sourceforge.jnlp.LaunchException: Fatal: External Launch Error:
> Could not launch JNLP file.
> Caused by: java.io.IOException: Cannot run program
> "$JDK_HOME/jre/bin/javaws": java.io.IOException: error=2, No such
> file or directory
> 
> The backport is attached.
> 
> Ok to commit?
> 

The binary in jre/bin should be the actual file, not the one in
JAVA_HOME/bin. JAVA_HOME/bin is optional and installed as part of the
JDK. However the JRE (and all the components therein) should be
independently runnable.

Cheers,
Deepak

> Cheers,
> Omair

> diff -r bafc58e4df46 ChangeLog
> --- a/ChangeLog	Thu Jan 20 12:09:09 2011 -0500
> +++ b/ChangeLog	Thu Jan 20 12:39:16 2011 -0500
> @@ -48,6 +48,17 @@
>  	* netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java:
>  	Make sure SecurityException is thrown if necessary. 
>  
> +2010-12-15  Omair Majid  <omajid at redhat.com>
> +
> +	* 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.
> +
>  2010-12-14  Andrew John Hughes  <ahughes at redhat.com>
>  
>  	* Makefile.am:
> diff -r bafc58e4df46 Makefile.am
> --- a/Makefile.am	Thu Jan 20 12:09:09 2011 -0500
> +++ b/Makefile.am	Thu Jan 20 12:39:16 2011 -0500
> @@ -106,12 +106,28 @@
>  if ENABLE_PLUGIN
>  	${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(prefix)/jre/lib/$(INSTALL_ARCH_DIR)/
>  	${INSTALL_PROGRAM} $(PLUGIN_DIR)/launcher/pluginappletviewer $(DESTDIR)$(bindir)
> -	${INSTALL_PROGRAM} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(prefix)/jre/lib/plugin.jar
> +	${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(prefix)/jre/lib/plugin.jar
>  endif
>  	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(prefix)/jre/lib/netx.jar
>  	${INSTALL_PROGRAM} $(NETX_DIR)/launcher/javaws $(DESTDIR)$(bindir)
> +	if [ -d $(DESTDIR)$(prefix)/jre/bin ] ; then \
> +	  if [ -L $(DESTDIR)$(prefix)/jre/bin/javaws ] ; then \
> +	    rm -f $(DESTDIR)$(prefix)/jre/bin/javaws ; \
> +	  fi ; \
> +	  if [ ! -e $(prefix)/jre/bin/javaws ] ; then \
> +	    ln -s $(DESTDIR)$(bindir)/javaws $(DESTDIR)$(prefix)/jre/bin ; \
> +	  fi ; \
> +	fi
>  	${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(prefix)/jre/lib
>  	${INSTALL_PROGRAM} $(NETX_DIR)/launcher/controlpanel/itweb-settings $(DESTDIR)$(bindir)
> +	if [ -d $(DESTDIR)$(prefix)/jre/bin ] ; then \
> +	  if [ -L $(DESTDIR)$(prefix)/jre/bin/itweb-settings ] ; then \
> +	    rm -f $(DESTDIR)$(prefix)/jre/bin/itweb-settings ; \
> +	  fi ; \
> +	  if [ ! -e $(prefix)/jre/bin/itweb-settings ] ; then \
> +	    ln -s $(DESTDIR)$(bindir)/itweb-settings $(DESTDIR)$(prefix)/jre/bin ; \
> +	  fi ; \
> +	fi
>  
>  install-data-local:
>  	${mkinstalldirs} -d $(DESTDIR)$(prefix)/man/man1
> @@ -142,7 +158,14 @@
>  	rm -f $(DESTDIR)$(prefix)/man/man1/javaws.1
>  	rm -f $(DESTDIR)$(bindir)/pluginappletviewer
>  	rm -f $(DESTDIR)$(bindir)/javaws
> +	if [ -L $(DESTDIR)$(prefix)/jre/bin/javaws ] ; then \
> +	  rm -f $(DESTDIR)$(prefix)/jre/bin/javaws ; \
> +	fi
> +	rm -f $(DESTDIR)$(prefix)/jre/bin/javaws
>  	rm -f $(DESTDIR)$(bindir)/itweb-settings
> +	if [ -L $(DESTDIR)$(prefix)/jre/bin/itweb-settings ] ; then \
> +	  rm -f $(DESTDIR)$(prefix)/jre/bin/itweb-settings ; \
> +	fi
>  	rm -rf $(DESTDIR)$(htmldir)
>  
>  # Plugin
> @@ -325,8 +348,9 @@
>  
>  $(NETX_DIR)/launcher/%.o: $(LAUNCHER_SRCDIR)/%.c
>  	mkdir -p $(NETX_DIR)/launcher && \
> -	$(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "-J-ms8m", "net.sourceforge.jnlp.runtime.Boot",  }' -DPROGNAME='"javaws"' \
> -	-c -o $@ $<
> +	$(CC) $(LAUNCHER_FLAGS) \
> +	  -DJAVA_ARGS='{ "-J-ms8m", "-J-Djava.icedtea-web.bin=$(DESTDIR)$(bindir)/javaws", "net.sourceforge.jnlp.runtime.Boot",  }' \
> +	  -DPROGNAME='"javaws"' -c -o $@ $<
>  
>  $(NETX_DIR)/launcher/controlpanel/%.o: $(LAUNCHER_SRCDIR)/%.c
>  	mkdir -p $(NETX_DIR)/launcher/controlpanel && \
> diff -r bafc58e4df46 netx/net/sourceforge/jnlp/Launcher.java
> --- a/netx/net/sourceforge/jnlp/Launcher.java	Thu Jan 20 12:09:09 2011 -0500
> +++ b/netx/net/sourceforge/jnlp/Launcher.java	Thu Jan 20 12:39:16 2011 -0500
> @@ -329,11 +329,8 @@
>  
>              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) {