Patch to make icedtea-web work with icedtea

[Dr Andrew John Hughes]

On 19:27 Thu 20 Jan     , Deepak Bhole wrote:
> Hi,
> 
> Unlike icedtea6, icedtea currently does not append plugin.jar and
> netx.jar to the default boot classpath.
> 
> Attached patch makes it so that like icedtea6, the bootclasspath update
> is moved to a separate patch which updates for rhino, netx and plugin.
> 
> After applying this patch, icedtea-web works correctly with icedtea.
> 
> Cheers,
> Deepak

Doesn't this need to be conditional on Rhino being installed?

Also please just use patches.  IcedTea7 only supports one HotSpot version.

> diff -r 93ac4fddecf3 Makefile.am
> --- a/Makefile.am	Fri Dec 10 13:43:00 2010 +0000
> +++ b/Makefile.am	Thu Jan 20 19:19:28 2011 -0500
> @@ -303,7 +303,8 @@
>  	patches/no-precompiled.patch \
>  	patches/parisc.patch \
>  	patches/sh4-support.patch \
> -	patches/jtreg-httpTest.patch
> +	patches/jtreg-httpTest.patch \
> +	patches/hotspot/$(HSBUILD)/icedtea-update-bootclasspath.patch
>  
>  # Conditional patches
>  
> diff -r 93ac4fddecf3 patches/hotspot/default/icedtea-update-bootclasspath.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/hotspot/default/icedtea-update-bootclasspath.patch	Thu Jan 20 19:19:28 2011 -0500
> @@ -0,0 +1,13 @@
> +diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp
> +--- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp	2010-09-01 01:23:45.000000000 +0100
> ++++ openjdk/hotspot/src/share/vm/runtime/os.cpp	2010-09-19 17:34:30.859345954 +0100
> +@@ -1032,6 +1032,9 @@
> +         "%/lib/jsse.jar:"
> +         "%/lib/jce.jar:"
> +         "%/lib/charsets.jar:"
> ++        "%/lib/netx.jar:"
> ++        "%/lib/plugin.jar:"
> ++        "%/lib/rhino.jar:"
> + 
> +         // ## TEMPORARY hack to keep the legacy launcher working when
> +         // ## only the boot module is installed (cf. j.l.ClassLoader)
> diff -r 93ac4fddecf3 patches/icedtea-rhino.patch
> --- a/patches/icedtea-rhino.patch	Fri Dec 10 13:43:00 2010 +0000
> +++ b/patches/icedtea-rhino.patch	Thu Jan 20 19:19:28 2011 -0500
> @@ -1,16 +1,3 @@
> -diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp
> ---- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp	2010-08-27 19:15:27.000000000 +0100
> -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp	2010-09-01 18:12:38.850408989 +0100
> -@@ -1033,6 +1033,9 @@
> -         "%/lib/jce.jar:"
> -         "%/lib/charsets.jar:"
> - 
> -+        // IcedTea addition to support Rhino via javax.script
> -+	"%/lib/rhino.jar:"
> -+
> -         // ## TEMPORARY hack to keep the legacy launcher working when
> -         // ## only the boot module is installed (cf. j.l.ClassLoader)
> -         "%/lib/modules/jdk.boot.jar:"
>  diff -Nru openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefile
>  --- openjdk.orig/jdk/make/com/sun/Makefile	2010-07-29 21:55:26.000000000 +0100
>  +++ openjdk/jdk/make/com/sun/Makefile	2010-09-01 18:08:22.164610031 +0100


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8