/hg/icedtea: Added netx.jar and plugin.jar to bootclasspath to m...

[dbhole at icedtea.classpath.org]

changeset ee7d7790fcc7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ee7d7790fcc7
author: Deepak Bhole <dbhole at redhat.com>
date: Fri Jan 21 12:20:56 2011 -0500

	Added netx.jar and plugin.jar to bootclasspath to make icedtea-web
	work with icedtea

	Updated rhino patch to move classpath update into a separate update-
	bootclasspath patch


diffstat:

4 files changed, 24 insertions(+), 14 deletions(-)
ChangeLog                                  |    9 +++++++++
Makefile.am                                |    3 ++-
patches/icedtea-rhino.patch                |   13 -------------
patches/icedtea-update-bootclasspath.patch |   13 +++++++++++++

diffs (66 lines):

diff -r 93ac4fddecf3 -r ee7d7790fcc7 ChangeLog
--- a/ChangeLog	Fri Dec 10 13:43:00 2010 +0000
+++ b/ChangeLog	Fri Jan 21 12:20:56 2011 -0500
@@ -1,3 +1,12 @@ 2010-12-09  Andrew John Hughes  <ahughes
+2011-01-21  Deepak Bhole <dbhole at redhat.com>
+
+	* Makefile.am
+	(ICEDTEA_PATCHES): Apply the new icedtea-update-bootclasspath patch.
+	* patches/hotspot/default/icedtea-update-bootclasspath.patch: New patch.
+	Adds rhino.jar, netx.jar and plugin.jar to the default boot classpath.
+	* patches/icedtea-rhino.patch: Remove the classpath update hunk, as it has
+	now been moved to icedtea-update-bootclasspath.patch.
+
 2010-12-09  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/hotspot/default/icedtea-gcc-4.3.patch,
diff -r 93ac4fddecf3 -r ee7d7790fcc7 Makefile.am
--- a/Makefile.am	Fri Dec 10 13:43:00 2010 +0000
+++ b/Makefile.am	Fri Jan 21 12:20:56 2011 -0500
@@ -303,7 +303,8 @@ ICEDTEA_PATCHES = \
 	patches/no-precompiled.patch \
 	patches/parisc.patch \
 	patches/sh4-support.patch \
-	patches/jtreg-httpTest.patch
+	patches/jtreg-httpTest.patch \
+	patches/icedtea-update-bootclasspath.patch
 
 # Conditional patches
 
diff -r 93ac4fddecf3 -r ee7d7790fcc7 patches/icedtea-rhino.patch
--- a/patches/icedtea-rhino.patch	Fri Dec 10 13:43:00 2010 +0000
+++ b/patches/icedtea-rhino.patch	Fri Jan 21 12:20:56 2011 -0500
@@ -1,16 +1,3 @@ diff -Nru openjdk.orig/hotspot/src/share
-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
diff -r 93ac4fddecf3 -r ee7d7790fcc7 patches/icedtea-update-bootclasspath.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-update-bootclasspath.patch	Fri Jan 21 12:20:56 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)