30 files changed, 6057 insertions, 7680 deletions

diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index 034053061605..c669cc52d1f6 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -1,85 +1,65 @@
-# New ports collection makefile for:	jdk13
-# Date created:				10 October 2000
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+# New ports collection makefile for:	jdk14
+# Date created:				6 March 2003
+# Whom:					Alexey Zelkin <phantom@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
-#		 http://www.eyesbeyond.com/freebsddom/java/jdk13.html
-SRCFILE=	j2sdk-${JDK_VERSION:S/./_/g}-src${EXTRACT_SUFX}
-PATCHSETFILE=	bsd-jdk131-patches-${JDK_PATCHSET_VERSION}.tar.gz
+#		 http://www.eyesbeyond.com/freebsddom/java/jdk14.html
+SRCFILE=	j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
+PATCHSETFILE=	bsd-jdk14-patches-${JDK_PATCHSET_VERSION}.tar.gz
 DISTFILES=	${SRCFILE} ${PATCHSETFILE}
 
-MAINTAINER=	glewis@FreeBSD.org
-COMMENT=	Java Development Kit 1.3
+MAINTAINER=	phantom@FreeBSD.org
+COMMENT=	Java Development Kit 1.4.1
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		zip:${PORTSDIR}/archivers/zip \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
 .if !defined(NATIVE_BOOTSTRAP)
-BUILD_DEPENDS+=	${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk13
-.endif
-.if !defined(WITHOUT_PLUGIN)
-BUILD_DEPENDS+=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	glib12.3:$(PORTSDIR)/devel/glib12 \
-		gtk12.2:$(PORTSDIR)/x11-toolkits/gtk12 \
-		nspr4.1:$(PORTSDIR)/devel/nspr
+BUILD_DEPENDS+=	${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14
 .endif
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
 		${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
 
-.if defined(WITH_JAPANESE_FONTS)
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/TrueType/fonts.dir.kochi:${PORTSDIR}/japanese/kochi-ttfonts
-.endif
-.if defined(WITH_RUSSIAN_FONTS)
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/webfonts/fonts.dir:${PORTSDIR}/x11-fonts/webfonts
-.endif
-.if defined(WITH_CHINESE_FONTS)
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/TrueType/arphic:${PORTSDIR}/chinese/arphicttf
-.endif
-
-WRKSRC=		${WRKDIR}/j2sdk1.3.1/make
+WRKSRC=		${WRKDIR}/control/make
 
-JDK_VERSION=	1.3.1
-JDK_PATCHSET_VERSION=	8
+JDK_VERSION=	1.4.1
+JDK_PATCHSET_VERSION=	3
 
 .if defined(NATIVE_BOOTSTRAP)
-JDK13DIR?=	${LOCALBASE}/jdk${JDK_VERSION}
+JDK14DIR?=	${LOCALBASE}/jdk${JDK_VERSION}
 .else
-JDK13DIR?=	${LOCALBASE}/linux-sun-jdk${JDK_VERSION}
+JDK14DIR?=	${LOCALBASE}/linux-sun-jdk${JDK_VERSION}
 .endif
 
+# workaround to handle both 'zip' and 'tar.gz' distfiles
+USE_ZIP=	YES
+EXTRACT_ONLY=	${SRCFILE}
+
 ONLY_FOR_ARCHS=	i386
-USE_GMAKE=	yes
+USE_GMAKE=	YES
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
-MAKE_ENV=	ALT_BOOTDIR="${JDK13DIR}" \
+MAKE_ENV=	ALT_BOOTDIR="${JDK14DIR}" \
 		ALT_MOTIF_DIR="${X11BASE}" \
-		OPENWINHOME="${X11BASE}" \
 		SYS_CFLAGS="${CFLAGS}" \
+		JAVAWS_OPTIONAL="YES" \
+		NO_DOCS="YES" \
+		LANG="C" \
+		JAVA_HOME="" \
 		CLASSPATH="" \
-		LD_LIBRARY_PATH="" \
-		JAVA_COMPILER=""
-.if !defined(WITHOUT_PLUGIN)
-MAKE_ENV +=	LIBG_HDRS="${LOCALBASE}/include/glib12" \
-		GTK_HDRS="${X11BASE}/include/gtk12" \
-		LIBIDL_HDRS=
-.endif
-.if !defined(WITHOUT_PLUGIN)
-ALL_TARGET=	all plugin images
-.else
-ALL_TARGET=	all images
-.endif
+		LD_LIBRARY_PATH=""
+ALL_TARGET=	all
 PLIST_SUB+=	JDK_VERSION=${JDK_VERSION}
 
-JDKIMAGEDIR=	${WRKSRC}/../build/bsd-i386/jdk-image-i386
-JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-i386/jdk-debug-image-i386
+JDKIMAGEDIR=	${WRKSRC}/../build/bsd-i586/j2sdk-image
+JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-i586/j2sdk-debug-image
 
 SORT?=		/usr/bin/sort
 CPIO?=		/usr/bin/cpio
@@ -91,47 +71,8 @@ PKGNAMESUFFIX=	-nodebug
 PLIST_SUB+=	DEBUG:=""
 .endif
 
-.if defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT)
-PLIST_SUB+=    NATIVE:=""
-MAKE_ARGS+=    HPIS="green native"
-.else
-PLIST_SUB+=    NATIVE:="@comment "
-.endif
-
-.if defined(WITHOUT_PLUGIN)
-PLIST_SUB+=    PLUGIN:="@comment "
-.else
-PLIST_SUB+=    PLUGIN:=""
-.endif
-
-.if defined(WITH_HOTSPOT)
-PLIST_SUB+=    HOTSPOT:=""
-USE_REINPLACE= yes
-.if defined(NODEBUG)
-HOTSPOT_TARGETS=product1 product
-.else
-HOTSPOT_TARGETS=compiler1 compiler2
-.endif
-.else
-PLIST_SUB+=    HOTSPOT:="@comment "
-.endif
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_HOTSPOT) && ${OSVERSION} < 500039
-USE_GCC=	3.2
-BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
-MAKE_ENV+=	ALT_COMPILER_PATH=${LOCALBASE}/bin
-HOTSPOT_BUILD=	../ext/plugin/build/solaris/GNUmakefile \
-	../../hotspot1.3.1/build/linux/makefiles/adlc.make \
-	../../hotspot1.3.1/build/linux/platform_i486
-.endif
-
-.if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500038 )
-BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-TAR=		gtar	# Necessary for proper extraction of sources
-.endif
-
 # Check for JDK sources
 .if !exists(${DISTDIR}/${SRCFILE}) && !defined(PACKAGE_BUILDING)
 ECHO_MSG=/usr/bin/printf
@@ -153,56 +94,24 @@ IGNORE= :\n\
 The source distribution exists on your system, but due to\n\
 licensing restrictions you still need to download the\n\
 patchset, ${PATCHSETFILE}, from\n\
-http://www.eyesbeyond.com/freebsddom/java/jdk13.html.\n\
+http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\
 Please place the patchset in ${DISTDIR}.\n
 .endif
 
-# HotSpot and/or native threads require a recent version of FreeBSD
-.if ( defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT) ) && ( ${OSVERSION} < 470101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500043 ) )
+# JDK 1.4.1 require recent version of FreeBSD due to recent libc_r updates.
+# These checks are not prefect but it's better than nothing.
+.if (${OSVERSION} < 470101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500043 ))
 ECHO_MSG=/usr/bin/printf
 IGNORE= :\n\
 You must have a version of FreeBSD later than 4.7-STABLE February 2003\n\
-or 5-CURRENT February 2003 to use either native threads or HotSpot.\n
-.endif
-
-# Warn user about HotSpot build
-.if defined(WITH_HOTSPOT)
-pre-everything:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You have set WITH_HOTSPOT to enable the build of the HotSpot VM."
-	@${ECHO_MSG} "Please note that HotSpot development is still experimental and is"
-	@${ECHO_MSG} "not suitable for use in a production environment."
-	@${ECHO_MSG} "To use the browser plugin with HotSpot you will need to set the"
-	@${ECHO_MSG} "THREADS_FLAG environment variable when running the browser, e.g."
-	@${ECHO_MSG} "    setenv THREADS_FLAG native"
-	@${ECHO_MSG} "Compiling HotSpot into the JDK will also currently make the"
-	@${ECHO_MSG} "Classic VM unusable."
-	@${ECHO_MSG} ""
+or 5-CURRENT February 2003 to compile and use JDK 1.4.1.\n
 .endif
 
 pre-patch:
 	@cd ${WRKDIR} &&  \
+		${GZIP_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
 		${CHMOD} -R u+w * && \
-		${MKDIR} j2sdk1.3.1/ext/plugin/oji-plugin/include/bsd/jdk12 && \
-		${MKDIR} j2sdk1.3.1/ext/plugin/oji-plugin/include/solaris/navig5/private && \
-		${MKDIR} j2sdk1.3.1/src/bsd/doc/man && \
-		${MKDIR} hotspot1.3.1/build/bsd && \
-		${MKDIR} hotspot1.3.1/build/bsd/makefiles && \
-		${MKDIR} hotspot1.3.1/build/bsd/package && \
-		${MKDIR} hotspot1.3.1/src/os/bsd/launcher && \
-		${MKDIR} hotspot1.3.1/src/os/bsd/vm && \
-		${MKDIR} hotspot1.3.1/src/os_cpu/bsd_i486/vm && \
-			${PATCH} < ${WRKDIR}/jdk131.patches
-
-post-patch:
-.if defined(WITH_HOTSPOT)
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-	@for file in ${HOTSPOT_BUILD}; do \
-        	${REINPLACE_CMD} -e "s:gcc:gcc32:g ; s:g\+\+:g\+\+32:g" ${WRKSRC}/$${file}; \
-	done
-	@${REINPLACE_CMD} -e "s:PATH[)]gcc:PATH)gcc32:g ; s:PATH[)]g\+\+:PATH)g\+\+32:g" ${WRKSRC}/common/Defs-bsd.gmk 
-.endif
-.endif
+		${PATCH} -p0 < ${WRKDIR}/jdk14.patches
 
 .if !defined(NATIVE_BOOTSTRAP)
 pre-build:
@@ -229,35 +138,10 @@ pre-build:
 do-build:
 	# Start of jdk build
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-.if defined(WITH_HOTSPOT)
-	# Start of HotSpot build
-	@(cd ${WRKDIR}/hotspot1.3.1/build/linux ;  \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${HOTSPOT_TARGETS})
-.endif
 
 post-build:
-.if defined(WITH_HOTSPOT)
-	# Copy HotSpot VM to image dir
-	${MKDIR} ${JDKIMAGEDIR}/jre/lib/i386/client
-	${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler1/product/libjvm.so ${JDKIMAGEDIR}/jre/lib/i386/client/
-	${INSTALL_DATA} ${WRKDIR}/hotspot1.3.1/src/share/vm/Xusage.txt ${JDKIMAGEDIR}/jre/lib/i386/client/
-	${MKDIR} ${JDKIMAGEDIR}/jre/lib/i386/server
-	${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler2/product/libjvm.so ${JDKIMAGEDIR}/jre/lib/i386/server/
-	${INSTALL_DATA} ${WRKDIR}/hotspot1.3.1/src/share/vm/Xusage.txt ${JDKIMAGEDIR}/jre/lib/i386/server/
-	@(cd ${JDKIMAGEDIR}/jre/lib/i386; ${LN} -sf client hotspot)
-.if !defined(NODEBUG)
-	# Copy debug version of HotSpot VM to image dir
-	${MKDIR} ${JDKIMAGEDIR_G}/jre/lib/i386/client
-	${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler1/jvmg/libjvm_g.so ${JDKIMAGEDIR_G}/jre/lib/i386/client/
-	${MKDIR} ${JDKIMAGEDIR_G}/jre/lib/i386/server
-	${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler2/jvmg/libjvm_g.so ${JDKIMAGEDIR_G}/jre/lib/i386/server/
-.endif
-.endif
-	# Prune empty dirs
-	${FIND} ${JDKIMAGEDIR} -type d | ${SORT} -r | \
-		${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
-	${FIND} ${JDKIMAGEDIR_G} -type d | ${SORT} -r | \
-		${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
+	@# This file serves no purpose (in case of port)
+	@${RM} -f ${JDKIMAGEDIR}/src.zip
 
 .if !defined(NODEBUG)
 pre-install:
@@ -275,21 +159,8 @@ do-install:
 	cd ${JDKIMAGEDIR_G} && ${FIND} . \
 	  | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .endif
-	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}/jre/lib/ext
 
 post-install:
 	@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
-.if !defined(WITHOUT_PLUGIN)
-	@${ECHO_MSG}
-	@${ECHO_MSG} To use the Java plugin with Mozilla you must create a
-	@${ECHO_MSG} symbolic link from
-	@${ECHO_MSG}
-	@${ECHO_MSG} ${PREFIX}/jdk${JDK_VERSION}/jre/plugin/i386/ns600/libjavaplugin_oji.so
-	@${ECHO_MSG}
-	@${ECHO_MSG} to your Mozilla plugins directory, which is usually found at
-	@${ECHO_MSG}
-	@${ECHO_MSG} ${X11BASE}/lib/mozilla/plugins
-	@${ECHO_MSG}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/java/jdk14/distinfo b/java/jdk14/distinfo
index d9abbb0878ff..a75cd7da49b3 100644
--- a/java/jdk14/distinfo
+++ b/java/jdk14/distinfo
@@ -1,2 +1,2 @@
-MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
-MD5 (bsd-jdk131-patches-8.tar.gz) = 1fd14cea9ce15e9a7e5ee2f60f50dd01
+MD5 (j2sdk-1_4_1-src-scsl.zip) = e6f35d1183660682f4f03965d35b67c5
+MD5 (bsd-jdk14-patches-3.tar.gz) = aca8e42e71a0b7a7b779c7f2bea47f62
diff --git a/java/jdk14/files/patch-InetAddressImpl.c b/java/jdk14/files/patch-InetAddressImpl.c
deleted file mode 100644
index ddb4f8045b81..000000000000
--- a/java/jdk14/files/patch-InetAddressImpl.c
+++ /dev/null
@@ -1,114 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/native/java/net/InetAddressImpl.c	25 Jan 2003 23:22:26 -0000	1.7
-+++ ../src/solaris/native/java/net/InetAddressImpl.c	28 Feb 2003 09:34:18 -0000
-@@ -25,6 +25,7 @@
- 
- #include "java_net_InetAddressImpl.h"
- 
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- /* reentrant BIND includes --billh */
- 
- #include <sys/param.h>
-@@ -33,14 +34,16 @@
- 
- /* forward declarations --billh */
- 
-+static
- HOST_R_RETURN
--gethostbyname_r(const char *name,  struct hostent *hptr,
--		HOST_R_ARGS);
-+__j_gethostbyname_r(const char *name,  struct hostent *hptr,
-+		    HOST_R_ARGS);
- 
-+static
- HOST_R_RETURN
--gethostbyaddr_r(const char *addr, int len, int type,
--		struct hostent *hptr,
--		HOST_R_ARGS);
-+__j_gethostbyaddr_r(const char *addr, int len, int type,
-+		    struct hostent *hptr, HOST_R_ARGS);
-+#endif
- 
- /*
- */
-@@ -99,6 +102,8 @@
- 
- #ifdef __GLIBC__
- 	gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+	hp = __j_gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #else
- 	hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #endif
-@@ -106,6 +111,9 @@
- #ifdef __GLIBC__
- 	    gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
- 			    &res2, buf2, sizeof(buf2), &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+	    hp = __j_gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
-+				     &res2, buf2, sizeof(buf2), &h_error);
- #else
- 	    hp = gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
- 				 &res2, buf2, sizeof(buf2), &h_error);
-@@ -189,6 +197,8 @@
-     /* Try once, with our static buffer. */
- #ifdef __GLIBC__
-     gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+    hp = __j_gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #else    
-     hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #endif
-@@ -203,6 +213,9 @@
- #ifdef __GLIBC__
- 	    gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
- 			    &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+	    hp = __j_gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
-+				     &h_error);
- #else
- 	    hp = gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
- 				 &h_error);
-@@ -283,6 +296,9 @@
- #ifdef __GLIBC__
-     gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
- 		    buf, sizeof(buf), &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+    hp = __j_gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
-+			     buf, sizeof(buf), &h_error);
- #else
-     hp = gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
- 			 buf, sizeof(buf), &h_error);
-@@ -297,6 +313,9 @@
- #ifdef __GLIBC__
- 	    gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
- 			    &hent, tmp, BIG_HENT_BUF_SIZE, &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+	    hp = __j_gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
-+				     &hent, tmp, BIG_HENT_BUF_SIZE, &h_error);
- #else
- 	    hp = gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
- 				 &hent, tmp, BIG_HENT_BUF_SIZE, &h_error);
-@@ -335,8 +354,9 @@
- static HOST_R_RETURN 
- copy_hostent(struct hostent *, struct hostent *, HOST_R_COPY_ARGS);
- 
-+static
- HOST_R_RETURN
--gethostbyname_r(const char *name,  struct hostent *hptr, HOST_R_ARGS) {
-+__j_gethostbyname_r(const char *name,  struct hostent *hptr, HOST_R_ARGS) {
- 	struct hostent *he = gethostbyname(name);
- 
- 	HOST_R_ERRNO;
-@@ -347,8 +367,9 @@
- 	return (copy_hostent(he, hptr, HOST_R_COPY));
- }
- 
-+static
- HOST_R_RETURN
--gethostbyaddr_r(const char *addr, int len, int type,
-+__j_gethostbyaddr_r(const char *addr, int len, int type,
- 		struct hostent *hptr, HOST_R_ARGS) {
- 	struct hostent *he = gethostbyaddr(addr, len, type);
- 
diff --git a/java/jdk14/files/patch-common::Defs-bsd.gmk b/java/jdk14/files/patch-common::Defs-bsd.gmk
index d0c78fad9baf..fbeca94149d8 100644
--- a/java/jdk14/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk14/files/patch-common::Defs-bsd.gmk
@@ -1,27 +1,11 @@
-
-$FreeBSD$
-
---- common/Defs-bsd.gmk.orig	Mon Sep 10 17:02:16 2001
-+++ common/Defs-bsd.gmk	Mon Sep 10 17:02:42 2001
-@@ -128,7 +128,7 @@
- ifeq ($(TRUE_PLATFORM), NetBSD)
- DEVTOOLS_PATH = /usr/pkg/bin/
- else
+--- ../../j2se/make/common/Defs-bsd.gmk.orig	Fri Mar  7 01:38:41 2003
++++ ../../j2se/make/common/Defs-bsd.gmk	Fri Mar  7 01:38:01 2003
+@@ -155,7 +155,7 @@
+ 
+ # DEVTOOLS_PATH is for other tools required for building (such as
+ # zip, etc.)
 -DEVTOOLS_PATH = /usr/local/bin/
-+DEVTOOLS_PATH = $(LOCALBASE)/bin/
- endif
++DEVTOOLS_PATH = ${LOCALBASE}/bin/
  # Allow the user to override the default value...
  ifdef ALT_DEVTOOLS_PATH
-@@ -221,10 +221,10 @@
- else # ARCH
- CFLAGS_COMMON   = $(GCC_WARNINGS)
- endif # ARCH
--CFLAGS_OPT      = $(POPT)
-+CFLAGS_OPT      = $(POPT) $(SYS_CFLAGS)
- CFLAGS_DBG      = -g3
- CXXFLAGS_COMMON = $(GCC_WARNINGS)
--CXXFLAGS_OPT	= $(POPT)
-+CXXFLAGS_OPT	= $(POPT) $(SYS_CFLAGS)
- CXXFLAGS_DBG	= -g3
- 
- CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \
+ DEVTOOLS_PATH = $(subst //,/,$(ALT_DEVTOOLS_PATH)/)
diff --git a/java/jdk14/files/patch-platform_i486 b/java/jdk14/files/patch-platform_i486
deleted file mode 100644
index 176fe9a69716..000000000000
--- a/java/jdk14/files/patch-platform_i486
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/build/linux/platform_i486	Thu Jan 23 00:28:52 2003
-+++ ../../hotspot1.3.1/build/linux/platform_i486	Thu Jan 23 01:14:01 2003
-@@ -6,7 +6,7 @@
- 
- lib_arch = i386
- 
--compiler = gcc32
-+compiler = gcc
- 
- gnu_dis_arch = i386
- 
diff --git a/java/jdk14/files/patch-threads_bsd.c b/java/jdk14/files/patch-threads_bsd.c
deleted file mode 100644
index 0549832f1833..000000000000
--- a/java/jdk14/files/patch-threads_bsd.c
+++ /dev/null
@@ -1,726 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/hpi/native_threads/src/threads_bsd.c	7 Feb 2002 05:19:54 -0000	1.12
-+++ ../src/solaris/hpi/native_threads/src/threads_bsd.c	25 Feb 2003 16:31:54 -0000
-@@ -22,32 +22,23 @@
- #include "np.h"
- 
- #include <pthread.h>
-+#include <pthread_np.h>
- 
- #if defined(__FreeBSD__)
- 
--#include <pthread_np.h>
-+#include <assert.h>
- 
--/* Remove defines from pthread.h so pthread_private.h can be included */
--#undef pthread_condattr_default
--#undef pthread_mutexattr_default
- #undef pthread_attr_default
-+#undef pthread_mutexattr_default
-+#undef pthread_condattr_default
- #include "pthread_private.h"
- 
--#include <assert.h>
--#include <ucontext.h>
--#include <machine/ucontext.h>
--
--#include <sys/exec.h>
--#include <vm/vm.h>
--#include <vm/pmap.h>
--#include <machine/pmap.h>
--#include <machine/vmparam.h>
--
- #endif
- 
- #include <string.h>
- #include <signal.h>
- #include <sys/signal.h>
-+#include <sys/time.h>
- #include <sys/resource.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -63,14 +54,9 @@
- /* Private functions used to implement native threading. --billh */
- 
- #ifdef DEBUG_BSD_NATIVE_THREADS
--void _pthread_suspend_all_np(void);
--void _pthread_resume_all_np(void);
--#endif
--void record_uc(sys_thread_t *, ucontext_t *);
--void record_gc_registers_of(sys_thread_t *);
--
--void dumpThreadStates();
- void dumpThreadLogStates(pthread_t);
-+void dumpThreadStates();
-+#endif
- 
- /*
-  * Suspend a thread.  Used to implement java.lang.Thread.suspend(),
-@@ -108,28 +94,24 @@
- int
- np_stackinfo(void **addr, long *sizep)
- {
--    thread_t self = pthread_self();
--    int base;
--    int size;
--
--    if (!pthread_equal(self, _thread_initial)) {
--        *addr = self->stack;
--	*sizep = (long) PTHREAD_STACK_DEFAULT;
--
--    } else {
--	/* in main()'s thread */
--	struct rlimit r;
--
--	if (getrlimit(RLIMIT_STACK, &r) == -1)
--	    return SYS_ERR;
--
--	/* PS_STRINGS is also from sys/exec.h in FreeBSD, but as macro. --billh */
--
--	*addr  = (void *) (PS_STRINGS +1);
--	*sizep = (long)r.rlim_cur;
--    }
-+    pthread_attr_t attr;
-+    size_t size;
- 
-+    if ((errno = pthread_attr_init(&attr)))
-+	return SYS_ERR;
-+    if ((errno = pthread_attr_get_np(pthread_self(), &attr)))
-+	goto err;
-+    if ((errno = pthread_attr_getstackaddr(&attr, addr)))
-+	goto err;
-+    if ((errno = pthread_attr_getstacksize(&attr, &size)))
-+	goto err;
-+    *sizep = size;
-+    pthread_attr_destroy(&attr);
-     return SYS_OK;
-+
-+err:
-+    pthread_attr_destroy(&attr);
-+    return SYS_ERR;
- }
- 
- /*
-@@ -177,7 +159,7 @@
- 	Do this for the FreeBSD implementation too, since this is a silly
- 	function anyways.  --billh
- */
--	return TRUE;
-+    return TRUE;
- }
- 
- 
-@@ -190,38 +172,54 @@
- static void
- record_thread_regs()
- {
--    sys_thread_t *tid;
-+    struct pthread *self = pthread_self();
-+    sys_thread_t *tid = ThreadQueue;
-     int i;
--    int sp;
- 
--    tid = ThreadQueue;
--    for (i = 0; i < ActiveThreadCount && tid != 0; i++) {
--	int i;
--
--	if (tid->sys_thread != 0) {
--#ifdef __bsdi__
--	    /* if thread has already been initialized */
--	    if (pthread_getstackpointer_np(tid->sys_thread, &sp) == 0)
--		tid->sp = sp;
--	    else
--		tid->sp = 0;
--#elif __FreeBSD__
--#endif
--            tid->sp = tid->sys_thread->stack;
--//#endif	//__FreeBSD__
--/*	Potential race here if the stack isn't setup before GC. --billh */
--	} else {
-+    for (i = 0; i < ActiveThreadCount && tid != NULL; i++, tid = tid->next) {
-+	struct pthread *thread = tid->sys_thread;
-+
-+	if (thread == 0) {
- 	    /*
- 	     * thread is still in the process of being initalized.
- 	     * So GC should not care about this thread. Just
- 	     * set its sp to 0, and this will force GC to ignore it.
- 	     */
- 	    tid->sp = 0;
-+	    continue;
- 	}
- 
--	record_gc_registers_of(tid);
-+        tid->sp = thread->stack;
-+/*	Potential race here if the stack isn't setup before GC. --billh */
- 
--	tid = tid->next;
-+	/*
-+	 * The thread that calls this function will alway be the JVM GC thread,
-+	 * so skip over it in the list of threads.
-+	 */
-+	if (thread != self && (thread->flags & PTHREAD_FLAGS_PRIVATE) == 0) {
-+	    register_t *regbase;
-+
-+#ifdef DEBUG_BSD_NATIVE_THREADS
-+	    /*
-+	     * Got search candidate..
-+	     */
-+	    if (thread->state != PS_SUSPENDED)
-+		dumpThreadLogStates(thread);
-+#endif
-+
-+	    regbase = (register_t*) &thread->ctx.jb[0];
-+	    tid->regs[0] = regbase[6];	/* eax */
-+	    tid->regs[1] = 0;		/* ecx (missing) */
-+	    tid->regs[2] = 0;		/* edx (missing) */
-+	    tid->regs[3] = regbase[1];	/* ebx */
-+	    tid->regs[4] = regbase[3];	/* ebp */
-+	    tid->regs[5] = regbase[4];	/* esi */
-+	    tid->regs[6] = regbase[5];	/* edi */
-+
-+#ifdef DEBUG_BSD_NATIVE_THREADS
-+	    dumpThreadStates();
-+#endif
-+	}
-     }
- 
- #ifdef DEBUG_BSD_NATIVE_THREADS
-@@ -239,14 +237,7 @@
- {
-     sysAssert(SYS_QUEUE_LOCKED(sysThreadSelf()));
- 
--#ifdef DEBUG_BSD_NATIVE_THREADS
--    _pthread_suspend_all_np();
--#else
--    pthread_single_np();
--#endif
--
--//usleep(100000 *3);
--
-+    pthread_suspend_all_np();
-     record_thread_regs();
-     return SYS_OK;
- }
-@@ -259,42 +250,13 @@
- np_multi(void)
- {
-     sysAssert(SYS_QUEUE_LOCKED(sysThreadSelf()));
--#ifdef DEBUG_BSD_NATIVE_THREADS
--    _pthread_resume_all_np();
--#else
--    pthread_multi_np();
--#endif
-+    pthread_resume_all_np();
- }
- 
--
--
--
-+#ifdef DEBUG_BSD_NATIVE_THREADS
- /* pthreads hackery begins --billh */
- 
--#define ANALRETENTIVE (6 + 1)
--
--char SuspendList[ANALRETENTIVE][16] = 
--{
--	"SUSP_NO",		/* Not suspended. */
--	"SUSP_YES",		/* Suspended. */
--	"SUSP_JOIN",		/* Suspended, joining. */  
--	"SUSP_NOWAIT",		/* Suspended, was in a mutex or condition queue. */
--	"SUSP_MUTEX_WAIT",	/* Suspended, still in a mutex queue. */
--	"SUSP_COND_WAIT",	/* Suspended, still in a condition queue. */
--	"susp boundless"
--};
--
--char *getSuspendStateString(enum pthread_susp suspendState)
--{
--	if (suspendState < ANALRETENTIVE)
--		return &SuspendList[suspendState][0];
--	else 
--		return &SuspendList[ANALRETENTIVE-1][0];
--}
--
--#define SATAN (21 + 1) /* for the error string at the end of the list */
--
--char SignalList [SATAN][16]
-+char SignalList [][16]
- =
- {
- 	"PS_RUNNING",
-@@ -316,18 +278,17 @@
- 	"PS_JOIN",
- 	"PS_SUSPENDED",
- 	"PS_DEAD",
--	"PS_DEADLCK",
-+	"PS_DEADLOCK",
- 	"PS_STATE_MAX",
--	"PS_REQUEST_WAITING_SUSPENDED",
- 	"boundless"
- };
- 
- char *getThreadStateString(enum pthread_state threadState)
- {
- 	if (threadState < SATAN)
--		return &SignalList[threadState][0];
--	else 
--		return &SignalList[SATAN-1][0];
-+		return SignalList[threadState];
-+	else
-+		return SignalList[SATAN-1];
- }
- 
- void dumpThreadStates()
-@@ -336,114 +297,29 @@
- 	struct pthread	*thread;
- 	struct pthread	*self = pthread_self();
- 
--#ifdef DEBUG_BSD_NATIVE_THREADS
- 	_thread_kern_sig_defer();
- 	TAILQ_FOREACH(thread, &_thread_list, tle) {
- 		if (thread != self) { /* special case this --billh */
--			printf("\tthread %d\t%s\t%s\n",
-+			printf("\tthread %d\t%s\n",
- 				threadCount,
--				getThreadStateString(thread->state),
--				getSuspendStateString(thread->suspended));
-+				getThreadStateString(thread->state));
- 
- 			if (thread->state != PS_SUSPENDED)
- 				dumpThreadLogStates(thread);
--		}
--		else
--		{
--			printf("\tgc thread %d\t%s\t%s\n",
-+		} else {
-+			printf("\tgc thread %d\t%s\n",
- 				threadCount,
--				getThreadStateString(thread->state),
--				getSuspendStateString(thread->suspended));
-+				getThreadStateString(thread->state))
- 		}
- 		++threadCount;
- 	}
- 	_thread_kern_sig_undefer();
- 	printf("\n");
--#endif
--}
--
--
--#ifdef DEBUG_BSD_NATIVE_THREADS
--extern void _pthread_suspend_np_by_pthread_common(pthread_t);
--extern void _pthread_resume_by_pthread_common(pthread_t, enum pthread_susp);
--
--void
--_pthread_suspend_all_np(void)
--{
--	struct pthread	*thread;
--	struct pthread	*self = pthread_self();
--
--fprintf(stderr, "pthread_suspend_all_np\n");
--	/*
--	 * Defer signals to protect the scheduling queues from
--	 * access by the signal handler:
--	 */
--	_thread_kern_sig_defer();
--
--	/* Suspend all threads other than the current thread: */
--	TAILQ_FOREACH(thread, &_thread_list, tle) {
--		if (thread != self) {
--			_pthread_suspend_np_by_pthread_common(thread);
--		}
--	}
--
--	/*
--	 * Undefer and handle pending signals, yielding if necessary:
--	 */
--	_thread_kern_sig_undefer();
--fprintf(stderr, "pthread_suspend_all_np END\n");
--}
--
--/* Resume a thread: */
--void
--_pthread_resume_all_np(void)
--{
--	enum		pthread_susp old_suspended;
--	struct pthread	*thread;
--	struct pthread	*self = pthread_self();
--
--fprintf(stderr, "pthread_resume_all_np\n");
--	_thread_kern_sig_defer();
--
--	/*
--		Iterate through the thread list and resume suspended threads.
--		this is copied from pthread_resume_np(). --billh
--	*/
--
--	TAILQ_FOREACH(thread, &_thread_list, tle) {
--		if (thread != self) {
--			/* Cancel any pending suspensions: */
--
--			old_suspended = thread->suspended;
--			thread->suspended = SUSP_NO;
--
--			_pthread_resume_by_pthread_common(thread, old_suspended);
--
--		} // if !thread_self
--	} // TAILQ_FOREACH
--
--	/*
--	 * Undefer and handle pending signals, yielding if
--	 * necessary:
--	 */
--	_thread_kern_sig_undefer();
--fprintf(stderr, "pthread_resume_all_np END\n");
- }
--#endif
- 
- /*
- 	[A snippet from Dan Eichen's email on the subject]
- 
--	It uses _longjmp (non-signal-saving/restoring) for the most part.
--	The only exception is when the process (currently running thread) is 
--	interrupted by a signal.  So your context types are a jmp_buf and
--	a ucontext_t (if interrupted by a signal).  If thread->ctxtype is
--	CTX_UC, the context is stored as a ucontext in thread->ctx.uc.
--	Otherwise, the context is stored as a jmp_buf in thread->ctx.jb.
--	We don't currently use CTX_JB and CTX_SJB, so don't even bother
--	with those cases.  Those should go away actually; all we need
--	to know is if it is a ucontext_t or a jmp_buf.
--
- 	You can also look at src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c.
- 	It knows how to iterate through all the threads and pull out
- 	(and even set) thread contexts.
-@@ -462,19 +338,8 @@
- 	--billh
- */
- 
--void clear_gc_registers(sys_thread_t * jthread)
--{
--/* clear out x86 registers for the thread's "self" --billh */
--
--	jthread->regs[0] = 0; jthread->regs[1] = 0;
--	jthread->regs[2] = 0; jthread->regs[3] = 0;
--	jthread->regs[4] = 0; jthread->regs[5] = 0;
--	jthread->regs[6] = 0;
--}
--
- void dumpThreadLogStates(pthread_t thread)
- {
--#ifdef DEBUG_BSD_NATIVE_THREADS
- int i;
- 	for(i=0; i < STATE_LOG_SIZE; ++i)
- 	{
-@@ -494,311 +359,5 @@
- 		}
- 	}
- 	printf("\t\t***XXX\n");
--#endif
--}
--
--void record_gc_registers_of(sys_thread_t *javaThread)
--{
--struct pthread	*self	= pthread_self();
--struct pthread	*thread	= NULL;
--
--	assert( javaThread != NULL );
--	assert( javaThread->sys_thread != NULL );
--
--	thread = javaThread->sys_thread;
--
--	/*
--	 * The thread that calls this function will alway be the JVM GC thread,
--	 * so skip over it in the list of threads.
--	 */
--	if (	(thread == self)
--		|| ((thread->flags & PTHREAD_FLAGS_PRIVATE) != 1)
--	   )
--	{
--		record_uc(javaThread, &thread->ctx.uc);
--#ifdef DEBUG_BSD_NATIVE_THREADS
--		goto Terminate; // And do nothing with this pthread entry. 
--#endif
--	}
--
--	/*
--	 * Got search candiate..
--	 */
--	if (thread->state != PS_SUSPENDED)
--		dumpThreadLogStates(thread);
--
--	switch ((int)thread->ctxtype)
--	{
--		case CTX_JB_NOSIG:	/* 0) jmp_buf context without signal mask for blocking IO, etc... */
--		case CTX_JB:		/* 1) should never be CTX_JB */
--		case CTX_SJB:		/* 2) should never be CTX_SJB */
--			clear_gc_registers(javaThread);
--#ifdef DEBUG_BSD_NATIVE_THREADS
--			goto Terminate;
--#endif
--			break;
--		case CTX_UC:		/* 3) */
--			/* context is a ucontext_t */
--			record_uc(javaThread, &thread->ctx.uc);
--#ifdef DEBUG_BSD_NATIVE_THREADS
--			goto Terminate;
--#endif
--			break;
--		default:
--#ifdef DEBUG_BSD_NATIVE_THREADS
--			fprintf(stderr, "ctxtype failed %d.\n", thread->ctxtype);
--			goto TermFailed;
--#endif
--			break;
--	}
--
--#ifdef DEBUG_BSD_NATIVE_THREADS
--TermFailed:
--	fprintf(stderr, "Failed to find pthread struct.\n"); fflush(stderr);
--	assert(0);
--
--Terminate:
--	dumpThreadStates();
--#endif
- }
--
--void record_uc(sys_thread_t *t, ucontext_t *uc)
--{
--	mcontext_t *mc = &(uc->uc_mcontext);
--
--	t->regs[0] = mc->mc_eax;
--	t->regs[1] = mc->mc_ecx;
--	t->regs[2] = mc->mc_edx;
--	t->regs[3] = mc->mc_ebx;
--	t->regs[4] = mc->mc_ebp;
--	t->regs[5] = mc->mc_esi;
--	t->regs[6] = mc->mc_edi;
--}
--
--/*
--From /usr/src/lib/libc/i386/gen/_setjmp.S:
--ENTRY(_setjmp)
--	movl	4(%esp),%eax
--	movl	0(%esp),%edx
--	movl	%edx, 0(%eax)	/ * rta * /
--	movl	%ebx, 4(%eax)
--	movl	%esp, 8(%eax)
--	movl	%ebp,12(%eax)
--	movl	%esi,16(%eax)
--	movl	%edi,20(%eax)
--	fnstcw	24(%eax)
--	xorl	%eax,%eax
--	ret
--
--typedef JmpBufStruct
--{
--	int	edx, // Accumulator for operands and results data.
--		ebx, // Pointer to data in the DS segment.
--		esp, // Stack pointer (in the SS segment).
--		ebp, // Pointer to data on the stack (in the SS segment).
--		esi, // Pointer to data in the segment pointer to by the DS register; source pointer for string operations.
--		edi; // Pointer to data (or destination) in the segment pointer to by the ES register; destination pointer for string operations.
--
--} JmpBufStruct;
--
--
--void record_jb(sys_thread_t *t, JmpBufStruct *jb)
--{
--	t->regs[0] = jb->eax; // What about these two register ? they seem missing in jmp_buf.
--	t->regs[1] = / *jb->ecx;* / 0;
--	t->regs[2] = jb->edx; // The rest of these registers are defined...
--	t->regs[3] = jb->ebx;
--	t->regs[4] = jb->ebp;
--	t->regs[5] = jb->esi;
--	t->regs[6] = jb->edi;
--}
--*/
--
--#if 0
--static void
--finish_suspension(void *arg)
--{
--	if (_thread_run->suspended != SUSP_NO)
--		_thread_kern_sched_state(PS_SUSPENDED, __FILE__, __LINE__);
--}
--
--void _pthread_suspend_np_by_pthread_common(pthread_t thread)
--{
--struct timeval  tv;
--struct timespec current_ts;
--
--	switch (thread->state) {
--	case PS_RUNNING:
--		/*
--		 * Remove the thread from the priority queue and
--		 * set the state to suspended:
--		 */
--		PTHREAD_PRIOQ_REMOVE(thread);
--		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
--		break;
--
--	case PS_SPINBLOCK:
--	case PS_FDR_WAIT:
--	case PS_FDW_WAIT:
--	case PS_POLL_WAIT:
--	case PS_SELECT_WAIT:
--		/*
--		 * Remove these threads from the work queue
--		 * and mark the operation as interrupted:
--		 */
--		if ((thread->flags & PTHREAD_FLAGS_IN_WORKQ) != 0)
--			PTHREAD_WORKQ_REMOVE(thread);
--		_thread_seterrno(thread,EINTR);
--
--		/* FALLTHROUGH */
--	case PS_SLEEP_WAIT:
--		thread->interrupted = 1;
--
--		/* FALLTHROUGH */
--	case PS_SIGTHREAD:
--	case PS_WAIT_WAIT:
--	case PS_SIGSUSPEND:
--	case PS_SIGWAIT:
--		/*
--		 * Remove these threads from the waiting queue and
--		 * set their state to suspended:
--		 */
--		PTHREAD_WAITQ_REMOVE(thread);
--		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
--		break;
--
--	case PS_MUTEX_WAIT:
--		/* Mark the thread as suspended and still in a queue. */
--		thread->suspended = SUSP_MUTEX_WAIT;
--
--		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
--		break;
--	case PS_COND_WAIT:
--#if 0
--		/* This is for a pthreads_cond_timedwait() --billh */
--		if (thread->wakeup_time.tv_sec != -1) {
--			/* (1) Use to restore the waiting-queue time that's left when the
--			 * thread is resumed. --billh
--			 */
--			_subtract_timespec3(thread, &current_ts, &thread->remaining_wakeup_time);
--
--			/* (2) So that it's inserted at the end of the waiting queue and
--			 * not scanned by the uthreads_kern.c waiting queue logic. It also
--			 * means to make it wait forever.
--			 */
--			thread->wakeup_time.tv_sec  = -1;
--			thread->wakeup_time.tv_nsec = -1;
--
--			/* (3) Remove and reinsert it at the end of waiting-queue
--			 * (automatic on the insertion attempt when (2)).
--			 */
--			PTHREAD_WORKQ_REMOVE(thread);
--			PTHREAD_WORKQ_INSERT(thread);
--		}
--#endif
--
--		/* Mark the thread as suspended and still in a queue. */
--		thread->suspended = SUSP_COND_WAIT;
--
--		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
--		break;
--	case PS_JOIN:
--		/* Mark the thread as suspended and joining: */
--		thread->suspended = SUSP_JOIN;
--
--		PTHREAD_NEW_STATE(thread, PS_SUSPENDED);
--		break;
--	case PS_FDLR_WAIT:
--	case PS_FDLW_WAIT:
--	case PS_FILE_WAIT:
--		/* Mark the thread as suspended: */
--		thread->suspended = SUSP_YES;
--
--		/*
--		 * Threads in these states may be in queues.
--		 * In order to preserve queue integrity, the
--		 * cancelled thread must remove itself from the
--		 * queue.  Mark the thread as interrupted and
--		 * set the state to running.  When the thread
--		 * resumes, it will remove itself from the queue
--		 * and call the suspension completion routine.
--		 */
--		thread->interrupted = 1;
--		_thread_seterrno(thread, EINTR);
--		PTHREAD_NEW_STATE(thread, PS_RUNNING);
--		thread->continuation = finish_suspension;
--		break;
--
--	case PS_DEAD:
--	case PS_DEADLOCK:
--	case PS_STATE_MAX:
--	case PS_SUSPENDED:
--		/* Nothing needs to be done: */
--		break;
--	}
--}
--
--void _pthread_resume_by_pthread_common(pthread_t thread, enum pthread_susp old_suspended)
--{
--struct timeval  tv;
--struct timespec current_ts,
--		remaining_spec;
--
--	/* Is it currently suspended? */
--	if (thread->state == PS_SUSPENDED) {
--		/*
--		 * Defer signals to protect the scheduling queues
--		 * from access by the signal handler:
--		 */
--		_thread_kern_sig_defer();
--
--		switch (old_suspended) {
--		case SUSP_MUTEX_WAIT:
--			/* Set the thread's state back. */
--			PTHREAD_SET_STATE(thread,PS_MUTEX_WAIT);
--			break;
--		case SUSP_COND_WAIT:
--			/* For cases where it was doing a pthread_cond_timedwait()
--			 * Mark the remaining suspend time.
--			 * --billh
--			 */
--#if 0
--			if (thread->remaining_wakeup_time.tv_sec != -1) {
--				GET_CURRENT_TOD(tv);
--				TIMEVAL_TO_TIMESPEC(&tv, &current_ts);
--
--				_subtract_timespec3(remaining_spec, &thread->wakeup_time, &current_ts);
--				_thread_kern_set_timeout_by_pthread_timespec(thread, &remaining_spec);
--			}
--#endif
--
--			/* Set the thread's state back. */
--			PTHREAD_SET_STATE(thread,PS_COND_WAIT);
--			break;
--		case SUSP_JOIN:
--			/* Set the thread's state back. */
--			PTHREAD_SET_STATE(thread,PS_JOIN);
--			break;
--		case SUSP_NOWAIT:
--			/* Allow the thread to run. */
--			PTHREAD_SET_STATE(thread,PS_RUNNING);
--			PTHREAD_WAITQ_REMOVE(thread);
--			PTHREAD_PRIOQ_INSERT_TAIL(thread);
--			break;
--		case SUSP_NO:
--		case SUSP_YES:
--			/* Allow the thread to run. */
--			PTHREAD_SET_STATE(thread,PS_RUNNING);
--			PTHREAD_PRIOQ_INSERT_TAIL(thread);
--			break;
--		}
--
--		/*
--		 * Undefer and handle pending signals, yielding if
--		 * necessary:
--		 */
--		_thread_kern_sig_undefer();
--	}
--}
--
- #endif
diff --git a/java/jdk14/files/patch-threads_md.c b/java/jdk14/files/patch-threads_md.c
deleted file mode 100644
index d29f1c864ecb..000000000000
--- a/java/jdk14/files/patch-threads_md.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/hpi/native_threads/src/threads_md.c	21 Nov 2001 04:02:04 -0000	1.4
-+++ ../src/solaris/hpi/native_threads/src/threads_md.c	24 Feb 2003 03:17:30 -0000
-@@ -23,6 +23,7 @@
- #include <setjmp.h>

- #include <signal.h>

- #include <sys/types.h>

-+#include <sys/time.h>

- #include <sys/signal.h>

- #include <sys/resource.h>

- #ifdef __FreeBSD__

diff --git a/java/jdk14/pkg-descr b/java/jdk14/pkg-descr
index f923cbfd2320..e3405a6f9a1a 100644
--- a/java/jdk14/pkg-descr
+++ b/java/jdk14/pkg-descr
@@ -1,5 +1,5 @@
 This is the latest patchset from the Java 2 FreeBSD porting project.  This 
-port allows you to easily build a native JDK1.3.1 for FreeBSD.
+port allows you to easily build a native JDK1.4.1 for FreeBSD.
 
 Please note that due to the current Sun licensing policy the resulting binaries
 can't be distributed and you are only permitted to use/hack it personally.
diff --git a/java/jdk14/pkg-message b/java/jdk14/pkg-message
index 1078eecc4824..ce79ffc57690 100644
--- a/java/jdk14/pkg-message
+++ b/java/jdk14/pkg-message
@@ -1,587 +1,705 @@
-SUN COMMUNITY SOURCE LICENSE
-Version 2.3
-(Rev. Date February 22, 1999)
- 
+SUN COMMUNITY SOURCE LICENSE Version 2.3 (Rev.  Date Feb. 
+23, 1999)
+        
 RECITALS
-
-Original Contributor has developed Specifications and Source Code 
-implementations of certain Technology; and
-
-Original Contributor desires to license the Technology to a large community to 
-facilitate research, innovation and product development while maintaining 
-compatibility of such products with the Technology as delivered by Original 
+        
+Original Contributor has developed Specifications and Source
+Code implementations of certain Technology; and
+        
+Original Contributor desires to license the Technology to a
+large community to facilitate research, innovation and
+product development while maintaining compatibility of such
+products with the Technology as delivered by Original
 Contributor; and
+        
+Original Contributor desires to license certain Sun
+Trademarks for the purpose of branding products that are
+compatible with the relevant Technology delivered by
+Original Contributor; and
+               
+You desire to license the Technology and possibly certain
+Sun Trademarks from Original Contributor on the terms and
+conditions specified in this License.
+                 
+In consideration for the mutual covenants contained herein,
+You and Original Contributor agree as follows:
+        
+AGREEMENT
+1.  Introduction.  The Sun Community Source License and
+effective attachments ("License") may include five distinct
+licenses:  Research Use, TCK, Internal Deployment Use,
+Commercial Use and Trademark License.  The Research Use
+license is effective when You click and accept this License.
+The TCK and Internal Deployment Use licenses are effective
+when You click and accept this License, unless otherwise
+specified in the TCK and Internal Deployment Use
+attachments.  The Commercial Use and Trademark licenses must
+be signed by You and Original Contributor in order to become
+effective.  Once effective, these licenses and the
+associated requirements and responsibilities are cumulative.
+Capitalized terms used in this License are defined in the
+Glossary.
+
+2.  License Grants.
+
+2.1 Original Contributor Grant.  Subject to Your compliance
+with Sections 3, 8.10 and Attachment A of this License,
+Original Contributor grants to You a worldwide,
+royalty-free, non-exclusive license, to the extent of
+Original Contributor's Intellectual Property Rights covering
+the Original Code, Upgraded Code and Specifications, to do
+the following:
+
+a) Research Use License:
+
+(i) use, reproduce and modify the Original Code, Upgraded
+Code and Specifications to create Modifications and
+Reformatted Specifications for Research Use by You,
+
+(ii) publish and display Original Code, Upgraded Code and
+Specifications with, or as part of Modifications, as
+permitted under Section 3.1 b) below,
+
+(iii) reproduce and distribute copies of Original Code and
+Upgraded Code to Licensees and students for Research Use by
+You,
+
+(iv) compile, reproduce and distribute Original Code and
+Upgraded Code in Executable form, and Reformatted
+Specifications to anyone for Research Use by You.
+
+b) Other than the licenses expressly granted in this
+License, Original Contributor retains all right, title, and
+interest in Original Code and Upgraded Code and
+Specifications.
 
-Original Contributor desires to license certain Sun Trademarks for the purpose 
-of branding products that are compatible with the relevant Technology delivered 
-by Original Contributor; and
-
-You desire to license the Technology and possibly certain Sun Trademarks from 
-Original Contributor on the terms and conditions specified in this License.
-
-In consideration for the mutual covenants contained herein, You and Original 
-Contributor agree as follows:
-
-AGREEMENT 
-
-1.	Introduction. The Sun Community Source License and effective attachments 
-("License") may include five distinct licenses: Research Use, TCK, Internal 
-Deployment Use, Commercial Use and Trademark License. The Research Use license 
-is effective when You click and accept this License. The TCK and Internal 
-Deployment Use licenses are effective when You click and accept this License, 
-unless otherwise specified in the TCK and Internal Deployment Use attachments. 
-The Commercial Use and Trademark licenses must be signed by You and Original 
-Contributor in order to become effective. Once effective, these licenses and the 
-associated requirements and responsibilities are cumulative. Capitalized terms 
-used in this License are defined in the Glossary.
- 
-2.	License Grants.
-
-2.1	Original Contributor Grant. Subject to Your compliance with Sections 3, 
-8.10 and Attachment A of this License, Original Contributor grants to You a 
-worldwide, royalty-free, non- exclusive license, to the extent of Original 
-Contributor's Intellectual Property Rights covering the Original Code, Upgraded 
-Code and Specifications, to do the following:
- 
-a)	Research Use License: 
-	(i)	use, reproduce and modify the Original Code, Upgraded Code and 
-Specifications to create Modifications and Reformatted Specifications for 
-Research Use by You, 
-	(ii)	publish and display Original Code, Upgraded Code and 
-Specifications with, or as part of Modifications, as permitted under Section 3.1 
-b) below, 
-	(iii)	reproduce and distribute copies of Original Code and Upgraded 
-Code to Licensees and students for Research Use by You,
-	(iv) 	compile, reproduce and distribute Original Code and Upgraded 
-Code in Executable form, and Reformatted Specifications to anyone for Research 
-Use by You.
- 
-b)	Other than the licenses expressly granted in this License, Original 
-Contributor retains all right, title, and interest in Original Code and Upgraded 
-Code and Specifications. 
-           
-2.2	Your Grants. 
-
-a)	To Other Licensees. You hereby grant to each Licensee a license to Your 
-Error Corrections and Shared Modifications, of the same scope and extent as 
-Original Contributor's licenses under Section 2.1 a) above relative to Research 
-Use, Attachment C relative to Internal Deployment Use, and Attachment D relative 
-to Commercial Use.
- 
-b)	To Original Contributor. You hereby grant to Original Contributor a 
-worldwide, royalty-free, non-exclusive, perpetual and irrevocable license, to 
-the extent of Your Intellectual Property Rights covering Your Error Corrections, 
-Shared Modifications and Reformatted Specifications, to use, reproduce, modify, 
-display and distribute Your Error Corrections, Shared Modifications and 
-Reformatted Specifications, in any form, including the right to sublicense such 
-rights through multiple tiers of distribution.
- 
-c)	Other than the licenses expressly granted in Sections 2.2 a) and b) 
-above, and the restriction set forth in Section 3.1 d)(iv) below, You retain all 
-right, title, and interest in Your Error Corrections, Shared Modifications and 
+2.2 Your Grants.
+
+a) To Other Licensees.  You hereby grant to each Licensee a
+license to Your Error Corrections and Shared Modifications,
+of the same scope and extent as Original Contributor's
+licenses under Section 2.1 a) above relative to Research
+Use, Attachment C relative to Internal Deployment Use, and
+Attachment D relative to Commercial Use.
+
+b) To Original Contributor.  You hereby grant to Original
+Contributor a worldwide, royalty-free, non-exclusive,
+perpetual and irrevocable license, to the extent of Your
+Intellectual Property Rights covering Your Error
+Corrections, Shared Modifications and Reformatted
+Specifications, to use, reproduce, modify, display and
+distribute Your Error Corrections, Shared Modifications and
+Reformatted Specifications, in any form, including the right
+to sublicense such rights through multiple tiers of
+distribution.
+
+c) Other than the licenses expressly granted in Sections 2.2
+a) and b) above, and the restriction set forth in Section
+3.1 d)(iv) below, You retain all right, title, and interest
+in Your Error Corrections, Shared Modifications and
 Reformatted Specifications.
- 
-2.3	Contributor Modifications. You may use, reproduce, modify, display and 
-distribute Contributor Error Corrections, Shared Modifications and Reformatted 
-Specifications, obtained by You under this License, to the same scope and extent 
-as with Original Code, Upgraded Code and Specifications. 
- 
-2.4	Subcontracting. You may deliver the Source Code of Covered Code to other 
-Licensees having at least a Research Use license, for the sole purpose of 
-furnishing development services to You in connection with Your rights granted in 
-this License. All such Licensees must execute appropriate documents with respect 
-to such work consistent with the terms of this License, and acknowledging their 
-work-made-for-hire status or assigning exclusive right to the work product and 
-associated Intellectual Property Rights to You.
- 
-3.	Requirements and Responsibilities.
-3.1	Research Use License. As a condition of exercising the rights granted 
-under Section 2.1 a) above, You agree to comply with the following:
-
-a)	Your Contribution to the Community. All Error Corrections and Shared 
-Modifications which You create or contribute to are automatically subject to the 
-licenses granted under Section 2.2 above. You are encouraged to license all of 
-Your other Modifications under Section 2.2 as Shared Modifications, but are not 
-required to do so. You agree to notify Original Contributor of any errors in the 
+
+2.3 Contributor Modifications.  You may use, reproduce,
+modify, display and distribute Contributor Error
+Corrections, Shared Modifications and Reformatted
+Specifications, obtained by You under this License, to the
+same scope and extent as with Original Code, Upgraded Code
+and Specifications.
+
+2.4 Subcontracting.  You may deliver the Source Code of
+Covered Code to other Licensees having at least a Research
+Use license, for the sole purpose of furnishing development
+services to You in connection with Your rights granted in
+this License.  All such Licensees must execute appropriate
+documents with respect to such work consistent with the
+terms of this License, and acknowledging their
+work-made-for-hire status or assigning exclusive right to
+the work product and associated Intellectual Property Rights
+to You.
+
+3.Requirements and Responsibilities.
+
+3.1 Research Use License.  As a condition of exercising the rights 
+granted under Section 2.1 a) above, You agree to comply with the following:
+
+a) Your Contribution to the Community.  All Error
+Corrections and Shared Modifications which You create or
+contribute to are automatically subject to the licenses
+granted under Section 2.2 above.  You are encouraged to
+license all of Your other Modifications under Section 2.2 as
+Shared Modifications, but are not required to do so.  You
+agree to notify Original Contributor of any errors in the
 Specification.
 
-b)	Source Code Availability. You agree to provide all Your Error 
-Corrections to Original Contributor as soon as reasonably practicable and, in 
-any event, prior to Internal Deployment Use or Commercial Use, if applicable.   
-Original Contributor may, at its discretion, post Source Code for Your Error 
-Corrections and Shared Modifications on the Community Webserver. You may also 
-post Error Corrections and Shared Modifications on a web-server of Your choice; 
-provided, that You must take reasonable precautions to ensure that only 
-Licensees have access to such Error Corrections and Shared Modifications. Such 
-precautions shall include, without limitation, a password protection scheme 
-limited to Licensees and a click-on, download certification of Licensee status 
-required of those attempting to download from the server. An example of an 
+b) Source Code Availability.  You agree to provide all Your
+Error Corrections to Original Contributor as soon as
+reasonably practicable and, in any event, prior to Internal
+Deployment Use or Commercial Use, if applicable.  Original
+Contributor may, at its discretion, post Source Code for
+Your Error Corrections and Shared Modifications on the
+Community Webserver.  You may also post Error Corrections
+and Shared Modifications on a web-server of Your choice;
+provided, that You must take reasonable precautions to
+ensure that only Licensees have access to such Error
+Corrections and Shared Modifications.  Such precautions
+shall include, without limitation, a password protection
+scheme limited to Licensees and a click-on, download
+certification of Licensee status required of those
+attempting to download from the server.  An example of an
 acceptable certification is attached as Attachment A-2.
 
-c)	Notices. All Error Corrections and Shared Modifications You create or 
-contribute to must include a file documenting the additions and changes You made 
-and the date of such additions and changes. You must also include the notice set 
-forth in Attachment A-1 in the file header. If it is not possible to put the 
-notice in a particular Source Code file due to its structure, then You must 
-include the notice in a location (such as a relevant directory file), where a 
+c) Notices.  All Error Corrections and Shared Modifications
+You create or contribute to must include a file documenting
+the additions and changes You made and the date of such
+additions and changes.  You must also include the notice set
+forth in Attachment A-1 in the file header.  If it is not
+possible to put the notice in a particular Source Code file
+due to its structure, then You must include the notice in a
+location (such as a relevant directory file), where a
 recipient would be most likely to look for such a notice.
 
-d)	Redistribution.
-
-	(i)	Source. Covered Code may be distributed in Source Code form only 
-to another Licensee (except for students as provided below). You may not offer 
-or impose any terms on any Covered Code that alter the rights, requirements, or 
-responsibilities of such Licensee. You may distribute Covered Code to students 
-for use in connection with their course work and research projects undertaken at 
-accredited educational institutions. Such students need not be Licensees, but 
-must be given a copy of the notice set forth in Attachment A-3 and such notice 
-must also be included in a file header or prominent location in the Source Code 
-made available to such students.
-
-	(ii)	Executable. You may distribute Executable version(s) of Covered 
-Code to Licensees and other third parties only for the purpose of evaluation and 
-comment in connection with Research Use by You and under a license of Your 
-choice, but which limits use of such Executable version(s) of Covered Code only 
-to that purpose. 
-
-	(iii)	 Modified Class, Interface and Package Naming. In connection 
-with Research Use by You only, You may use Original
-Contributor’s class, interface and package names only to accurately reference or 
-invoke the Source Code files You modify.
-Original Contributor grants to You a limited license to the extent necessary for 
-such purposes.
-
-	(iv)	You expressly agree that any distribution, in whole or in part, 
-of Modifications developed by You shall only be done pursuant to the term and 
-conditions of this License.
-
-e)	Extensions.
-
-	(i)	Covered Code. You may not include any Source Code of Community 
-Code in any Extensions;
-
-	(ii) 	Publication. No later than the date on which You first 
-distribute such Extension for Commercial Use, You must publish to the industry, 
-on a non-confidential basis and free of all copyright restrictions with respect 
-to reproduction and use, an accurate and current specification for any 
-Extension. In addition, You must make available an appropriate test suite, 
-pursuant to the same rights as the specification, sufficiently detailed to allow 
-any third party reasonably skilled in the technology to produce implementations 
-of the Extension compatible with the specification. Such test suites must be 
-made available as soon as reasonably practicable but, in no event, later than 
-ninety (90) days after Your first Commercial Use of the Extension. You must use 
-reasonable efforts to promptly clarify and correct the specification and the 
-test suite upon written request by Original Contributor.
-
-	(iii)	Open. You agree to refrain from enforcing any Intellectual 
-Property Rights You may have covering any interface(s) of Your Extension, which 
-would prevent the implementation of such interface(s) by Original Contributor or 
-any Licensee. This obligation does not prevent You from enforcing any 
-Intellectual Property Right You have that would otherwise be infringed by an 
-implementation of Your Extension. 
-
-	(iv)	Class, Interface and Package Naming. You may not add any 
-packages, or any public or protected classes or interfaces with names that 
-originate or might appear to originate from Original Contributor including, 
-without limitation, package or class names which begin with "sun", "java", 
-"javax", "jini", "net.jini", "com.sun" or their equivalents in any subsequent 
-class, interface and/ or package naming convention adopted by Original 
-Contributor. It is specifically suggested that You name any new packages using 
-the "Unique Package Naming Convention" as described in "The Java Language 
-Specification" by James Gosling, Bill Joy, and Guy Steele, ISBN 0-201-63451-1, 
-August 1996. Section 7.7 "Unique Package Names", on page 125 of this 
+d) Redistribution.
+
+(i) Source.  Covered Code may be distributed in Source Code
+form only to another Licensee (except for students as
+provided below).  You may not offer or impose any terms on
+any Covered Code that alter the rights, requirements, or
+responsibilities of such Licensee.  You may distribute
+Covered Code to students for use in connection with their
+course work and research projects undertaken at accredited
+educational institutions.  Such students need not be
+Licensees, but must be given a copy of the notice set forth
+in Attachment A-3 and such notice must also be included in a
+file header or prominent location in the Source Code made
+available to such students.
+
+(ii) Executable.  You may distribute Executable version(s)
+of Covered Code to Licensees and other third parties only
+for the purpose of evaluation and comment in connection with
+Research Use by You and under a license of Your choice, but
+which limits use of such Executable version(s) of Covered
+Code only to that purpose.
+
+(iii) Modified Class,Interface and Package Naming.  In
+connection with Research Use by You only, You may use
+Original Contributor's class, interface and package names
+only to accurately reference or invoke the Source Code files
+You modify.  Original Contributor grants to You a limited
+license to the extent necessary for such purposes.
+
+(iv) You expressly agree that any distribution, in whole or
+in part, of Modifications developed by You shall only be
+done pursuant to the term and conditions of this License.
+
+e) Extensions.
+
+(i) Covered Code.  You may not include any Source Code of
+Community Code in any Extensions;
+
+(ii) Publication.  No later than the date on which You first
+distribute such Extension for Commercial Use, You must
+publish to the industry, on a non-confidential basis and
+free of all copyright restrictions with respect to
+reproduction and use, an accurate and current specification
+for any Extension.  In addition, You must make available an
+appropriate test suite, pursuant to the same rights as the
+specification, sufficiently detailed to allow any third
+party reasonably skilled in the technology to produce
+implementations of the Extension compatible with the
+specification.  Such test suites must be made available as
+soon as reasonably practicable but, in no event, later than
+ninety (90) days after Your first Commercial Use of the
+Extension.  You must use reasonable efforts to promptly
+clarify and correct the specification and the test suite
+upon written request by Original Contributor.
+
+(iii) Open.  You agree to refrain from enforcing any
+Intellectual Property Rights You may have covering any
+interface(s) of Your Extension, which would prevent the
+implementation of such interface(s) by Original Contributor
+or any Licensee.  This obligation does not prevent You from
+enforcing any Intellectual Property Right You have that
+would otherwise be infringed by an implementation of Your
+Extension.
+
+(iv) Class, Interface and Package Naming.  You may not add
+any packages, or any public or protected classes or
+interfaces with names that originate or might appear to
+originate from Original Contributor including, without
+limitation, package or class names which begin with "sun",
+"java", "javax", "jini", "net.jini", "com.sun" or their
+equivalents in any subsequent class, interface and/ or
+package naming convention adopted by Original Contributor.
+It is specifically suggested that You name any new packages
+using the "Unique Package Naming Convention" as described in
+"The Java Language Specification" by James Gosling, Bill
+Joy, and Guy Steele, ISBN 0-201-63451-1, August 1996.
+Section 7.7 "Unique Package Names", on page 125 of this
 specification which states, in part:
 
-"You form a unique package name by first having (or belonging to an organization 
-that has) an Internet domain name, such as "sun.com". You then reverse the name, 
-component by component, to obtain, in this example, "Com.sun", and use this as a 
-prefix for Your package names, using a convention developed within Your 
-organization to further administer package names."
-
-3.2	Additional Requirements and Responsibilities. Any additional 
-requirements and responsibilities relating to the Technology are listed in 
-Attachment F (Additional Requirements and Responsibilities), if applicable, and 
-are hereby incorporated into this Section 3.
- 
-4.	Versions of the License.
- 
-4.1	License Versions. Original Contributor may publish revised versions of 
-the License from time to time. Each version will be given a distinguishing 
-version number.
- 
-4.2	Effect. Once a particular version of Covered Code has been provided 
-under a version of the License, You may always continue to use such Covered Code 
-under the terms of that version of the License. You may also choose to use such 
-Covered Code under the terms of any subsequent version of the License. No one 
-other than Original Contributor has the right to promulgate License versions.
- 
-5.	Disclaimer of Warranty.
- 
-5.1	COVERED CODE IS PROVIDED UNDER THIS LICENSE "AS IS", WITHOUT WARRANTY OF 
-ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES 
-THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR 
-PURPOSE OR NON-INFRINGING. YOU AGREE TO BEAR THE ENTIRE RISK IN CONNECTION WITH 
-YOUR USE AND DISTRIBUTION OF COVERED CODE UNDER THIS LICENSE. THIS DISCLAIMER OF 
-WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED 
-CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO THIS DISCLAIMER.
- 
-5.2	You acknowledge that Original Code, Upgraded Code and Specifications are 
-not designed or intended for use in (i) on-line control of aircraft, air 
-traffic, aircraft navigation or aircraft communications; or (ii) in the design, 
-construction, operation or maintenance of any nuclear facility. Original 
-Contributor disclaims any express or implied warranty of fitness for such uses.
- 
-6.	Termination.
- 
-6.1	By You. You may terminate this Research Use license at anytime by 
-providing written notice to Original Contributor.
-
-6.2	By Original Contributor. This License and the rights granted hereunder 
-will terminate:
-
-	(i)	 automatically if You fail to comply with the terms of this 
-License and fail to cure such breach within 30 days of receipt of written notice 
-of the breach; 
-
-	(ii)	immediately in the event of circumstances specified in Sections 
-7.1 and 8.4; or 
-
-	(iii)	at Original Contributor's discretion upon any action initiated 
-in the first instance by You alleging that use or distribution by Original 
-Contributor or any Licensee, of Original Code, Upgraded Code, Error Corrections 
-or Shared Modifications contributed by You, or Specifications, infringe a patent 
-owned or controlled by You. 
-
-6.3	Effective of Termination. Upon termination, You agree to discontinue use 
-and return or destroy all copies of Covered Code in Your possession. All 
-sublicenses to the Covered Code which You have properly granted shall survive 
-any termination of this License. Provisions which, by their nature, should 
-remain in effect beyond the termination of this License shall survive including, 
-without limitation, Sections 2.2, 3, 5, 7 and 8.
- 
-6.4	Each party waives and releases the other from any claim to compensation 
-or indemnity for permitted or lawful termination of the business relationship 
-established by this License. 
- 
-7.	Liability.
- 
-7.1	Infringement. Should any of the Original Code, Upgraded Code, TCK or 
-Specifications ("Materials") become the subject of a claim of infringement, 
-Original Contributor may, at its sole option, (i) attempt to procure the rights 
-necessary for You to continue using the Materials, (ii) modify the Materials so 
-that they are no longer infringing, or (iii) terminate Your right to use the 
-Materials, immediately upon written notice, and refund to You the amount, if 
-any, having then actually been paid by You to Original Contributor for the 
-Original Code, Upgraded Code and TCK, depreciated on a straight line, five year 
-basis.
- 
-7.2	LIMITATION OF LIABILITY. TO THE FULL EXTENT ALLOWED BY APPLICABLE LAW, 
-ORIGINAL CONTRIBUTOR's LIABILITY TO YOU FOR CLAIMS RELATING TO THIS LICENSE, 
-WHETHER FOR BREACH OR IN TORT, SHALL BE LIMITED TO ONE HUNDRED PERCENT (100%) OF 
-THE AMOUNT HAVING THEN ACTUALLY BEEN PAID BY YOU TO ORIGINAL CONTRIBUTOR FOR ALL 
-COPIES LICENSED HEREUNDER OF THE PARTICULAR ITEMS GIVING RISE TO SUCH CLAIM, IF 
-ANY. IN NO EVENT WILL YOU (RELATIVE TO YOUR SHARED MODIFICATIONS OR ERROR 
-CORRECTIONS) OR SUN BE LIABLE FOR ANY INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL OR 
-CONSEQUENTIAL DAMAGES IN CONNECTION WITH OR ARISING OUT OF THIS LICENSE 
-(INCLUDING, WITHOUT LIMITATION, LOSS OF PROFITS, USE, DATA, OR OTHER ECONOMIC 
-ADVANTAGE), HOWEVER IT ARISES AND ON ANY THEORY OF LIABILITY, WHETHER IN AN 
-ACTION FOR CONTRACT, STRICT LIABILITY OR TORT (INCLUDING NEGLIGENCE) OR 
-OTHERWISE, WHETHER OR NOT YOU OR ORIGINAL CONTRIBUTOR HAS BEEN ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE AND NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE 
-OF ANY REMEDY.
- 
-8.	Miscellaneous.
- 
-8.1	Trademark. You agree to comply with the then current Sun Trademark & 
-Logo Usage Requirements accessible through the SCSL Webpage. Except as expressly 
-provided in the License, You are granted no right, title or license to, or 
-interest in, any Sun Trademarks. You agree not to (i) challenge Original 
-Contributor's ownership or use of Sun Trademarks; (ii) attempt to register any 
-Sun Trademarks, or any mark or logo substantially similar thereto; or (iii) 
-incorporate any Sun Trademarks into Your own trademarks, product names, service 
-marks, company names, or domain names.
- 
-8.2	Integration. This License represents the complete agreement concerning 
-the subject matter hereof. 
-
-8.3	Assignment. Original Contributor may assign this License, and its rights 
-and obligations hereunder, in its sole discretion. You may assign the Research 
-Use portions of this License to a third party upon prior written notice to 
-Original Contributor (which may be provided via the Community Web-Server). You 
-may not assign the Commercial Use license or TCK license, including by way of 
-merger (regardless of whether You are the surviving entity) or acquisition, 
-without Original Contributor's prior written consent. 
- 
-8.4	Severability. If any provision of this License is held to be 
-unenforceable, such provision shall be reformed only to the extent necessary to 
-make it enforceable. Notwithstanding the foregoing, if You are prohibited by law 
-from fully and specifically complying with Sections 2.2 or 3, this License will 
-immediately terminate and You must immediately discontinue any use of Covered 
-Code. 
- 
-8.5	Governing Law. This License shall be governed by the laws of the United 
-States and the State of California, as applied to contracts entered into and to 
-be performed in California between California residents. The application of the 
-United Nations Convention on Contracts for the International Sale of Goods is 
-expressly excluded. 
- 
-8.6	Dispute Resolution. 
-
-a)	Any dispute arising out of or relating to this License shall be finally 
-settled by arbitration as set out herein, except that either party may bring any 
-action, in a court of competent jurisdiction (which jurisdiction shall be 
-exclusive), with respect to any dispute relating to such party's Intellectual 
-Property Rights or with respect to Your compliance with the TCK license. 
-Arbitration shall be administered: (i) by the American Arbitration Association 
-(AAA), (ii) in accordance with the rules of the United Nations Commission on 
-International Trade Law (UNCITRAL) (the "Rules") in effect at the time of 
-arbitration as modified herein; and (iii) the arbitrator will apply the 
-substantive laws of California and United States. Judgement upon the award 
-rendered by the arbitrator may be entered in any court having jurisdiction to 
-enforce such award. 
-
-b)	All arbitration proceedings shall be conducted in English by a single 
-arbitrator selected in accordance with the Rules, who must be fluent in English 
-and be either a retired judge or practicing attorney having at least ten (10) 
-years litigation experience and be reasonably familiar with the technology 
-matters relative to the dispute. Unless otherwise agreed, arbitration venue 
-shall be in London, Tokyo, or San Francisco, whichever is closest to defendant's 
-principal business office.   The arbitrator may award monetary damages only and 
-nothing shall preclude either party from seeking provisional or emergency relief 
-from a court of competent jurisdiction. The arbitrator shall have no authority 
-to award damages in excess of those permitted in this License and any such award 
-in excess is void. All awards will be payable in U.S. dollars and may include, 
-for the prevailing party (i) pre-judgment award interest, (ii) reasonable 
-attorneys' fees incurred in connection with the arbitration, and (iii) 
-reasonable costs and expenses incurred in enforcing the award. The arbitrator 
-will order each party to produce identified documents and respond to no more 
-than twenty-five single question interrogatories.
-
-8.7	Construction. Any law or regulation which provides that the language of 
-a contract shall be construed against the drafter shall not apply to this 
-License. 
- 
-8.8	U.S. Government End Users. The Covered Code is a "commercial item", as 
-that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial 
-computer software" and "commercial computer software documentation", as such 
-terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 
-12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. 
-Government End Users acquire Covered Code with only those rights set forth 
-herein. You agree to pass this notice to Your licensees.
- 
-8.9	Press Announcements. All press announcements relative to the execution 
-of this License must be reviewed and approved by Original Contributor and You 
-prior to release.      
- 
-8.10	International Use.
- 
-a)	Export/Import laws. Covered Code is subject to U.S. export control laws 
-and may be subject to export or import regulations in other countries. Each 
-party agrees to comply strictly with all such laws and regulations and 
-acknowledges their responsibility to obtain such licenses to export, re- export, 
-or import as may be required. You agree to pass these obligations to Your 
-licensees.
- 
-b)	Intellectual Property Protection. Due to limited intellectual property 
-protection and enforcement in certain countries, You agree not to redistribute 
-the Original Code, Upgraded Code, TCK and Specifications to any country other 
+"You form a unique package name by first having (or
+belonging to an organization that has) an Internet domain
+name, such as "sun.com".  You then reverse the name,
+component by component, to obtain, in this example,
+"Com.sun", and use this as a prefix for Your package names,
+using a convention developed within Your organization to
+further administer package names."
+
+3.2 Additional Requirements and Responsibilities.  Any
+additional requirements and responsibilities relating to the
+Technology are listed in Attachment F (Additional
+Requirements and Responsibilities), if applicable, and are
+hereby incorporated into this Section 3.
+
+4.  Versions of the License.
+
+4.1 License Versions.  Original Contributor may publish
+revised versions of the License from time to time.  Each
+version will be given a distinguishing version number.
+
+4.2 Effect.  Once a particular version of Covered Code has
+been provided under a version of the License, You may always
+continue to use such Covered Code under the terms of that
+version of the License.  You may also choose to use such
+Covered Code under the terms of any subsequent version of
+the License.  No one other than Original Contributor has the
+right to promulgate License versions.
+
+5.  Disclaimer of Warranty.
+
+5.1 COVERED CODE IS PROVIDED UNDER THIS LICENSE "AS IS,"
+WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+PURPOSE OR NON-INFRINGING.  YOU AGREE TO BEAR THE ENTIRE
+RISK IN CONNECTION WITH YOUR USE AND DISTRIBUTION OF COVERED
+CODE UNDER THIS LICENSE.  THIS DISCLAIMER OF WARRANTY
+CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.  NO USE OF
+ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO
+THIS DISCLAIMER.
+
+5.2 You acknowledge that Original Code, Upgraded Code and
+Specifications are not designed or intended for use in (i)
+on-line control of aircraft, air traffic, aircraft
+navigation or aircraft communications; or (ii) in the
+design, construction, operation or maintenance of any
+nuclear facility.  Original Contributor disclaims any
+express or implied warranty of fitness for such uses.
+
+6.  Termination.
+
+6.1 By You.  You may terminate this Research Use license at
+anytime by providing written notice to Original Contributor.
+
+6.2 By Original Contributor.  This License and the rights
+granted hereunder will terminate:
+
+(i) automatically if You fail to comply with the terms of
+this License and fail to cure such breach within 30 days of
+receipt of written notice of the breach;
+
+(ii) immediately in the event of circumstances specified in
+Sections 7.1 and 8.4; or
+
+(iii) at Original Contributor's discretion upon any action
+initiated in the first instance by You alleging that use or
+distribution by Original Contributor or any Licensee, of
+Original Code, Upgraded Code, Error Corrections or Shared
+Modifications contributed by You, or Specifications,
+infringe a patent owned or controlled by You.
+
+6.3 Effective of Termination.  Upon termination, You agree
+to discontinue use and return or destroy all copies of
+Covered Code in your possession.  All sublicenses to the
+Covered Code which you have properly granted shall survive
+any termination of this License.  Provisions which, by their
+nature, should remain in effect beyond the termination of
+this License shall survive including, without limitation,
+Sections 2.2, 3, 5, 7 and 8.
+
+6.4 Each party waives and releases the other from any claim
+to compensation or indemnity for permitted or lawful
+termination of the business relationship established by this
+License.
+
+7.  Liability.
+
+7.1 Infringement.  Should any of the Original Code, Upgraded
+Code, TCK or Specifications ("Materials") become the subject
+of a claim of infringement, Original Contributor may, at its
+sole option, (i) attempt to procure the rights necessary for
+You to continue using the Materials, (ii) modify the
+Materials so that they are no longer infringing, or (iii)
+terminate Your right to use the Materials, immediately upon
+written notice, and refund to You the amount, if any, having
+then actually been paid by You to Original Contributor for
+the Original Code, Upgraded Code and TCK, depreciated on a
+straight line, five year basis.
+
+7.2 LIMITATION OF LIABILITY.  TO THE FULL EXTENT ALLOWED BY
+APPLICABLE LAW, ORIGINAL CONTRIBUTOR's LIABILITY TO YOU FOR
+CLAIMS RELATING TO THIS LICENSE, WHETHER FOR BREACH OR IN
+TORT, SHALL BE LIMITED TO ONE HUNDRED PERCENT (100%) OF THE
+AMOUNT HAVING THEN ACTUALLY BEEN PAID BY YOU TO ORIGINAL
+CONTRIBUTOR FOR ALL COPIES LICENSED HEREUNDER OF THE
+PARTICULAR ITEMS GIVING RISE TO SUCH CLAIM, IF ANY.  IN NO
+EVENT WILL YOU (RELATIVE TO YOUR SHARED MODIFICATIONS OR
+ERROR CORRECTIONS) OR SUN BE LIABLE FOR ANY INDIRECT,
+PUNITIVE, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES IN
+CONNECTION WITH OR ARISING OUT OF THIS LICENSE (INCLUDING,
+WITHOUT LIMITATION, LOSS OF PROFITS, USE, DATA, OR OTHER
+ECONOMIC ADVANTAGE), HOWEVER IT ARISES AND ON ANY THEORY OF
+LIABILITY, WHETHER IN AN ACTION FOR CONTRACT, STRICT
+LIABILITY OR TORT (INCLUDING NEGLIGENCE) OR OTHERWISE,
+WHETHER OR NOT YOU OR ORIGINAL CONTRIBUTOR HAS BEEN ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE AND NOTWITHSTANDING THE
+FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY.
+
+8.  Miscellaneous.
+
+8.1 Trademark.  You agree to comply with the then current
+Sun Trademark & Logo Usage Requirements accessible through
+the SCSL Webpage.  Except as expressly provided in the
+License, You are granted no right, title or license to, or
+interest in, any Sun Trademarks.  You agree not to (i)
+challenge Original Contributor's ownership or use of Sun
+Trademarks; (ii) attempt to register any Sun Trademarks, or
+any mark or logo substantially similar thereto; or (iii)
+incorporate any Sun Trademarks into your own trademarks,
+product names, service marks, company names, or domain
+names.
+
+8.2 Integration.  This License represents the complete
+agreement concerning the subject matter hereof.
+
+8.3 Assignment.  Original Contributor may assign this
+License, and its rights and obligations hereunder, in its
+sole discretion.  You may assign the Research Use portions
+of this License to a third party upon prior written notice
+to Original Contributor (which may be provided via the
+Community Web-Server).  You may not assign the Commercial
+Use license or TCK license, including by way of merger
+(regardless of whether You are the surviving entity) or
+acquisition, without Original Contributor's prior written
+consent.
+
+8.4 Severability.  If any provision of this License is held
+to be unenforceable, such provision shall be reformed only
+to the extent necessary to make it enforceable.
+Notwithstanding the foregoing, if You are prohibited by law
+from fully and specifically complying with Sections 2.2 or
+3, this License will immediately terminate and You must
+immediately discontinue any use of Covered Code.
+
+8.5 Governing Law.  This License shall be governed by the
+laws of the United States and the State of California, as
+applied to contracts entered into and to be performed in
+California between California residents.  The application of
+the United Nations Convention on Contracts for the
+International Sale of Goods is expressly excluded.
+
+8.6 Dispute Resolution.
+
+a) Any dispute arising out of or relating to this License
+shall be finally settled by arbitration as set out herein,
+except that either party may bring any action, in a court of
+competent jurisdiction (which jurisdiction shall be
+exclusive), with respect to any dispute relating to such
+party's Intellectual Property Rights or with respect to Your
+compliance with the TCK license.  Arbitration shall be
+administered:  (i) by the American Arbitration Association
+(AAA), (ii) in accordance with the rules of the United
+Nations Commission on International Trade Law (UNCITRAL)
+(the "Rules") in effect at the time of arbitration as
+modified herein; and (iii) the arbitrator will apply the
+substantive laws of California and United States.  Judgment
+upon the award rendered by the arbitrator may be entered in
+any court having jurisdiction to enforce such award.
+
+b) All arbitration proceedings shall be conducted in English
+ by a single arbitrator selected in accordance with the
+ Rules, who must be fluent in English and be either a
+ retired judge or practicing attorney having at least ten
+ (10) years litigation experience and be reasonably familiar
+ with the technology matters relative to the dispute.
+ Unless otherwise agreed, arbitration venue shall be in
+ London, Tokyo, or San Francisco, whichever is closest to
+ defendant's principal business office.  The arbitrator may
+ award monetary damages only and nothing shall preclude
+ either party from seeking provisional or emergency relief
+ from a court of competent jurisdiction.  The arbitrator
+ shall have no authority to award damages in excess of those
+ permitted in this License and any such award in excess is
+ void.  All awards will be payable in U.S.  dollars and may
+ include, for the prevailing party (i) pre-judgment award
+ interest, (ii) reasonable attorneys' fees incurred in
+ connection with the arbitration, and (iii) reasonable costs
+ and expenses incurred in enforcing the award.  The
+ arbitrator will order each party to produce identified
+ documents and respond to no more than twenty-five single
+ question interrogatories.
+
+8.7 Construction.  Any law or regulation which provides that
+the language of a contract shall be construed against the
+drafter shall not apply to this License.
+
+8.8 U.S.  Government End Users.  The Covered Code is a
+"commercial item," as that term is defined in 48 C.F.R.
+2.101 (Oct.  1995), consisting of "commercial computer
+software" and "commercial computer software documentation,"
+as such terms are used in 48 C.F.R.  12.212 (Sept.  1995).
+Consistent with 48 C.F.R.  12.212 and 48 C.F.R.  227.7202-1
+through 227.7202-4 (June 1995), all U.S.  Government End
+Users acquire Covered Code with only those rights set forth
+herein.  You agree to pass this notice to Your licensees.
+
+8.9 Press Announcements.  All press announcements relative
+to the execution of this License must be reviewed and
+approved by Original Contributor and You prior to release.
+
+8.10 International Use.
+
+a) Export/Import laws.  Covered Code is subject to U.S.
+export control laws and may be subject to export or import
+regulations in other countries.  Each party agrees to comply
+strictly with all such laws and regulations and acknowledges
+their responsibility to obtain such licenses to export,
+re-export, or import as may be required.  You agree to pass
+these obligations to Your licensees.
+
+b) Intellectual Property Protection.  Due to limited
+intellectual property protection and enforcement in certain
+countries, You agree not to redistribute the Original Code,
+Upgraded Code, TCK and Specifications to any country other
 than the list of restricted countries on the SCSL Webpage.
- 
-8.11	Language. This License is in the English language only, which language 
-shall be controlling in all respects, and all versions of this License in any 
-other language shall be for accommodation only and shall not be binding on the 
-parties to this License. All communications and notices made or given pursuant 
-to this License, and all documentation and support to be provided, unless 
-otherwise noted, shall be in the English language.
-
-PLEASE READ THE TERMS OF THIS LICENSE CAREFULLY. BY CLICKING ON THE "ACCEPT" 
-BUTTON BELOW YOU ARE ACCEPTING AND AGREEING TO THE TERMS AND CONDITIONS OF THIS 
-LICENSE WITH SUN MICROSYSTEMS, INC. IF YOU ARE AGREEING TO THIS LICENSE ON 
-BEHALF OF A COMPANY, YOU REPRESENT THAT YOU ARE AUTHORIZED TO BIND THE COMPANY 
-TO SUCH A LICENSE. WHETHER YOU ARE ACTING ON YOUR OWN BEHALF, OR REPRESENTING A 
-COMPANY, YOU MUST BE OF MAJORITY AGE AND BE OTHERWISE COMPETENT TO ENTER INTO 
-CONTRACTS. IF YOU DO NOT MEET THIS CRITERIA OR YOU DO NOT AGREE TO ANY OF THE 
-TERMS AND CONDITIONS OF THIS LICENSE, CLICK ON THE REJECT BUTTON TO EXIT.
- 
-ACCEPT              REJECT
+
+8.11 Language.  This License is in the English language
+only, which language shall be controlling in all respects,
+and all versions of this License in any other language shall
+be for accommodation only and shall not be binding on the
+parties to this License.  All communications and notices
+made or given pursuant to this License, and all
+documentation and support to be provided, unless otherwise
+noted, shall be in the English language.
+
+PLEASE READ THE TERMS OF THIS LICENSE CAREFULLY.  BY
+CLICKING ON THE "ACCEPT" BUTTON BELOW YOU ARE ACCEPTING AND
+AGREEING TO THE TERMS AND CONDITIONS OF THIS LICENSE WITH
+SUN MICROSYSTEMS, INC.  IF YOU ARE AGREEING TO THIS LICENSE
+ON BEHALF OF A COMPANY, YOU REPRESENT THAT YOU ARE
+AUTHORIZED TO BIND THE COMPANY TO SUCH A LICENSE.  WHETHER
+YOU ARE ACTING ON YOUR OWN BEHALF, OR REPRESENTING A
+COMPANY, YOU MUST BE OF MAJORITY AGE AND BE OTHERWISE
+COMPETENT TO ENTER INTO CONTRACTS.  IF YOU DO NOT MEET THIS
+CRITERIA OR YOU DO NOT AGREE TO ANY OF THE TERMS AND
+CONDITIONS OF THIS LICENSE, CLICK ON THE REJECT BUTTON TO
+EXIT.
+
+ACCEPT REJECT
 
 GLOSSARY
 
-1.	 "Commercial Use" means any use (excluding Internal Deployment Use) or 
-distribution, directly or indirectly of Compliant Covered Code by You to any 
-third party, alone or bundled with any other software or hardware, for direct or 
-indirect commercial or strategic gain or advantage, subject to execution of 
-Attachment D by You and Original Contributor. 
-
-2.	"Community Code" means the Original Code, Upgraded Code, Error 
-Corrections, Shared Modifications, or any combination thereof.
-
-3.	"Community Webserver(s)" means the webservers designated by Original 
-Contributor for posting Error Corrections and Shared Modifications.
- 
-4.	"Compliant Covered Code" means Covered Code that complies with the 
-requirements of the TCK.
- 
-5.	"Contributor" means each Licensee that creates or contributes to the 
-creation of any Error Correction or Shared Modification.
-
-6.	"Covered Code" means the Original Code, Upgraded Code, Modifications, or 
-any combination thereof.
-
-7.	"Error Correction" means any change made to Community Code which 
-conforms to the Specification and corrects the adverse effect of a failure of 
-Community Code to perform any function set forth in or required by the 
-Specifications.
+1.  "Commercial Use" means any use (excluding Internal
+Deployment Use) or distribution, directly or indirectly of
+Compliant Covered Code by You to any third party, alone or
+bundled with any other software or hardware, for direct or
+indirect commercial or strategic gain or advantage, subject
+to execution of Attachment D by You and Original
+Contributor.
+
+2.  "Community Code" means the Original Code, Upgraded Code,
+Error Corrections, Shared Modifications, or any combination
+thereof.
+
+3.  "Community Webserver(s)" means the webservers designated
+by Original Contributor for posting Error Corrections and
+Shared Modifications.
+
+4.  "Compliant Covered Code" means Covered Code that
+complies with the requirements of the TCK.
+
+5.  "Contributor" means each Licensee that creates or
+contributes to the creation of any Error Correction or
+Shared Modification.
+
+6.  "Covered Code" means the Original Code, Upgraded Code,
+Modifications, or any combination thereof.
+
+7.  "Error Correction" means any change made to Community
+Code which conforms to the Specification and corrects the
+adverse effect of a failure of Community Code to perform any
+function set forth in or required by the Specifications.
+
+7.  "Executable" means Covered Code that has been converted
+to a form other than Source Code.
+
+9.  "Extension(s)" means any additional classes or other
+programming code and/or interfaces developed by or for You
+which:  (i) are designed for use with the Technology; (ii)
+constitute an API for a library of computing functions or
+services; and (iii) are disclosed to third party software
+developers for the purpose of developing software which
+invokes such additional classes or other programming code
+and/or interfaces.  The foregoing shall not apply to
+software development by Your subcontractors to be
+exclusively used by You.
+
+10.  "Intellectual Property Rights" means worldwide
+statutory and common law rights associated solely with (i)
+patents and patent applications; (ii) works of authorship
+including copyrights, copyright applications, copyright
+registrations and "moral rights"; (iii) the protection of
+trade and industrial secrets and confidential information;
+and (iv) divisions, continuations, renewals, and
+re-issuances of the foregoing now existing or acquired in
+the future.
+
+11.  "Internal Deployment Use" means use of Compliant
+Covered Code (excluding Research Use) within Your business
+or organization only by Your employees and/or agents,
+subject to execution of Attachment C by You and Original
+Contributor, if required.
+
+12.  "Licensee" means any party that has entered into and
+has in effect a version of this License with Original
+Contributor.
+
+13.  "Modification(s)" means (i) any change to Covered Code;
+(ii) any new file or other representation of computer
+program statements that contains any portion of Covered
+Code; and/or (iii) any new Source Code implementing any
+portion of the Specifications.
+
+14.  "Original Code" means the initial Source Code for the
+Technology as described on the Technology Download Site.
+
+15.  "Original Contributor" means Sun Microsystems, Inc.,
+its affiliates and its successors and assigns.
+
+16.  "Reformatted Specifications" means any revision to the
+Specifications which translates or reformats the
+Specifications (as for example in connection with Your
+documentation) but which does not alter, subset or superset
+the functional or operational aspects of the Specifications.
+
+17.  "Research Use" means use and distribution of Covered
+Code only for Your research, development, educational or
+personal and individual use, and expressly excludes Internal
+Deployment Use and Commercial Use.
+
+18.  "SCSL Webpage" means the Sun Community Source license
+webpage located at http://sun.com/software/communitysource,
+or such other url that Sun may designate from time to time.
+
+19.  "Shared Modifications" means Modifications provided by
+You, at Your option, pursuant to Section 2.2, or received by
+You from a Contributor pursuant to Section 2.3.
+
+20.  "Source Code" means computer program statements written
+in any high-level, readable form suitable for modification
+and development.
+
+21.  "Specifications" means the specifications for the
+Technology and other documentation, as designated on the
+Technology Download Site, as may be revised by Original
+Contributor from time to time.
+
+22.  "Sun Trademarks" means Original Contributor's SUN,
+JAVA, and JINI trademarks and logos, whether now used or
+adopted in the future.  
+
+23.  "Technology" means the 
+technology described in Attachment B, and Upgrades.
+
+24.  "Technology Compatibility Kit" or "TCK" means the test
+programs, procedures and/or other requirements, designated
+by Original Contributor for use in verifying compliance of
+Covered Code with the Specifications, in conjunction with
+the Original Code and Upgraded Code.  Original Contributor
+may, in its sole discretion and from time to time, revise a
+TCK to correct errors and/or omissions and in connection
+with Upgrades.
+
+25.  "Technology Download Site" means the site(s) designated
+by Original Contributor for access to the Original Code,
+Upgraded Code, TCK and Specifications.
+
+26.  "Upgrade(s)" means new versions of Technology
+designated exclusively by Original Contributor as an
+"Upgrade" and released by Original Contributor from time to
+time.
+
+27.  "Upgraded Code" means the Source Code for Upgrades,
+possibly including Modifications made by Contributors.
+
+28.  "You(r)" means an individual, or a legal entity acting
+by and through an individual or individuals, exercising
+rights either under this License or under a future version
+of this License issued pursuant to Section 4.1.  For legal
+entities, "You(r)" includes any entity that by majority
+voting interest controls, is controlled by, or is under
+common control with You.
 
-7.	"Executable" means Covered Code that has been converted to a form other 
-than Source Code.
-
-9.	"Extension(s)" means any additional classes or other programming code 
-and/or interfaces developed by or for You which: (i) are designed for use with 
-the Technology; (ii) constitute an API for a library of computing functions or 
-services; and (iii) are disclosed to third party software developers for the 
-purpose of developing software which invokes such additional classes or other 
-programming code and/or interfaces. The foregoing shall not apply to software 
-development by Your subcontractors to be exclusively used by You. 
-
-10.	"Intellectual Property Rights" means worldwide statutory and common law 
-rights associated solely with (i) patents and patent applications; (ii) works of 
-authorship including copyrights, copyright applications, copyright registrations 
-and "moral rights"; (iii) the protection of trade and industrial secrets and 
-confidential information; and (iv) divisions, continuations, renewals, and re- 
-issuances of the foregoing now existing or acquired in the future.
-
-11.	"Internal Deployment Use" means use of Compliant Covered Code (excluding 
-Research Use) within Your business or organization only by Your employees and/or 
-agents, subject to execution of Attachment C by You and Original Contributor, if 
-required. 
-
-12.	"Licensee" means any party that has entered into and has in effect a 
-version of this License with Original Contributor.
-
-13.	"Modification(s)" means (i) any change to Covered Code; (ii) any new 
-file or other representation of computer program statements that contains any 
-portion of Covered Code; and/or (iii) any new Source Code implementing any 
-portion of the Specifications. 
- 
-14.	"Original Code" means the initial Source Code for the Technology as 
-described on the Technology Download Site.
-
-15.	"Original Contributor" means Sun Microsystems, Inc., its affiliates and 
-its successors and assigns.
- 
-16.	"Reformatted Specifications" means any revision to the Specifications 
-which translates or reformats the Specifications (as for example in connection 
-with Your documentation) but which does not alter, subset or superset the 
-functional or operational aspects of the Specifications.
- 
-17.	"Research Use" means use and distribution of Covered Code only for Your 
-research, development, educational or personal and individual use, and expressly 
-excludes Internal Deployment Use and Commercial Use.
- 
-18.	"SCSL Webpage" means the Sun Community Source license webpage located at 
-http://sun.com/software/communitysource, or such other url that Sun may 
-designate from time to time.
- 
-19.	"Shared Modifications" means Modifications provided by You, at Your 
-option, pursuant to Section 2.2, or received by You from a Contributor pursuant 
-to Section 2.3.
- 
-20.	"Source Code" means computer program statements written in any 
-high-level, readable form suitable for modification and development.
- 
-21.	"Specifications" means the specifications for the Technology and other 
-documentation, as designated on the Technology Download Site, as may be revised 
-by Original Contributor from time to time.
- 
-22.	"Sun Trademarks" means Original Contributor's SUN, JAVA, and JINI 
-trademarks and logos, whether now used or adopted in the future.
-
-23.	"Technology" means the technology described in Attachment B, and 
-Upgrades.
- 
-24.	"Technology Compatibility Kit" or "TCK" means the test programs, 
-procedures and/or other requirements, designated by Original Contributor for use 
-in verifying compliance of Covered Code with the Specifications, in conjunction 
-with the Original Code and Upgraded Code. Original Contributor may, in its sole 
-discretion and from time to time, revise a TCK to correct errors and/or 
-omissions and in connection with Upgrades.
- 
-25.	"Technology Download Site" means the site(s) designated by Original 
-Contributor for access to the Original Code, Upgraded Code, TCK and 
-Specifications.
- 
-26.	"Upgrade(s)" means new versions of Technology designated exclusively by 
-Original Contributor as an "Upgrade" and released by Original Contributor from 
-time to time.
- 
-27.	"Upgraded Code" means the Source Code for Upgrades, possibly including 
-Modifications made by Contributors.
- 
-28.	"You(r)" means an individual, or a legal entity acting by and through an 
-individual or individuals, exercising rights either under this License or under 
-a future version of this License issued pursuant to Section 4.1.   For legal 
-entities, "You(r)" includes any entity that by majority voting interest 
-controls, is controlled by, or is under common control with You.
- 
 ATTACHMENT A
- 
+
 REQUIRED NOTICES
- 
- 
+
 ATTACHMENT A-1
- 
-REQUIRED IN ALL CASES
- 
-"The contents of this file, or the files included with this file, are subject to 
-the current version of Sun Community Source License for [fill in name of 
-applicable Technology] (the "License"); You may not use this file except in 
-compliance with the License. You may obtain a copy of the License at 
-http://sun.com/software/communitysource. See the License for the rights, 
-obligations and limitations governing use of the contents of the file. 
- 
- 
-The Original and Upgraded Code is [fill in name and version of applicable 
-Technology]. The developer of the Original and Upgraded Code is Sun 
-Microsystems, Inc. Sun Microsystems, Inc. owns the copyrights in the portions it 
-created. All Rights Reserved.
 
+REQUIRED IN ALL CASES
 
- Contributor(s): _______________________________________________
+"The contents of this file, or the files included with this
+file, are subject to the current version of Sun Community
+Source License for [fill in name of applicable Technology]
+(the "License"); You may not use this file except in
+compliance with the License.  You may obtain a copy of the
+License at http://sun.com/software/communitysource.  See the
+License for the rights, obligations and limitations
+governing use of the contents of the file.
 
-Associated Test Suite(s) Location: ________________________________"
+The Original and Upgraded Code is [fill in name and version
+of applicable Technology].  The developer of the Original
+and Upgraded Code is Sun Microsystems, Inc.  Sun
+Microsystems, Inc.  owns the copyrights in the portions it
+created.  All Rights Reserved.
 
+Contributor(s):
+_______________________________________________
 
+Associated Test Suite(s) Location:
+________________________________
 
 ATTACHMENT A-2
- 
-SAMPLE LICENSEE CERTIFICATION 
- 
-"By clicking the 'Agree' button below, You certify that You are a Licensee in 
-good standing under the Sun Community Source License, [fill in applicable 
-Technology and Version] ("License") and that Your access, use and distribution 
-of code and information You may obtain at this site is subject to the License."”
 
+SAMPLE LICENSEE CERTIFICATION
 
+"By clicking the `Agree' button below, You certify that You
+are a Licensee in good standing under the Sun Community
+Source License, [fill in applicable Technology and Version]
+("License") and that Your access, use and distribution of
+code and information You may obtain at this site is subject
+to the License."
 
 ATTACHMENT A-3
- 
+
 REQUIRED STUDENT NOTIFICATION
- 
-"This software and related documentation has been obtained by your educational 
-institution subject to the Sun Community Source License, [fill in applicable 
-Technology]. You have been provided access to the software and related 
-documentation for use only in connection with your course work and research 
-activities as a matriculated student of your educational institution. Any other 
-use is expressly prohibited. 
- 
-THIS SOFTWARE AND RELATED DOCUMENTATION CONTAINS PROPRIETARY MATERIAL OF SUN 
-MICROSYSTEMS, INC, WHICH ARE PROTECTED BY VARIOUS INTELLECTUAL PROPERTY RIGHTS.
- 
-You may not use this file except in compliance with the License. You may obtain 
-a copy of the License on the web at http://sun.com/software/communitysource."”
 
+"This software and related documentation has been obtained
+by your educational institution subject to the Sun Community
+Source License, [fill in applicable Technology].  You have
+been provided access to the software and related
+documentation for use only in connection with your course
+work and research activities as a matriculated student of
+your educational institution.  Any other use is expressly
+prohibited.
 
+THIS SOFTWARE AND RELATED DOCUMENTATION CONTAINS PROPRIETARY
+MATERIAL OF SUN MICROSYSTEMS, INC, WHICH ARE PROTECTED BY
+VARIOUS INTELLECTUAL PROPERTY RIGHTS.
+
+You may not use this file except in compliance with the
+License.  You may obtain a copy of the License on the web at
+http://sun.com/software/communitysource."
 
 ATTACHMENT B
 
@@ -589,378 +707,446 @@ Java(tm) 2 SDK Technology
 
 Description of "Technology"
 
-Java(tm) 2 SDK Technology v.1.3.1 as described on the Technology Download Site.
-
-
+Java(tm) 2 SDK Technology v.1.4.1 as described on the
+Technology Download Site.
 
 ATTACHMENT C
 
 INTERNAL DEPLOYMENT USE
 
-This Attachment C is only effective for the Technology specified in Attachment 
-B, upon execution of Attachment D (Commercial Use License) including the 
-requirement to pay royalties. In the event of a conflict between the terms of 
-this Attachment C and Attachment D, the terms of Attachment D shall govern.
-
-1.	Internal Deployment License Grant. Subject to Your compliance with 
-Section 2 below, and Section 8.10 of the Research Use license; in addition to 
-the Research Use license and the TCK license, Original Contributor grants to You 
-a worldwide, non-exclusive license, to the extent of Original Contributor's 
-Intellectual Property Rights covering the Original Code, Upgraded Code and 
+This Attachment C is only effective for the Technology
+specified in Attachment B, upon execution of Attachment D
+(Commercial Use License) including the requirement to pay
+royalties.  In the event of a conflict between the terms of
+this Attachment C and Attachment D, the terms of Attachment
+D shall govern.
+
+1.  Internal Deployment License Grant.  Subject to Your
+compliance with Section 2 below, and Section 8.10 of the
+Research Use license; in addition to the Research Use
+license and the TCK license, Original Contributor grants to
+You a worldwide, non-exclusive license, to the extent of
+Original Contributor's Intellectual Property Rights covering
+the Original Code, Upgraded Code and Specifications, to do
+the following:
+
+a) reproduce and distribute internally, Original Code and
+Upgraded Code as part of Compliant Covered Code, and
+Specifications, for Internal Deployment Use,
+
+b) compile such Original Code and Upgraded Code, as part of
+Compliant Covered Code, and reproduce and distribute
+internally the same in Executable form for Internal
+Deployment Use, and
+
+c) reproduce and distribute internally, Reformatted
+Specifications for use in connection with Internal
+Deployment Use.
+
+2.  Additional Requirements and Responsibilities.  In
+addition to the requirements and responsibilities described
+under Section 3.1 of the Research Use license, and as a
+condition to exercising the rights granted under Section 3
+above, You agree to the following additional requirements
+and responsibilities:
+
+2.1 Compatibility.  All Covered Code must be Compliant
+Covered Code prior to any Internal Deployment Use or
+Commercial Use, whether originating with You or acquired
+from a third party.  Successful compatibility testing must
+be completed in accordance with the TCK License.  If You
+make any further Modifications to any Covered Code
+previously determined to be Compliant Covered Code, you must
+ensure that it continues to be Compliant Covered Code.
+
+ATTACHMENT D COMMERCIAL USE LICENSE
+
+1.  Effect.  This Attachment D is effective only if signed
+below by You and Original Contributor, and applies to Your
+Commercial Use of Original Code and Upgraded Code.
+
+2.  Term.  Upon execution of this Attachment D by You and
+Original Contributor, this Commercial Use license shall have
+an initial term of 3 years and shall automatically renew for
+additional one year terms unless either party provides
+notice to the other no less than 60 days prior to an
+anniversary date.
+
+3.  Commercial Use License Grant.  Subject to Your
+compliance with Section 4 below, Section 8.10 of the
+Research Use license, and the TCK license; in addition to
+the Research Use license, the TCK license, and the Internal
+Deployment Use license, Original Contributor grants to You a
+worldwide, non-exclusive, non-transferable license, to the
+extent of Original Contributor's Intellectual Property
+Rights covering the Original Code, Upgraded Code and
 Specifications, to do the following:
 
-a)	reproduce and distribute internally, Original Code and Upgraded Code as 
-part of Compliant Covered Code, and Specifications, for Internal Deployment Use,
- 
-b)	compile such Original Code and Upgraded Code, as part of Compliant 
-Covered Code, and reproduce and distribute internally the same in Executable 
-form for Internal Deployment Use, and
-
-c)	reproduce and distribute internally, Reformatted Specifications for use 
-in connection with Internal Deployment Use.
- 
- 2.	Additional Requirements and Responsibilities. In addition to the 
-requirements and responsibilities described under Section 3.1 of the Research 
-Use license, and as a condition to exercising the rights granted under Section 3 
-above, You agree to the following additional requirements and responsibilities:
- 
-2.1	Compatibility. All Covered Code must be Compliant Covered Code prior to 
-any Internal Deployment Use or Commercial Use, whether originating with You or 
-acquired from a third party. Successful compatibility testing must be completed 
-in accordance with the TCK License. If You make any further Modifications to any 
-Covered Code previously determined to be Compliant Covered Code, You must ensure 
-that it continues to be Compliant Covered Code.
-
-
-
-ATTACHMENT D
-COMMERCIAL USE LICENSE
- 
-1.	Effect. This Attachment D is effective only if signed below by You and 
-Original Contributor, and applies to Your Commercial Use of Original Code and 
-Upgraded Code.
- 
-2.	Term. Upon execution of this Attachment D by You and Original 
-Contributor, this Commercial Use license shall have an initial term of 3 years 
-and shall automatically renew for additional one year terms unless either party 
-provides notice to the other no less than 60 days prior to an anniversary date.
- 
-3.	Commercial Use License Grant. Subject to Your compliance with Section 4 
-below, Section 8.10 of the Research Use license, and the TCK license; in 
-addition to the Research Use license, the TCK license, and the Internal 
-Deployment Use license, Original Contributor grants to You a worldwide, 
-non-exclusive, non-transferable license, to the extent of Original Contributor's 
-Intellectual Property Rights covering the Original Code, Upgraded Code and 
-Specifications, to do the following:
-
-a)	reproduce and distribute Compliant Covered Code;
-
-b)	compile Compliant Covered Code and reproduce and distribute the same in 
-Executable form through multiple tiers of distribution; and
-
-c)	reproduce and distribute Reformatted Specifications in association with 
-Compliant Covered Code.				
-
-4.	Additional Requirements and Responsibilities. In addition to the 
-requirements and responsibilities specified in the Research Use license, the TCK 
-license and the Internal Deployment license, and as a condition to exercising 
-the rights granted in Section 3 above, You agree to the following additional 
-requirements and responsibilities:
-
-a)	Distribution of Source Code. Source Code of Compliant Covered Code may 
-be distributed     only to another Licensee of the same Technology.
-
-b)	Distribution of Executable Code. You may distribute the Executable 
-version(s) of Compliant Covered Code under a license of Your choice, which may 
-contain terms different from this License, provided (i) that You are in 
-compliance with the terms of this License, and (ii) You must make it absolutely 
-clear that any terms which differ from this License are offered by You alone, 
-not by Original Contributor or any other Contributor. 
-
-c)	Branding. Products integrating Compliant Covered Code used for 
-Commercial Use must be branded with the Technology compliance logo under a 
-separate trademark license required to be executed by You and Original 
-Contributor concurrent with execution of this Attachment D.
- 
-5.	Indemnity/Limitation of Liability. The provisions of Section 7.1 of the 
-Research Use license are superseded by the following:
-
-a)	Your Indemnity Obligation. You hereby agree to defend, at Your expense, 
-any legal proceeding brought against Original Contributor or any Licensee to the 
-extent it is based on a claim: (i) that the use, reproduction or distribution of 
-any of Your Error Corrections or Shared Modifications is an infringement of a 
-third party trade secret or a copyright in a country that is a signatory to the 
-Berne Convention; (ii) arising in connection with any representation, warranty, 
-support, indemnity, liability or other license terms You may offer in connection 
-with any Covered Code; or (iii) arising from Your Commercial Use of Covered 
-Code, other than a claim covered by Section 5.b) below, or a patent claim based 
-solely on Covered Code not provided by You. You will pay all damages costs and 
-fees awarded by a court of competent jurisdiction, or such settlement amount 
-negotiated by You, attributable to such claim.
-
-b)	Original Contributor's Indemnity Obligation. Original Contributor will 
-defend, at its expense, any legal proceeding brought against You, to the extent 
-it is based on a claim that Your authorized Commercial Use of Original Code and 
-Upgraded Code is an infringement of a third party trade secret or a copyright in 
-a country that is a signatory to the Berne Convention, and will pay all damages 
-costs and fees awarded by a court of competent jurisdiction, or such settlement 
-amount negotiated by Original Contributor, attributable to such claim. The 
-foregoing shall not apply to any claims of intellectual property infringement 
-based upon the combination of code or documentation supplied by Original 
-Contributor with code, technology or documentation from other sources.
-
-c)	Right of Intervention. Original Contributor will have the right, but not 
-the obligation, to defend You, at Original Contributor's expense, in connection 
-with a claim that Your Commercial Use of Original Code and Upgraded Code is an 
-infringement of a third party patent and will, if Original Contributor chooses 
-to defend You, pay all damages costs and fees awarded by a court of competent 
-jurisdiction, or such settlement amount negotiated by Original Contributor, 
-attributable to such claim.
-
-d)	Prerequisites. Under Sections 5.b) and c) above, You must, and under 
-Section 5.a) above, Original Contributor or any Licensee must: (i) provide 
-notice of the claim promptly to the party providing an indemnity; (ii) give the 
-indemnifying party sole control of the defense and settlement of the claim; 
-(iii) provide the indemnifying party, at indemnifying party's expense, all 
-available information, assistance and authority to defend; and (iv) not have 
-compromised or settled such claim or proceeding without the indemnifying party's 
-prior written consent. 
-
-e)	Additional Remedies. Should any Original Code, Upgraded Code, TCK, 
-Specifications, or Modifications become, or in the indemnifying party's opinion 
-be likely to become, the subject of a claim of infringement for which indemnity 
-is provided above, the indemnifying party may, at its sole option, attempt to 
-procure on reasonable terms the rights necessary for the indemnified party to 
-exercise its license rights under this License with respect to the infringing 
-items, or to modify the infringing items so that they are no longer infringing 
-without substantially impairing their function or performance. If the 
-indemnifying party is unable to do the foregoing after reasonable efforts, then 
-the indemnifying party may send a notice of such inability to the indemnified 
-party together with a refund of any license fees received by the indemnifying 
-party from the indemnified party for the infringing items applicable to the 
-indemnified party's future use or distribution of such infringing items, in 
-which case the indemnifying party will not be liable for any damages resulting 
-from infringing activity with respect to the infringing items occurring after 
-such notice and refund.
-
-6.	Support Programs.
-
-Support to You. Technical support is not provided to You by Original Contributor 
-under this License. You may contract for one or more support programs from 
-Original Contributor relating to the Technology which are described on the SCSL 
+a) reproduce and distribute Compliant Covered Code;
+
+b) compile Compliant Covered Code and reproduce and
+distribute the same in Executable form through multiple
+tiers of distribution; and
+
+c) reproduce and distribute Reformatted Specifications in
+association with Compliant Covered Code.
+
+4.  Additional Requirements and Responsibilities.  In
+addition to the requirements and responsibilities specified
+in the Research Use license, the TCK license and the
+Internal Deployment license, and as a condition to
+exercising the rights granted in Section 3 above, You agree
+to the following additional requirements and
+responsibilities:
+
+a) Distribution of Source Code.  Source Code of Compliant
+Covered Code may be distributed only to another Licensee of
+the same Technology.
+
+b) Distribution of Executable Code.  You may distribute the
+Executable version(s) of Compliant Covered Code under a
+license of Your choice, which may contain terms different
+from this License, provided (i) that You are in compliance
+with the terms of this License, and (ii) You must make it
+absolutely clear that any terms which differ from this
+License are offered by You alone, not by Original
+Contributor or any other Contributor.
+
+c) Branding.  Products integrating Compliant Covered Code
+used for Commercial Use must be branded with the Technology
+compliance logo under a separate trademark license required
+to be executed by You and Original Contributor concurrent
+with execution of this Attachment D.
+
+5.  Indemnity/Limitation of Liability.  The provisions of
+Section 7.1 of the Research Use license are superseded by
+the following:
+
+a) Your Indemnity Obligation.  You hereby agree to defend,
+at Your expense, any legal proceeding brought against
+Original Contributor or any Licensee to the extent it is
+based on a claim:  (i) that the use, reproduction or
+distribution of any of Your Error Corrections or Shared
+Modifications is an infringement of a third party trade
+secret or a copyright in a country that is a signatory to
+the Berne Convention; (ii) arising in connection with any
+representation, warranty, support, indemnity, liability or
+other license terms You may offer in connection with any
+Covered Code; or (iii) arising from Your Commercial Use of
+Covered Code, other than a claim covered by Section 5.b)
+below, or a patent claim based solely on Covered Code not
+provided by You.  You will pay all damages costs and fees
+awarded by a court of competent jurisdiction, or such
+settlement amount negotiated by You, attributable to such
+claim.
+
+b) Original Contributor's Indemnity Obligation.  Original
+Contributor will defend, at its expense, any legal
+proceeding brought against You, to the extent it is based on
+a claim that Your authorized Commercial Use of Original Code
+and Upgraded Code is an infringement of a third party trade
+secret or a copyright in a country that is a signatory to
+the Berne Convention, and will pay all damages costs and
+fees awarded by a court of competent jurisdiction, or such
+settlement amount negotiated by Original Contributor,
+attributable to such claim.  The foregoing shall not apply
+to any claims of intellectual property infringement based
+upon the combination of code or documentation supplied by
+Original Contributor with code, technology or documentation
+from other sources.
+
+c) Right of Intervention.  Original Contributor will have
+the right, but not the obligation, to defend You, at
+Original Contributor's expense, in connection with a claim
+that Your Commercial Use of Original Code and Upgraded Code
+is an infringement of a third party patent and will, if
+Original Contributor chooses to defend You, pay all damages
+costs and fees awarded by a court of competent jurisdiction,
+or such settlement amount negotiated by Original
+Contributor, attributable to such claim.
+
+d) Prerequisites.  Under Sections 5.b) and c) above, You
+must, and under Section 5.a) above, Original Contributor or
+any Licensee must:  (i) provide notice of the claim promptly
+to the party providing an indemnity; (ii) give the
+indemnifying party sole control of the defense and
+settlement of the claim; (iii) provide the indemnifying
+party, at indemnifying party's expense, all available
+information, assistance and authority to defend; and (iv)
+not have compromised or settled such claim or proceeding
+without the indemnifying party's prior written consent.
+
+e) Additional Remedies.  Should any Original Code, Upgraded
+Code, TCK, Specifications, or Modifications become, or in
+the indemnifying party's opinion be likely to become, the
+subject of a claim of infringement for which indemnity is
+provided above, the indemnifying party may, at its sole
+option, attempt to procure on reasonable terms the rights
+necessary for the indemnified party to exercise its license
+rights under this License with respect to the infringing
+items, or to modify the infringing items so that they are no
+longer infringing without substantially impairing their
+function or performance.  If the indemnifying party is
+unable to do the foregoing after reasonable efforts, then
+the indemnifying party may send a notice of such inability
+to the indemnified party together with a refund of any
+license fees received by the indemnifying party from the
+indemnified party for the infringing items applicable to the
+indemnified party's future use or distribution of such
+infringing items, in which case the indemnifying party will
+not be liable for any damages resulting from infringing
+activity with respect to the infringing items occurring
+after such notice and refund.
+
+6.  Support Programs.
+
+Support to You.  Technical support is not provided to You by
+Original Contributor under this License.  You may contract
+for one or more support programs from Original Contributor
+relating to the Technology which are described on the SCSL
 Webpage.
 
-Customer Support. You are responsible for providing technical and maintenance 
-support services to Your customers for Your products and services incorporating 
-the Compliant Covered code. 
- 
-7.	Royalties and Payments.
+Customer Support.  You are responsible for providing
+technical and maintenance support services to Your customers
+for Your products and services incorporating the Compliant
+Covered code.
+
+7.  Royalties and Payments.
 
 Technology specified in Attachment B.
- 
-
-Field of Use:____________________			
-
-Royalty per Unit $_______________
-
-
-b)	Royalty Payments. Payment of royalties shall be made quarterly, shall be 
-due thirty (30) days following the end of the calendar quarter to which they 
-relate and shall be submitted with a written statement documenting the basis for 
-the royalty calculation. 
-
-c)	Taxes. All payments required by this License shall be made in United 
-States dollars, are exclusive of taxes, and Licensee agrees to bear and be 
-responsible for the payment of all such taxes, including, but not limited to, 
-all sales, use, rental receipt, personal property or other taxes and their 
-equivalents which may be levied or assessed in connection with this License 
-(excluding only taxes based on Original Contributor's net income). To the extent 
-Licensee is required to withhold taxes based upon Original Contributor's income 
-in any country, You agree to provide Original Contributor with written evidence 
-of such withholding, suitable for Original Contributor to obtain a tax credit in 
-the United States.
-
-d)	Records. You agree to maintain account books and records consistent with 
-Generally Accepted Accounting Principles appropriate to Your domicile, as may be 
-in effect from time to time, sufficient to allow the correctness of the 
-royalties required to be paid pursuant to this License to be determined.				
-
-e)	Audit Rights. Original Contributor shall have the right to audit such 
-accounts upon reasonable prior notice using an independent auditor of Original 
-Contributor's choice (the "Auditor"). The Auditor shall be bound to keep 
-confidential the details of Your business affairs and to limit disclosure of the 
-results of any audit to the sufficiency of the accounts and the amount, if any, 
-of a payment adjustment that should be made. Such audits shall not occur more 
-than once each year (unless discrepancies are discovered in excess of the five 
-percent (5%) threshold set forth in Section 7.f) below, in which case two 
-consecutive quarters per year may be audited). Except as set forth in Section 
-7.f) below, Original Contributor shall bear all costs and expenses associated 
-with the exercise of its rights to audit.
- 
-f)	Payment Errors. In the event that any errors in payments shall be 
-determined, such errors shall be corrected by appropriate adjustment in payment 
-for the quarterly period during which the error is discovered. In the event of 
-an underpayment of more than five percent (5%) of the proper amount owed, upon 
-such underpayment being properly determined by the Auditor, You agree to 
-reimburse Original Contributor the amount of the underpayment and all reasonable 
-costs and expenses associated with the exercise of its rights to audit, and 
-interest on the overdue amount at the maximum allowable interest rate from the 
-date of accrual of such obligation. 
-
-8.	Notice of Breach or Infringement. Each party shall notify the other 
-immediately in writing when it becomes aware of any breach or violation of the 
-terms of this License, or when You become aware of any potential or actual 
-infringement by a third party of the Technology or Sun's Intellectual Property 
-Rights therein. 
- 
-9.	Proprietary Rights Notices. You may not remove any copyright notices, 
-trademark notices or other proprietary legends of Original Contributor or its 
-suppliers contained on or in the Original Code, Upgraded Code and 
+
+Field of Use:____________________
+
+Royalty per Unit $_____________
+
+b) Royalty Payments.  Payment of royalties shall be made
+quarterly, shall be due thirty (30) days following the end
+of the calendar quarter to which they relate and shall be
+submitted with a written statement documenting the basis for
+the royalty calculation.
+
+c) Taxes.  All payments required by this License shall be
+made in United States dollars, are exclusive of taxes, and
+Licensee agrees to bear and be responsible for the payment
+of all such taxes, including, but not limited to, all sales,
+use, rental receipt, personal property or other taxes and
+their equivalents which may be levied or assessed in
+connection with this License (excluding only taxes based on
+Original Contributor's net income).  To the extent Licensee
+is required to withhold taxes based upon Original
+Contributor's income in any country, You agree to provide
+Original Contributor with written evidence of such
+withholding, suitable for Original Contributor to obtain a
+tax credit in the United States.
+
+d) Records.  You agree to maintain account books and records
+consistent with Generally Accepted Accounting Principles
+appropriate to Your domicile, as may be in effect from time
+to time, sufficient to allow the correctness of the
+royalties required to be paid pursuant to this License to be
+determined.
+
+e) Audit Rights.  Original Contributor shall have the right
+to audit such accounts upon reasonable prior notice using an
+independent auditor of Original Contributor's choice (the
+"Auditor").  The Auditor shall be bound to keep confidential
+the details of Your business affairs and to limit disclosure
+of the results of any audit to the sufficiency of the
+accounts and the amount, if any, of a payment adjustment
+that should be made.  Such audits shall not occur more than
+once each year (unless discrepancies are discovered in
+excess of the five percent (5%) threshold set forth in
+Section 7.f) below, in which case two consecutive quarters
+per year may be audited).  Except as set forth in Section
+7.f) below, Original Contributor shall bear all costs and
+expenses associated with the exercise of its rights to
+audit.
+
+f) Payment Errors.  In the event that any errors in payments
+shall be determined, such errors shall be corrected by
+appropriate adjustment in payment for the quarterly period
+during which the error is discovered.  In the event of an
+underpayment of more than five percent (5%) of the proper
+amount owed, upon such underpayment being properly
+determined by the Auditor, You agree to reimburse Original
+Contributor the amount of the underpayment and all
+reasonable costs and expenses associated with the exercise
+of its rights to audit, and interest on the overdue amount
+at the maximum allowable interest rate from the date of
+accrual of such obligation.
+
+8.  Notice of Breach or Infringement.  Each party shall
+notify the other immediately in writing when it becomes
+aware of any breach or violation of the terms of this
+License, or when You become aware of any potential or actual
+infringement by a third party of the Technology or Sun's
+Intellectual Property Rights therein.
+
+9.  Proprietary Rights Notices.  You may not remove any
+copyright notices, trademark notices or other proprietary
+legends of Original Contributor or its suppliers contained
+on or in the Original Code, Upgraded Code and
 Specifications.
- 
-10.	Notices. All written notices required by this License must be delivered 
-in person or by means evidenced by a delivery receipt and will be effective upon 
-receipt by the persons at the addresses specified below.
-
-
-Original Contributor:				You:
-
-Sun Microsystems, Inc.				_____________________________
- 
-901 San Antonio Road				______________________________
-
-Palo Alto, California 94303			______________________________
- 
-Attn.: VP, Sun Software and 
-Technology Sales				______________________________
- 
-cc: Sun Software and Technology, 
-General Counsel
- 
-11.	Disclaimer of Agency. The relationship created hereby is that of 
-licensor and licensee and the parties hereby acknowledge and agree that nothing 
-herein shall be deemed to constitute You as a franchisee of Original 
-Contributor. You hereby waive the benefit of any state or federal statutes 
-dealing with the establishment and regulation of franchises.												
- 
- Agreed:
-
-You:						Original Contributor:
-
-_____________________________			Sun Microsystems, Inc.
-(Your Name)						 
-
-By:__________________________			By:________________________
-
-Name:________________________			Name:______________________
- 
-Title_________________________			Title:_____________________
- 
-Date:_________________________			Date:______________________
-
-
-
-
-ATTACHMENT E 
-TECHNOLOGY COMPATIBILITY KIT
- 
-The following license is effective for the Java(tm)2 SDK Version 1.3.1 
-Technology Compatibility Kit only upon execution of a separate support agreement 
-between You and Original Contributor (subject to an annual fee) as described on 
-the SCSL Webpage. The Technology Compatibility Kit for the Technology specified 
-in Attachment B may be accessed at the Technology Download Site only upon 
-execution of the support agreement.
- 
-1.	TCK License.
-
-a)	Subject to the restrictions set forth in Section 1.b below and Section 
-8.10 of the Research Use license, in addition to the Research Use license, 
-Original Contributor grants to You a worldwide, non-exclusive, non-transferable 
-license, to the extent of Original Contributor's Intellectual Property Rights in 
-the TCK (without the right to sublicense), to use the TCK to develop and test 
-Covered Code.
- 
-b)	TCK Use Restrictions. You are not authorized to create derivative works 
-of the TCK or use the TCK to test any implementation of the Specification that 
-is not Covered Code. You may not publish Your test results or make claims of 
-comparative compatibility with respect to other implementations of the 
-Specification. In consideration for the license grant in Section 1.a above You 
-agree not to develop Your own tests which are intended to validate conformation 
-with the Specification.
-
-2.	Requirements for Determining Compliance.
- 
-2.1	Definitions.
-
-a)	"Added Value" means code which:
-
-	(i)	has a principal purpose which is substantially different from 
-that of the stand-alone Technology; 
-
-	(ii)	represents a significant functional and value enhancement to the 
-Technology;
-
-	(iii) 	operates in conjunction with the Technology; and
-
-	(iv)	is not marketed as a technology which replaces or substitutes 
-for the Technology.
-
-b)	“"Java Classes" means the specific class libraries associated with each 
-Technology defined in Attachment B.
-
-c)	“"Java Runtime Interpreter" means the program(s) which implement the 
-Java virtual machine for the Technology as defined in the Specification.
-
-d)	“"Platform Dependent Part" means those Original Code and Upgraded Code 
-files of the Technology which are not in a "share" directory or subdirectory 
-thereof.
 
-e)	“"Shared Part" means those Original Code and Upgraded Code files of the 
-Technology which are identified as "shared" (or words of similar meaning) or 
-which are in any "share" directory or subdirectory thereof, except those files 
-specifically designated by Original Contributor as modifiable.
+10.  Notices.  All written notices required by this License
+must be delivered in person or by means evidenced by a
+delivery receipt and will be effective upon receipt by the
+persons at the addresses specified below.
+
+Original Contributor:  		You:
 
-f)	 "User's Guide" means the users guide for the TCK which Sun makes 
-available to You to provide direction in how to run the TCK and properly 
-interpret the results, as may be revised by Sun from time to time.
+Sun Microsystems, Inc.  	_____________________________
 
-2.2	Development Restrictions. Compliant Covered Code:
+4150 Network Circle 		______________________________
 
-a)	must include Added Value;
+Santa Clara, California 95054 	______________________________
 
-b)	must fully comply with the Specifications for the Technology specified 
-in Attachment B;
+Attn.:  VP, Sun Software and 
+Technology Sales		______________________________
+cc:  Legal (Software Sales) 
 
-c)	must include the Shared Part, complete and unmodified;
+11.  Disclaimer of Agency.  The relationship created hereby
+is that of licensor and licensee and the parties hereby
+acknowledge and agree that nothing herein shall be deemed to
+constitute You as a franchisee of Original Contributor.  You
+hereby waive the benefit of any state or federal statutes
+dealing with the establishment and regulation of franchises.
 
-d)	may not modify the functional behavior of the Java Runtime Interpreter 
-or the Java Classes;
+Agreed:
 
-e)	may not modify, subset or superset the interfaces of the Java Runtime 
-Interpreter or the Java Classes;
+You: 				Original Contributor:
 
-f)	may not subset or superset the Java Classes; and
+_____________________________ 	Sun Microsystems, Inc.
+(Your Name) 
 
-g)	may not modify or extend the required public class or public interface 
-declarations whose names begin with "java", "javax", "jini", "net.jini", 
-"sun.hotjava", "COM.sun" or their equivalents in any subsequent naming 
-convention.
+By:_________________________	By:_____________________
 
-2.3	Compatibility Testing. Successful compatibility testing must be 
-completed by You, or at Original Contributor's option, a third party designated 
-by Original Contributor, to conduct such tests, in accordance with the User's 
-Guide, and using the most current version of the applicable TCK available from 
-Original Contributor one hundred twenty (120) days (two hundred forty [240] days 
-in the case of silicon implementations) prior to: (i) Your Internal Deployment 
-Use; and (ii) each release of Compliant Covered Code by You for Commercial Use. 
-In the event that You elect to use a version of Upgraded Code that is newer than 
-that which is required under this Section 2.3, then You agree to pass the 
-version of the TCK that corresponds to such newer version of Upgraded Code.
+Title:_______________________	Title:____________________
 
-2.4	Test Results. You agree to provide to Original Contributor or the third 
-party test facility if applicable, Your test results that demonstrate that 
-Covered Code is Compliant Covered Code and that Original Contributor may publish 
-or otherwise distribute such test results.
+Date:______________________ 	Date:____________________
 
+ATTACHMENT E TECHNOLOGY COMPATIBILITY KIT
+
+The following license is effective for the Java(tm)2 SDK
+Technology Compatibility Kit only upon execution
+of a separate support agreement between You and Original
+Contributor (subject to an annual fee) as described on the
+SCSL Webpage.  The Technology Compatibility Kit for the
+Technology specified in Attachment B may be accessed at the
+Technology Download Site only upon execution of the support
+agreement.
+
+1.  TCK License.
+
+a) Subject to the restrictions set forth in Section 1.b
+below and Section 8.10 of the Research Use license, in
+addition to the Research Use license, Original Contributor
+grants to You a worldwide, non-exclusive, non-transferable
+license, to the extent of Original Contributor's
+Intellectual Property Rights in the TCK (without the right
+to sublicense), to use the TCK to develop and test Covered
+Code.
+
+b) TCK Use Restrictions.  You are not authorized to create
+derivative works of the TCK or use the TCK to test any
+implementation of the Specification that is not Covered
+Code.  You may not publish your test results or make claims
+of comparative compatibility with respect to other
+implementations of the Specification.  In consideration for
+the license grant in Section 1.a above you agree not to
+develop your own tests which are intended to validate
+conformation with the Specification.
+
+2.  Requirements for Determining Compliance.
+
+2.1 Definitions.
+
+a) "Added Value" means code which:
+
+(i) has a principal purpose which is substantially different
+from that of the stand-alone Technology;
+
+(ii) represents a significant functional and value
+enhancement to the Technology;
+
+(iii) operates in conjunction with the Technology; and
+
+(iv) is not marketed as a technology which replaces or
+substitutes for the Technology.
+
+b) "Java Classes" means the specific class libraries
+associated with each Technology defined in Attachment B.
+
+c) "Java Runtime Interpreter" means the program(s) which
+implement the Java virtual machine for the Technology as
+defined in the Specification.
+
+d) "Platform Dependent Part" means those Original Code and
+Upgraded Code files of the Technology which are not in a
+"share" directory or subdirectory thereof.
+
+e) "Shared Part" means those Original Code and Upgraded Code
+files of the Technology which are identified as "shared" (or
+words of similar meaning) or which are in any "share"
+directory or subdirectory thereof, except those files
+specifically designated by Original Contributor as
+modifiable.
+
+f) "User's Guide" means the users guide for the TCK which
+Sun makes available to You to provide direction in how to
+run the TCK and properly interpret the results, as may be
+revised by Sun from time to time.
+
+2.2 Development Restrictions.  Compliant Covered Code:
+
+a) must include Added Value;
+
+b) must fully comply with the Specifications for the
+Technology specified in Attachment B;
+
+c) must include the Shared Part, complete and unmodified;
+
+d) may not modify the functional behavior of the Java
+Runtime Interpreter or the Java Classes;
+
+e) may not modify, subset or superset the interfaces of the
+Java Runtime Interpreter or the Java Classes;
+
+f) may not subset or superset the Java Classes; and
+
+g) may not modify or extend the required public class or
+public interface declarations whose names begin with "java",
+"javax", "jini", "net.jini", "sun.hotjava", "COM.sun" or
+their equivalents in any subsequent naming convention.
+
+2.3 Compatibility Testing.  Successful compatibility testing
+must be completed by You, or at Original Contributor's
+option, a third party designated by Original Contributor, to
+conduct such tests, in accordance with the User's Guide, and
+using the most current version of the applicable TCK
+available from Original Contributor one hundred twenty (120)
+days (two hundred forty [240] days in the case of silicon
+implementations) prior to:  (i) Your Internal Deployment
+Use; and (ii) each release of Compliant Covered Code by You
+for Commercial Use.  In the event that You elect to use a
+version of Upgraded Code that is newer than that which is
+required under this Section 2.3, then You agree to pass the
+version of the TCK that corresponds to such newer version of
+Upgraded Code.
 
+2.4 Test Results.  You agree to provide to Original
+Contributor or the third party test facility if applicable,
+Your test results that demonstrate that Covered Code is
+Compliant Covered Code and that Original Contributor may
+publish or otherwise distribute such test results.
+
+ATTACHMENT F ADDITIONAL REQUIREMENTS AND RESPONSIBILITIES
+
+Original Contributor and/or its licensors grant You a non-exclusive and
+non-transferable license for the internal use only of any fonts
+accompanying the Technology.  Title to fonts and all associated
+intellectual property rights are retained by Original Contributor
+and/or its licensors. Unless enforcement is prohibited by applicable law, 
+You may not modify, decompile, or reverse engineer the fonts. 
+You may not redistribute the fonts in any form.
 
diff --git a/java/jdk14/pkg-plist b/java/jdk14/pkg-plist
index 1563ab802105..9cd59d47ecc3 100644
--- a/java/jdk14/pkg-plist
+++ b/java/jdk14/pkg-plist
@@ -1,150 +1,32 @@
 jdk%%JDK_VERSION%%/COPYRIGHT
 jdk%%JDK_VERSION%%/LICENSE
-jdk%%JDK_VERSION%%/LICENSE.fr
 jdk%%JDK_VERSION%%/README
 jdk%%JDK_VERSION%%/README.html
-jdk%%JDK_VERSION%%/bin/.java_wrapper
-%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/ControlPanel
-%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/HtmlConverter
 jdk%%JDK_VERSION%%/bin/appletviewer
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/appletviewer_g
-jdk%%JDK_VERSION%%/bin/awt_robot
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/awt_robot_g
 jdk%%JDK_VERSION%%/bin/extcheck
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/extcheck_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/appletviewer
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/appletviewer_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/extcheck
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/extcheck_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/idlj
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/idlj_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/jar
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jar_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/jarsigner
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jarsigner_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/java
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_g
-%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_vm
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_vm_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/javac
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javac_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/javadoc
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javadoc_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/javah
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javah_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/javap
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javap_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/jdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jdb_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/keytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/keytool_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/native2ascii
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/native2ascii_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjava
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjava_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjavac
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjavac_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjdb_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/policytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/policytool_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/rmic
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/rmic_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/rmid
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/rmid_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/rmiregistry
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/rmiregistry_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/serialver
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/serialver_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/tnameserv
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/tnameserv_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/appletviewer
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/appletviewer_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/extcheck
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/extcheck_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/idlj
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/idlj_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jar
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jar_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jarsigner
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jarsigner_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_g
-%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javac
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javac_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javadoc
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javadoc_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javah
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javah_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javap
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javap_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jdb
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jdb_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/keytool
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/keytool_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/native2ascii
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/native2ascii_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjava
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjava_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjavac
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjavac_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjdb
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjdb_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/policytool
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/policytool_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmic
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmic_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmid
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmid_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmiregistry
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmiregistry_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/serialver
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/serialver_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/tnameserv
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/tnameserv_g
 jdk%%JDK_VERSION%%/bin/idlj
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/idlj_g
 jdk%%JDK_VERSION%%/bin/jar
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jar_g
 jdk%%JDK_VERSION%%/bin/jarsigner
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jarsigner_g
 jdk%%JDK_VERSION%%/bin/java
 jdk%%JDK_VERSION%%/bin/java-rmi.cgi
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/java_g
 jdk%%JDK_VERSION%%/bin/javac
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javac_g
 jdk%%JDK_VERSION%%/bin/javadoc
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javadoc_g
 jdk%%JDK_VERSION%%/bin/javah
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javah_g
 jdk%%JDK_VERSION%%/bin/javap
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javap_g
 jdk%%JDK_VERSION%%/bin/jdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jdb_g
 jdk%%JDK_VERSION%%/bin/keytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/keytool_g
+jdk%%JDK_VERSION%%/bin/kinit
+jdk%%JDK_VERSION%%/bin/klist
+jdk%%JDK_VERSION%%/bin/ktab
 jdk%%JDK_VERSION%%/bin/native2ascii
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/native2ascii_g
-jdk%%JDK_VERSION%%/bin/oldjava
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/oldjava_g
-jdk%%JDK_VERSION%%/bin/oldjavac
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/oldjavac_g
-jdk%%JDK_VERSION%%/bin/oldjdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/oldjdb_g
+jdk%%JDK_VERSION%%/bin/orbd
 jdk%%JDK_VERSION%%/bin/policytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/policytool_g
 jdk%%JDK_VERSION%%/bin/rmic
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmic_g
 jdk%%JDK_VERSION%%/bin/rmid
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmid_g
 jdk%%JDK_VERSION%%/bin/rmiregistry
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmiregistry_g
 jdk%%JDK_VERSION%%/bin/serialver
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/serialver_g
+jdk%%JDK_VERSION%%/bin/servertool
 jdk%%JDK_VERSION%%/bin/tnameserv
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/tnameserv_g
 jdk%%JDK_VERSION%%/demo/applets/Animator/Animation.class
 jdk%%JDK_VERSION%%/demo/applets/Animator/AnimationFrame.class
 jdk%%JDK_VERSION%%/demo/applets/Animator/Animator.class
@@ -184,8 +66,8 @@ jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcControls.class
 jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcTest.class
 jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcTest.java
 jdk%%JDK_VERSION%%/demo/applets/ArcTest/example1.html
-jdk%%JDK_VERSION%%/demo/applets/BarChart/Chart.class
-jdk%%JDK_VERSION%%/demo/applets/BarChart/Chart.java
+jdk%%JDK_VERSION%%/demo/applets/BarChart/BarChart.class
+jdk%%JDK_VERSION%%/demo/applets/BarChart/BarChart.java
 jdk%%JDK_VERSION%%/demo/applets/BarChart/example1.html
 jdk%%JDK_VERSION%%/demo/applets/Blink/Blink$1.class
 jdk%%JDK_VERSION%%/demo/applets/Blink/Blink.class
@@ -195,8 +77,8 @@ jdk%%JDK_VERSION%%/demo/applets/CardTest/CardPanel.class
 jdk%%JDK_VERSION%%/demo/applets/CardTest/CardTest.class
 jdk%%JDK_VERSION%%/demo/applets/CardTest/CardTest.java
 jdk%%JDK_VERSION%%/demo/applets/CardTest/example1.html
-jdk%%JDK_VERSION%%/demo/applets/Clock/Clock2.class
-jdk%%JDK_VERSION%%/demo/applets/Clock/Clock2.java
+jdk%%JDK_VERSION%%/demo/applets/Clock/Clock.class
+jdk%%JDK_VERSION%%/demo/applets/Clock/Clock.java
 jdk%%JDK_VERSION%%/demo/applets/Clock/example1.html
 jdk%%JDK_VERSION%%/demo/applets/DitherTest/DitherCanvas.class
 jdk%%JDK_VERSION%%/demo/applets/DitherTest/DitherControls.class
@@ -279,8 +161,8 @@ jdk%%JDK_VERSION%%/demo/applets/ImageMap/example1.html
 jdk%%JDK_VERSION%%/demo/applets/ImageMap/imagemapcheat.html
 jdk%%JDK_VERSION%%/demo/applets/ImageMap/images/jim.graham.gif
 jdk%%JDK_VERSION%%/demo/applets/ImageMap/sources.html
-jdk%%JDK_VERSION%%/demo/applets/JumpingBox/MouseTrack.class
-jdk%%JDK_VERSION%%/demo/applets/JumpingBox/MouseTrack.java
+jdk%%JDK_VERSION%%/demo/applets/JumpingBox/JumpingBox.class
+jdk%%JDK_VERSION%%/demo/applets/JumpingBox/JumpingBox.java
 jdk%%JDK_VERSION%%/demo/applets/JumpingBox/example1.html
 jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/adapt-or-die.au
 jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/cannot.be.completed.au
@@ -357,34 +239,6 @@ jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/cube.obj
 jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/dinasaur.obj
 jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/hughes_500.obj
 jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/knoxS.obj
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess/CreateCoffees.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess/CreateCoffees.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase/CreateCoffees.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase/CreateCoffees.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess/CreateSuppliers.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess/CreateSuppliers.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase/CreateSuppliers.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase/CreateSuppliers.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr/InsertCoffees.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr/InsertCoffees.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase/InsertCoffees.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase/InsertCoffees.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess/InsertSuppliers.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess/InsertSuppliers.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase/InsertSuppliers.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase/InsertSuppliers.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/JavaDB/CAFEJAVA.MDB
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/JavaDB/CAFEJAVA.ldb
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/private.fls
 jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/FileChooserDemo.jar
 jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/README.txt
 jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images/gifIcon.gif
@@ -395,78 +249,75 @@ jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src/FileChooserDemo.java
 jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/Font2DTest.html
 jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/Font2DTest.jar
 jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_de.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_en.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_en_GB.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_ko.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/resource.data
 jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/Font2DTest.java
+jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/Font2DTestApplet.java
+jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/FontPanel.java
+jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/RangeMenu.java
 jdk%%JDK_VERSION%%/demo/jfc/Java2D/Java2Demo.html
 jdk%%JDK_VERSION%%/demo/jfc/Java2D/Java2Demo.jar
 jdk%%JDK_VERSION%%/demo/jfc/Java2D/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/AnimatingControlsSurface.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/AnimatingSurface.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/CloningFeature.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/ControlsSurface.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/CustomControls.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/CustomControlsContext.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoFonts.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoGroup.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoImages.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/GlobalControls.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/GlobalPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Intro.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Java2Demo.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Java2DemoApplet.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/MemoryMonitor.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/PerformanceMonitor.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/RunWindow.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Surface.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/TextureChooser.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Tools.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/Arcs.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/BezierAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/Curves.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/Ellipses.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/Areas.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/ClipAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/Intersection.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/Text.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors/BullsEye.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors/ColorConvert.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors/Rotator3D.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite/ACimages.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite/ACrules.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite/FadeAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/AllFonts.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/AttributedStr.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/Highlighting.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/Outline.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/Tree.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/DukeAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/ImageOps.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/JPEGFlip.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/WarpImage.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/Caps.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/Dash.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/Joins.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/LineAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix/Balls.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix/BezierScroller.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix/Stars3D.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/GradAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/Gradient.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/Texture.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/TextureAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/Append.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/CurveQuadTo.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/FillStroke.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/WindingRule.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms/Rotate.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms/SelectTx.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms/TransformAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/AnimatingControlsSurface.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/AnimatingSurface.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/CloningFeature.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/ControlsSurface.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/CustomControls.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/CustomControlsContext.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/DemoFonts.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/DemoGroup.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/DemoImages.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/DemoPanel.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/GlobalControls.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/GlobalPanel.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Intro.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Java2Demo.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Java2DemoApplet.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/MemoryMonitor.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/PerformanceMonitor.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/RunWindow.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Surface.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/TextureChooser.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Tools.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Arcs.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/BezierAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Curves.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Ellipses.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping/Areas.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping/ClipAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping/Intersection.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping/Text.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Colors/BullsEye.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Colors/ColorConvert.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Colors/Rotator3D.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Composite/ACimages.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Composite/ACrules.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Composite/FadeAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/AllFonts.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/AttributedStr.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/Highlighting.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/Outline.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/Tree.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images/DukeAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images/ImageOps.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images/JPEGFlip.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images/WarpImage.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines/Caps.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines/Dash.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines/Joins.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines/LineAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Mix/Balls.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Mix/BezierScroller.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Mix/Stars3D.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint/GradAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint/Gradient.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint/Texture.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint/TextureAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths/Append.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths/CurveQuadTo.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths/FillStroke.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths/WindingRule.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Transforms/Rotate.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Transforms/SelectTx.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Transforms/TransformAnim.java
 jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/back.gif
 jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/credits.html
 jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/duke.gif
@@ -522,9 +373,6 @@ jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleData.java
 jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleTree.java
 jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleTreeCellRenderer.java
 jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleTreeModel.java
-jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/SimpleExample.jar
-jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/src/SimpleExample.java
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/README.txt
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/Stylepad.jar
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Notepad.properties
@@ -565,7 +413,193 @@ jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/src/SwingApplet.java
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/README.txt
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2.html
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2.jar
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2Plugin.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/ant.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/bug.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/About.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/COPYRIGHT
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/apple.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/asparagus.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/banana.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/broccoli.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/cantaloupe.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/carrot.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/corn.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/grapefruit.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/grapes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/kiwi.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/onion.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/peach.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/pear.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/pepper.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/pickle.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/pineapple.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/raspberry.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/strawberry.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/tomato.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/watermelon.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/cab.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/cab_small.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/fish.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/fish_small.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/moon.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/moon_small.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/sun.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/sun_small.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/COPYRIGHT
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/ant.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/book.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/bug.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/bug2.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/crest.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/king.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/micro.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/seaweed.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Splash.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b1.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b1d.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b1p.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b1r.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b2.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b2d.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b2p.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b2r.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b3.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b3d.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b3p.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b3r.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/bl.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/bldn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/bm.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/bmdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/br.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/brdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/c.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cb.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cbr.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cbrs.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cbs.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/ml.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/mldn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/mr.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/mrdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rb.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rbp.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rbr.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rbrs.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rbs.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tl.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tldn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tm.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tmdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/toggle.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/toggledn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tr.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/trdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/brenteyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/brenthair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/brentmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/georgeseyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/georgeshair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/georgesmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/hanseyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/hanshair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/hansmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/howardeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/howardhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/howardmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jameseyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jameshair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jamesmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jeffeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jeffhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jeffmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/joneyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jonhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jonmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/laraeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/larahair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/laramouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/larryeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/larryhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/larrymouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/lisaeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/lisahair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/lisamouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/michaeleyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/michaelhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/michaelmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/philipeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/philiphair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/philipmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/scotteyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/scotthair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/scottmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser/find.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser/gifIcon.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser/help.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser/jpgIcon.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/htmldemo/back.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/htmldemo/forward.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/htmldemo/header.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/blue.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/cyan.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/gray.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/green.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/magenta.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/red.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/yellow.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/optionpane/bottle.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/optionpane/ibd.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/optionpane/ibu.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/COPYRIGHT
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/colheader.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/crayons.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/lowerleft.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/rowheader.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/upperleft.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/upperright.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/splitpane/README
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/splitpane/earth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/splitpane/moon.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/blake.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/brooke.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/david.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/ewan.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/ewan.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/hania.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/laine.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/matthew.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/stephen.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JButton.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JColorChooser.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JComboBox.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JDesktop.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JDialog.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JEditorPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JFileChooser.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JList.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JMenu.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JOptionPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JProgressBar.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JRadioButton.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JScrollBar.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JScrollPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JSlider.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JSplitPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JTabbedPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JTable.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JTree.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/ToolTip.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tooltip/cow.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/index.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/king.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/preface.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/seaweed.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/swingset.properties
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/swingset_zh_CN.properties
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/title.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/tree.txt
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/AquaTheme.java
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/BezierAnimationPanel.java
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ButtonDemo.java
@@ -608,260 +642,86 @@ jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableExample4.java
 jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableMap.java
 jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableSorter.java
 jdk%%JDK_VERSION%%/demo/jpda/examples.jar
-jdk%%JDK_VERSION%%/demo/sound/JavaSound.html
-jdk%%JDK_VERSION%%/demo/sound/JavaSound.jar
-jdk%%JDK_VERSION%%/demo/sound/README.txt
-jdk%%JDK_VERSION%%/demo/sound/media/ambient.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/bark.aiff
-jdk%%JDK_VERSION%%/demo/sound/media/bong.wav
-jdk%%JDK_VERSION%%/demo/sound/media/classical.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/modern-rock.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/sfx-medley.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/spacemusic.au
-jdk%%JDK_VERSION%%/demo/sound/media/trance.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/trippygaia1.mid
-jdk%%JDK_VERSION%%/demo/sound/src/CapturePlayback.java
-jdk%%JDK_VERSION%%/demo/sound/src/ControlContext.java
-jdk%%JDK_VERSION%%/demo/sound/src/Groove.java
-jdk%%JDK_VERSION%%/demo/sound/src/JavaSound.java
-jdk%%JDK_VERSION%%/demo/sound/src/JavaSoundApplet.java
-jdk%%JDK_VERSION%%/demo/sound/src/Juke.java
-jdk%%JDK_VERSION%%/demo/sound/src/MidiSynth.java
-jdk%%JDK_VERSION%%/demo/sound/src/TempoDial.java
-jdk%%JDK_VERSION%%/include-old/StubPreamble.h
-jdk%%JDK_VERSION%%/include-old/alloc_cache.h
-jdk%%JDK_VERSION%%/include-old/bag.h
-jdk%%JDK_VERSION%%/include-old/bool.h
-jdk%%JDK_VERSION%%/include-old/breakpoints.h
-jdk%%JDK_VERSION%%/include-old/byteorder.h
-jdk%%JDK_VERSION%%/include-old/common_exceptions.h
-jdk%%JDK_VERSION%%/include-old/debug.h
-jdk%%JDK_VERSION%%/include-old/dll.h
-jdk%%JDK_VERSION%%/include-old/exceptions.h
-jdk%%JDK_VERSION%%/include-old/freebsd/byteorder_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/gc_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/hpi_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/io_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/jawt_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/jmath_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/jvm_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/miscdefs_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/path_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/sysmacros_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/timeval_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/typedefs_md.h
-jdk%%JDK_VERSION%%/include-old/gc.h
-jdk%%JDK_VERSION%%/include-old/hpi.h
-jdk%%JDK_VERSION%%/include-old/interpreter.h
-jdk%%JDK_VERSION%%/include-old/javaString.h
-jdk%%JDK_VERSION%%/include-old/java_lang_ClassLoader.h
-jdk%%JDK_VERSION%%/include-old/java_lang_String.h
-jdk%%JDK_VERSION%%/include-old/java_lang_Thread.h
-jdk%%JDK_VERSION%%/include-old/java_lang_ThreadGroup.h
-jdk%%JDK_VERSION%%/include-old/jawt.h
-jdk%%JDK_VERSION%%/include-old/jit.h
-jdk%%JDK_VERSION%%/include-old/jmath.h
-jdk%%JDK_VERSION%%/include-old/jvm.h
-jdk%%JDK_VERSION%%/include-old/jvmdi.h
-jdk%%JDK_VERSION%%/include-old/jvmpi.h
-jdk%%JDK_VERSION%%/include-old/log.h
-jdk%%JDK_VERSION%%/include-old/monitor.h
-jdk%%JDK_VERSION%%/include-old/monitor_cache.h
-jdk%%JDK_VERSION%%/include-old/native.h
-jdk%%JDK_VERSION%%/include-old/oldnmi.h
-jdk%%JDK_VERSION%%/include-old/oobj.h
-jdk%%JDK_VERSION%%/include-old/opcodes.h
-jdk%%JDK_VERSION%%/include-old/path.h
-jdk%%JDK_VERSION%%/include-old/reflect.h
-jdk%%JDK_VERSION%%/include-old/signature.h
-jdk%%JDK_VERSION%%/include-old/sys_api.h
-jdk%%JDK_VERSION%%/include-old/threads.h
-jdk%%JDK_VERSION%%/include-old/tree.h
-jdk%%JDK_VERSION%%/include-old/typecodes.h
-jdk%%JDK_VERSION%%/include-old/typedefs.h
-jdk%%JDK_VERSION%%/include-old/utf.h
-jdk%%JDK_VERSION%%/include-old/util.h
-jdk%%JDK_VERSION%%/include-old/vmprofiler.h
-jdk%%JDK_VERSION%%/include-old/wrap.h
-jdk%%JDK_VERSION%%/include/freebsd/jawt_md.h
-jdk%%JDK_VERSION%%/include/freebsd/jni_md.h
+jdk%%JDK_VERSION%%/include/bsd/jawt_md.h
+jdk%%JDK_VERSION%%/include/bsd/jni_md.h
 jdk%%JDK_VERSION%%/include/jawt.h
 jdk%%JDK_VERSION%%/include/jni.h
 jdk%%JDK_VERSION%%/include/jvmdi.h
 jdk%%JDK_VERSION%%/include/jvmpi.h
 jdk%%JDK_VERSION%%/jre/CHANGES
 jdk%%JDK_VERSION%%/jre/COPYRIGHT
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/ControlPanel.html
 jdk%%JDK_VERSION%%/jre/LICENSE
-jdk%%JDK_VERSION%%/jre/LICENSE.fr
 jdk%%JDK_VERSION%%/jre/README
 jdk%%JDK_VERSION%%/jre/Welcome.html
-jdk%%JDK_VERSION%%/jre/bin/.java_wrapper
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/ControlPanel
-jdk%%JDK_VERSION%%/jre/bin/awt_robot
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/appletviewer
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/appletviewer_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/extcheck
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/extcheck_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/idlj
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/idlj_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jar
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jar_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jarsigner
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jarsigner_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_g
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_vm
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_vm_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javac
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javac_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javadoc
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javadoc_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javah
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javah_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javap
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javap_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jdb_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/keytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/keytool_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/native2ascii
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/native2ascii_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjava
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjava_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjavac
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjavac_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjdb_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/policytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/policytool_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmic
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmic_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmid
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmid_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmiregistry
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmiregistry_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/serialver
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/serialver_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/tnameserv
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/tnameserv_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/appletviewer_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/extcheck_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/idlj_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jar_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jarsigner_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_g
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javac_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javadoc_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javah_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javap_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jdb_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/keytool
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/keytool_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/native2ascii_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjava_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjavac_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjdb_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/policytool
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/policytool_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmic_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmid
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmid_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmiregistry
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmiregistry_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/serialver_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/tnameserv
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/tnameserv_g
 jdk%%JDK_VERSION%%/jre/bin/java
 jdk%%JDK_VERSION%%/jre/bin/keytool
+jdk%%JDK_VERSION%%/jre/bin/kinit
+jdk%%JDK_VERSION%%/jre/bin/klist
+jdk%%JDK_VERSION%%/jre/bin/ktab
+jdk%%JDK_VERSION%%/jre/bin/orbd
 jdk%%JDK_VERSION%%/jre/bin/policytool
 jdk%%JDK_VERSION%%/jre/bin/rmid
 jdk%%JDK_VERSION%%/jre/bin/rmiregistry
+jdk%%JDK_VERSION%%/jre/bin/servertool
 jdk%%JDK_VERSION%%/jre/bin/tnameserv
 jdk%%JDK_VERSION%%/jre/lib/audio/soundbank.gm
+jdk%%JDK_VERSION%%/jre/lib/charsets.jar
 jdk%%JDK_VERSION%%/jre/lib/cmm/CIEXYZ.pf
 jdk%%JDK_VERSION%%/jre/lib/cmm/GRAY.pf
 jdk%%JDK_VERSION%%/jre/lib/cmm/LINEAR_RGB.pf
 jdk%%JDK_VERSION%%/jre/lib/cmm/PYCC.pf
 jdk%%JDK_VERSION%%/jre/lib/cmm/sRGB.pf
 jdk%%JDK_VERSION%%/jre/lib/content-types.properties
+jdk%%JDK_VERSION%%/jre/lib/ext/dnsns.jar
+jdk%%JDK_VERSION%%/jre/lib/ext/ldapsec.jar
+jdk%%JDK_VERSION%%/jre/lib/ext/localedata.jar
+jdk%%JDK_VERSION%%/jre/lib/ext/sunjce_provider.jar
 jdk%%JDK_VERSION%%/jre/lib/flavormap.properties
 jdk%%JDK_VERSION%%/jre/lib/font.properties
 jdk%%JDK_VERSION%%/jre/lib/font.properties.ja
-jdk%%JDK_VERSION%%/jre/lib/font.properties.ru
-jdk%%JDK_VERSION%%/jre/lib/font.properties.uk
 jdk%%JDK_VERSION%%/jre/lib/font.properties.zh
-jdk%%JDK_VERSION%%/jre/lib/font.properties.zh_CN
 jdk%%JDK_VERSION%%/jre/lib/font.properties.zh_TW
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiBold.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiItalic.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightItalic.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightRegular.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiBold.ttf
-jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiOblique.ttf
-jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansOblique.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansRegular.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBold.ttf
-jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBoldOblique.ttf
-jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterOblique.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir
-jdk%%JDK_VERSION%%/jre/lib/i18n.jar
-jdk%%JDK_VERSION%%/jre/lib/i386/classic/Xusage.txt
-jdk%%JDK_VERSION%%/jre/lib/i386/classic/libjvm.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/classic/libjvm_g.so
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/Xusage.txt
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm.so
-%%HOTSPOT:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm_g.so
-jdk%%JDK_VERSION%%/jre/lib/i386/green_threads/libhpi.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/green_threads/libhpi_g.so
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/hotspot
+jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot
+jdk%%JDK_VERSION%%/jre/lib/i386/client/Xusage.txt
+jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig.so
+jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm.so
+jdk%%JDK_VERSION%%/jre/lib/i386/jvm.cfg
 jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc_g.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libagent.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libagent_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libawt.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libawt_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libcmm.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libcmm_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr_g.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libhprof.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libhprof_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libioser12.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libioser12_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libjaas_unix.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjava.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni.so
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjawt.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjawt_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjcov.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjcov_g.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libjsig.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjsound.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjsound_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libnet.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libnet_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libnio.so
+jdk%%JDK_VERSION%%/jre/lib/i386/librmi.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libverify.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libverify_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libzip.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libzip_g.so
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi.so
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi_g.so
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/Xusage.txt
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm.so
-%%HOTSPOT:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi.so
+jdk%%JDK_VERSION%%/jre/lib/i386/server/Xusage.txt
+jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig.so
+jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm.so
+jdk%%JDK_VERSION%%/jre/lib/im/indicim.jar
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/cursors.properties
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/invalid32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_CopyDrop32x32.gif
@@ -870,43 +730,428 @@ jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkDrop32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveDrop32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/javaplugin.jar
-jdk%%JDK_VERSION%%/jre/lib/jvm.cfg
+jdk%%JDK_VERSION%%/jre/lib/jce.jar
+jdk%%JDK_VERSION%%/jre/lib/jsse.jar
 jdk%%JDK_VERSION%%/jre/lib/jvm.hprof.txt
 jdk%%JDK_VERSION%%/jre/lib/jvm.jcov.txt
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
+jdk%%JDK_VERSION%%/jre/lib/logging.properties
 jdk%%JDK_VERSION%%/jre/lib/psfont.properties.ja
 jdk%%JDK_VERSION%%/jre/lib/psfontj2d.properties
 jdk%%JDK_VERSION%%/jre/lib/rt.jar
+jdk%%JDK_VERSION%%/jre/lib/security/US_export_policy.jar
 jdk%%JDK_VERSION%%/jre/lib/security/cacerts
 jdk%%JDK_VERSION%%/jre/lib/security/java.policy
 jdk%%JDK_VERSION%%/jre/lib/security/java.security
+jdk%%JDK_VERSION%%/jre/lib/security/local_policy.jar
 jdk%%JDK_VERSION%%/jre/lib/sunrsasign.jar
-jdk%%JDK_VERSION%%/jre/lib/tzmappings
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin.so
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin_g.so
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji.so
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji_g.so
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Abidjan
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Accra
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Addis_Ababa
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Algiers
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Asmera
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bamako
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bangui
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Banjul
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bissau
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Blantyre
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Brazzaville
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bujumbura
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Cairo
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Casablanca
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ceuta
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Conakry
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Dakar
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Dar_es_Salaam
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Djibouti
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Douala
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/El_Aaiun
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Freetown
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Gaborone
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Harare
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Johannesburg
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kampala
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Khartoum
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kigali
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kinshasa
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lagos
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Libreville
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lome
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Luanda
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lubumbashi
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lusaka
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Malabo
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Maputo
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Maseru
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Mbabane
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Mogadishu
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Monrovia
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Nairobi
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ndjamena
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Niamey
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Nouakchott
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ouagadougou
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Porto-Novo
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Sao_Tome
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Timbuktu
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Tripoli
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Tunis
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Windhoek
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Adak
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Anchorage
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Anguilla
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Antigua
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Araguaina
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Aruba
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Asuncion
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Barbados
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Belem
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Belize
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Boa_Vista
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Bogota
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Boise
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Buenos_Aires
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cambridge_Bay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cancun
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Caracas
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Catamarca
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayenne
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayman
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Chicago
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Chihuahua
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cordoba
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Costa_Rica
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cuiaba
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Curacao
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Danmarkshavn
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Dawson
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Dawson_Creek
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Denver
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Detroit
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Dominica
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Edmonton
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Eirunepe
+jdk%%JDK_VERSION%%/jre/lib/zi/America/El_Salvador
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Fortaleza
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Glace_Bay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Godthab
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Goose_Bay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Grand_Turk
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Grenada
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Guadeloupe
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Guatemala
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Guayaquil
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Guyana
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Halifax
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Havana
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Hermosillo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Knox
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Marengo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vevay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Indianapolis
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Inuvik
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Iqaluit
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Jamaica
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Jujuy
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Juneau
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Kentucky/Monticello
+jdk%%JDK_VERSION%%/jre/lib/zi/America/La_Paz
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Lima
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Los_Angeles
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Louisville
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Maceio
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Managua
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Manaus
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Martinique
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Mazatlan
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Mendoza
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Menominee
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Merida
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Mexico_City
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Miquelon
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Monterrey
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Montevideo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Montreal
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Montserrat
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Nassau
+jdk%%JDK_VERSION%%/jre/lib/zi/America/New_York
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Nipigon
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Nome
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Noronha
+jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota/Center
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Panama
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Pangnirtung
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Paramaribo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Phoenix
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Port-au-Prince
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Port_of_Spain
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Porto_Velho
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Puerto_Rico
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Rainy_River
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Rankin_Inlet
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Recife
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Regina
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Rio_Branco
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Santiago
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Santo_Domingo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Sao_Paulo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Scoresbysund
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Johns
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Kitts
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Lucia
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Thomas
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Vincent
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Swift_Current
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Tegucigalpa
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Thule
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Thunder_Bay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Tijuana
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Tortola
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Vancouver
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Whitehorse
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Winnipeg
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Yakutat
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Yellowknife
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Casey
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Davis
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/DumontDUrville
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Mawson
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/McMurdo
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Palmer
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Syowa
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Vostok
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aden
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Almaty
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Amman
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Anadyr
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aqtau
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aqtobe
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ashgabat
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Baghdad
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bahrain
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Baku
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bangkok
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Beirut
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bishkek
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Brunei
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Calcutta
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Choibalsan
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Chongqing
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Colombo
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Damascus
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dhaka
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dili
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dubai
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dushanbe
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Gaza
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Harbin
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hong_Kong
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hovd
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Irkutsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jakarta
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jayapura
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jerusalem
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kabul
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kamchatka
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Karachi
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kashgar
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Katmandu
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Krasnoyarsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuala_Lumpur
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuching
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuwait
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Macau
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Magadan
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Makassar
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Manila
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Muscat
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Nicosia
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Novosibirsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Omsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Oral
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Phnom_Penh
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Pontianak
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Pyongyang
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Qatar
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Qyzylorda
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Rangoon
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh87
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh88
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh89
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Saigon
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Sakhalin
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Samarkand
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Seoul
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Shanghai
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Singapore
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Taipei
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tashkent
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tbilisi
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tehran
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Thimphu
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tokyo
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ulaanbaatar
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Urumqi
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Vientiane
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Vladivostok
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yakutsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yekaterinburg
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yerevan
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Azores
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Bermuda
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Canary
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Cape_Verde
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Faeroe
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Madeira
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Reykjavik
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/South_Georgia
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/St_Helena
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Stanley
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Adelaide
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Brisbane
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Broken_Hill
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Darwin
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Hobart
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lindeman
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lord_Howe
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Melbourne
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Perth
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Sydney
+jdk%%JDK_VERSION%%/jre/lib/zi/CET
+jdk%%JDK_VERSION%%/jre/lib/zi/EET
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+1
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+10
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+11
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+12
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+2
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+3
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+4
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+5
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+6
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+7
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+8
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+9
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-1
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-10
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-11
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-12
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-13
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-14
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-2
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-3
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-4
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-5
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-6
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-7
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-8
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-9
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/UCT
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/UTC
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Amsterdam
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Andorra
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Athens
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Belfast
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Belgrade
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Berlin
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Brussels
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Bucharest
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Budapest
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Chisinau
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Copenhagen
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Dublin
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Gibraltar
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Helsinki
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Istanbul
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Kaliningrad
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Kiev
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Lisbon
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/London
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Luxembourg
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Madrid
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Malta
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Minsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Monaco
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Moscow
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Oslo
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Paris
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Prague
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Riga
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Rome
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Samara
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Simferopol
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Sofia
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Stockholm
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Tallinn
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Tirane
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Uzhgorod
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vaduz
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vienna
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vilnius
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Warsaw
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zaporozhye
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zurich
+jdk%%JDK_VERSION%%/jre/lib/zi/GMT
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Antananarivo
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Chagos
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Christmas
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Cocos
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Comoro
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Kerguelen
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mahe
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Maldives
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mauritius
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mayotte
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Reunion
+jdk%%JDK_VERSION%%/jre/lib/zi/MET
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Apia
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Auckland
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Chatham
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Easter
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Efate
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Enderbury
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Fakaofo
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Fiji
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Funafuti
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Galapagos
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Gambier
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Guadalcanal
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Guam
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Honolulu
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Johnston
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kiritimati
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kosrae
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kwajalein
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Majuro
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Marquesas
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Midway
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Nauru
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Niue
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Norfolk
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Noumea
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Pago_Pago
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Palau
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Pitcairn
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Ponape
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Port_Moresby
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Rarotonga
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Saipan
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tahiti
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tarawa
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tongatapu
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Truk
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wake
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wallis
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Yap
+jdk%%JDK_VERSION%%/jre/lib/zi/WET
+jdk%%JDK_VERSION%%/jre/lib/zi/ZoneInfoMappings
 jdk%%JDK_VERSION%%/lib/dt.jar
-%%PLUGIN:%%jdk%%JDK_VERSION%%/lib/htmlconverter.jar
-jdk%%JDK_VERSION%%/lib/i386/libdt_socket.so
-jdk%%JDK_VERSION%%/lib/i386/libjdwp.so
 jdk%%JDK_VERSION%%/lib/ir.idl
 jdk%%JDK_VERSION%%/lib/orb.idl
 jdk%%JDK_VERSION%%/lib/tools.jar
 jdk%%JDK_VERSION%%/man/man1/appletviewer.1
 jdk%%JDK_VERSION%%/man/man1/extcheck.1
+jdk%%JDK_VERSION%%/man/man1/idlj.1
 jdk%%JDK_VERSION%%/man/man1/jar.1
 jdk%%JDK_VERSION%%/man/man1/jarsigner.1
 jdk%%JDK_VERSION%%/man/man1/java.1
@@ -917,169 +1162,207 @@ jdk%%JDK_VERSION%%/man/man1/javap.1
 jdk%%JDK_VERSION%%/man/man1/jdb.1
 jdk%%JDK_VERSION%%/man/man1/keytool.1
 jdk%%JDK_VERSION%%/man/man1/native2ascii.1
+jdk%%JDK_VERSION%%/man/man1/orbd.1
+jdk%%JDK_VERSION%%/man/man1/policytool.1
 jdk%%JDK_VERSION%%/man/man1/rmic.1
 jdk%%JDK_VERSION%%/man/man1/rmid.1
 jdk%%JDK_VERSION%%/man/man1/rmiregistry.1
 jdk%%JDK_VERSION%%/man/man1/serialver.1
+jdk%%JDK_VERSION%%/man/man1/servertool.1
 jdk%%JDK_VERSION%%/man/man1/tnameserv.1
-jdk%%JDK_VERSION%%/src.jar
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/appletviewer_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/extcheck_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/idlj_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jar_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jarsigner_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/java_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javac_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javadoc_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javah_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javap_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jdb_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/keytool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/kinit_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/klist_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/ktab_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/native2ascii_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/orbd_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/policytool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmic_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmid_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmiregistry_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/serialver_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/servertool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/tnameserv_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/java_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/keytool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/kinit_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/klist_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/ktab_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/orbd_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/policytool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/rmid_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/rmiregistry_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/servertool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/tnameserv_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libawt_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libcmm_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libhprof_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libioser12_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjaas_unix_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjawt_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjcov_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjsig_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjsound_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libnet_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libnio_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/librmi_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libverify_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libzip_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm_g.so
 @exec   mkdir -p %D/share/doc/java
 @unexec rmdir %D/share/doc/java 2>/dev/null || true
 @exec   %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%"
 @unexec %D/bin/unregistervm FREEBSD-JDK%%JDK_VERSION%%
-@dirrm jdk%%JDK_VERSION%%/man/man1
-@dirrm jdk%%JDK_VERSION%%/man
-@dirrm jdk%%JDK_VERSION%%/lib/i386
-@dirrm jdk%%JDK_VERSION%%/lib
-%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns600
-%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns4
-%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386
-@dirrm jdk%%JDK_VERSION%%/jre/plugin
-@dirrm jdk%%JDK_VERSION%%/jre/lib/security
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale
-@dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors
-@dirrm jdk%%JDK_VERSION%%/jre/lib/images
-%%HOTSPOT:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/server
-%%NATIVE:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/native_threads
-@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/green_threads
-%%HOTSPOT:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/client
-@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/classic
-@dirrm jdk%%JDK_VERSION%%/jre/lib/i386
-@dirrm jdk%%JDK_VERSION%%/jre/lib/fonts
-@dirrm jdk%%JDK_VERSION%%/jre/lib/ext
-@dirrm jdk%%JDK_VERSION%%/jre/lib/cmm
-@dirrm jdk%%JDK_VERSION%%/jre/lib/audio
-@dirrm jdk%%JDK_VERSION%%/jre/lib
-@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/native_threads
-@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/green_threads
-@dirrm jdk%%JDK_VERSION%%/jre/bin/i386
-@dirrm jdk%%JDK_VERSION%%/jre/bin
-@dirrm jdk%%JDK_VERSION%%/jre
-@dirrm jdk%%JDK_VERSION%%/include/freebsd
-@dirrm jdk%%JDK_VERSION%%/include-old/freebsd
-@dirrm jdk%%JDK_VERSION%%/include-old
-@dirrm jdk%%JDK_VERSION%%/include
-@dirrm jdk%%JDK_VERSION%%/demo/sound/src
-@dirrm jdk%%JDK_VERSION%%/demo/sound/media
-@dirrm jdk%%JDK_VERSION%%/demo/sound
-@dirrm jdk%%JDK_VERSION%%/demo/jpda
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SimpleExample
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/JavaDB
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos
-@dirrm jdk%%JDK_VERSION%%/demo/jfc
-@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame/models
-@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame
-@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/images
-@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio
-@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe
-@dirrm jdk%%JDK_VERSION%%/demo/applets/SymbolTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/SpreadSheet
-@dirrm jdk%%JDK_VERSION%%/demo/applets/SortDemo
-@dirrm jdk%%JDK_VERSION%%/demo/applets/SimpleGraph
-@dirrm jdk%%JDK_VERSION%%/demo/applets/NervousText
-@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models
-@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer
-@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds
-@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox
-@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/images
-@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/audio
-@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap
-@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphicsTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout/audio
-@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Fractal
-@dirrm jdk%%JDK_VERSION%%/demo/applets/DrawTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/DitherTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Clock
-@dirrm jdk%%JDK_VERSION%%/demo/applets/CardTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Blink
-@dirrm jdk%%JDK_VERSION%%/demo/applets/BarChart
-@dirrm jdk%%JDK_VERSION%%/demo/applets/ArcTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/SimpleAnimation
+@dirrm jdk%%JDK_VERSION%%/bin
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/audio
 @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/SimpleAnimation
 @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/audio
 @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator
+@dirrm jdk%%JDK_VERSION%%/demo/applets/ArcTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/BarChart
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Blink
+@dirrm jdk%%JDK_VERSION%%/demo/applets/CardTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Clock
+@dirrm jdk%%JDK_VERSION%%/demo/applets/DitherTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/DrawTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Fractal
+@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout/audio
+@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout
+@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphicsTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/audio
+@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/images
+@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap
+@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds
+@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox
+@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models
+@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer
+@dirrm jdk%%JDK_VERSION%%/demo/applets/NervousText
+@dirrm jdk%%JDK_VERSION%%/demo/applets/SimpleGraph
+@dirrm jdk%%JDK_VERSION%%/demo/applets/SortDemo
+@dirrm jdk%%JDK_VERSION%%/demo/applets/SpreadSheet
+@dirrm jdk%%JDK_VERSION%%/demo/applets/SymbolTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio
+@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/images
+@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe
+@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame/models
+@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame
 @dirrm jdk%%JDK_VERSION%%/demo/applets
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Colors
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Composite
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Mix
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Transforms
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/htmldemo
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/optionpane
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/splitpane
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tooltip
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample
+@dirrm jdk%%JDK_VERSION%%/demo/jfc
+@dirrm jdk%%JDK_VERSION%%/demo/jpda
 @dirrm jdk%%JDK_VERSION%%/demo
-@dirrm jdk%%JDK_VERSION%%/bin/i386/native_threads
-@dirrm jdk%%JDK_VERSION%%/bin/i386/green_threads
-@dirrm jdk%%JDK_VERSION%%/bin/i386
-@dirrm jdk%%JDK_VERSION%%/bin
+@dirrm jdk%%JDK_VERSION%%/include/bsd
+@dirrm jdk%%JDK_VERSION%%/include
+@dirrm jdk%%JDK_VERSION%%/jre/bin
+@dirrm jdk%%JDK_VERSION%%/jre/lib/audio
+@dirrm jdk%%JDK_VERSION%%/jre/lib/applet
+@dirrm jdk%%JDK_VERSION%%/jre/lib/cmm
+@dirrm jdk%%JDK_VERSION%%/jre/lib/ext
+@dirrm jdk%%JDK_VERSION%%/jre/lib/fonts
+@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/client
+@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/native_threads
+@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/server
+@dirrm jdk%%JDK_VERSION%%/jre/lib/i386
+@dirrm jdk%%JDK_VERSION%%/jre/lib/im
+@dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors
+@dirrm jdk%%JDK_VERSION%%/jre/lib/images
+@dirrm jdk%%JDK_VERSION%%/jre/lib/security
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Africa
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/America/Kentucky
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/America
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Asia
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Australia
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Etc
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Europe
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Indian
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Pacific
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi
+@dirrm jdk%%JDK_VERSION%%/jre/lib
+@dirrm jdk%%JDK_VERSION%%/jre
+@dirrm jdk%%JDK_VERSION%%/lib
+@dirrm jdk%%JDK_VERSION%%/man/man1
+@dirrm jdk%%JDK_VERSION%%/man
 @dirrm jdk%%JDK_VERSION%%
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 034053061605..c669cc52d1f6 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -1,85 +1,65 @@
-# New ports collection makefile for:	jdk13
-# Date created:				10 October 2000
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+# New ports collection makefile for:	jdk14
+# Date created:				6 March 2003
+# Whom:					Alexey Zelkin <phantom@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
-#		 http://www.eyesbeyond.com/freebsddom/java/jdk13.html
-SRCFILE=	j2sdk-${JDK_VERSION:S/./_/g}-src${EXTRACT_SUFX}
-PATCHSETFILE=	bsd-jdk131-patches-${JDK_PATCHSET_VERSION}.tar.gz
+#		 http://www.eyesbeyond.com/freebsddom/java/jdk14.html
+SRCFILE=	j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
+PATCHSETFILE=	bsd-jdk14-patches-${JDK_PATCHSET_VERSION}.tar.gz
 DISTFILES=	${SRCFILE} ${PATCHSETFILE}
 
-MAINTAINER=	glewis@FreeBSD.org
-COMMENT=	Java Development Kit 1.3
+MAINTAINER=	phantom@FreeBSD.org
+COMMENT=	Java Development Kit 1.4.1
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		zip:${PORTSDIR}/archivers/zip \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
 .if !defined(NATIVE_BOOTSTRAP)
-BUILD_DEPENDS+=	${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk13
-.endif
-.if !defined(WITHOUT_PLUGIN)
-BUILD_DEPENDS+=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	glib12.3:$(PORTSDIR)/devel/glib12 \
-		gtk12.2:$(PORTSDIR)/x11-toolkits/gtk12 \
-		nspr4.1:$(PORTSDIR)/devel/nspr
+BUILD_DEPENDS+=	${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14
 .endif
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
 		${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
 
-.if defined(WITH_JAPANESE_FONTS)
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/TrueType/fonts.dir.kochi:${PORTSDIR}/japanese/kochi-ttfonts
-.endif
-.if defined(WITH_RUSSIAN_FONTS)
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/webfonts/fonts.dir:${PORTSDIR}/x11-fonts/webfonts
-.endif
-.if defined(WITH_CHINESE_FONTS)
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/TrueType/arphic:${PORTSDIR}/chinese/arphicttf
-.endif
-
-WRKSRC=		${WRKDIR}/j2sdk1.3.1/make
+WRKSRC=		${WRKDIR}/control/make
 
-JDK_VERSION=	1.3.1
-JDK_PATCHSET_VERSION=	8
+JDK_VERSION=	1.4.1
+JDK_PATCHSET_VERSION=	3
 
 .if defined(NATIVE_BOOTSTRAP)
-JDK13DIR?=	${LOCALBASE}/jdk${JDK_VERSION}
+JDK14DIR?=	${LOCALBASE}/jdk${JDK_VERSION}
 .else
-JDK13DIR?=	${LOCALBASE}/linux-sun-jdk${JDK_VERSION}
+JDK14DIR?=	${LOCALBASE}/linux-sun-jdk${JDK_VERSION}
 .endif
 
+# workaround to handle both 'zip' and 'tar.gz' distfiles
+USE_ZIP=	YES
+EXTRACT_ONLY=	${SRCFILE}
+
 ONLY_FOR_ARCHS=	i386
-USE_GMAKE=	yes
+USE_GMAKE=	YES
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
-MAKE_ENV=	ALT_BOOTDIR="${JDK13DIR}" \
+MAKE_ENV=	ALT_BOOTDIR="${JDK14DIR}" \
 		ALT_MOTIF_DIR="${X11BASE}" \
-		OPENWINHOME="${X11BASE}" \
 		SYS_CFLAGS="${CFLAGS}" \
+		JAVAWS_OPTIONAL="YES" \
+		NO_DOCS="YES" \
+		LANG="C" \
+		JAVA_HOME="" \
 		CLASSPATH="" \
-		LD_LIBRARY_PATH="" \
-		JAVA_COMPILER=""
-.if !defined(WITHOUT_PLUGIN)
-MAKE_ENV +=	LIBG_HDRS="${LOCALBASE}/include/glib12" \
-		GTK_HDRS="${X11BASE}/include/gtk12" \
-		LIBIDL_HDRS=
-.endif
-.if !defined(WITHOUT_PLUGIN)
-ALL_TARGET=	all plugin images
-.else
-ALL_TARGET=	all images
-.endif
+		LD_LIBRARY_PATH=""
+ALL_TARGET=	all
 PLIST_SUB+=	JDK_VERSION=${JDK_VERSION}
 
-JDKIMAGEDIR=	${WRKSRC}/../build/bsd-i386/jdk-image-i386
-JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-i386/jdk-debug-image-i386
+JDKIMAGEDIR=	${WRKSRC}/../build/bsd-i586/j2sdk-image
+JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-i586/j2sdk-debug-image
 
 SORT?=		/usr/bin/sort
 CPIO?=		/usr/bin/cpio
@@ -91,47 +71,8 @@ PKGNAMESUFFIX=	-nodebug
 PLIST_SUB+=	DEBUG:=""
 .endif
 
-.if defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT)
-PLIST_SUB+=    NATIVE:=""
-MAKE_ARGS+=    HPIS="green native"
-.else
-PLIST_SUB+=    NATIVE:="@comment "
-.endif
-
-.if defined(WITHOUT_PLUGIN)
-PLIST_SUB+=    PLUGIN:="@comment "
-.else
-PLIST_SUB+=    PLUGIN:=""
-.endif
-
-.if defined(WITH_HOTSPOT)
-PLIST_SUB+=    HOTSPOT:=""
-USE_REINPLACE= yes
-.if defined(NODEBUG)
-HOTSPOT_TARGETS=product1 product
-.else
-HOTSPOT_TARGETS=compiler1 compiler2
-.endif
-.else
-PLIST_SUB+=    HOTSPOT:="@comment "
-.endif
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_HOTSPOT) && ${OSVERSION} < 500039
-USE_GCC=	3.2
-BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
-MAKE_ENV+=	ALT_COMPILER_PATH=${LOCALBASE}/bin
-HOTSPOT_BUILD=	../ext/plugin/build/solaris/GNUmakefile \
-	../../hotspot1.3.1/build/linux/makefiles/adlc.make \
-	../../hotspot1.3.1/build/linux/platform_i486
-.endif
-
-.if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500038 )
-BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-TAR=		gtar	# Necessary for proper extraction of sources
-.endif
-
 # Check for JDK sources
 .if !exists(${DISTDIR}/${SRCFILE}) && !defined(PACKAGE_BUILDING)
 ECHO_MSG=/usr/bin/printf
@@ -153,56 +94,24 @@ IGNORE= :\n\
 The source distribution exists on your system, but due to\n\
 licensing restrictions you still need to download the\n\
 patchset, ${PATCHSETFILE}, from\n\
-http://www.eyesbeyond.com/freebsddom/java/jdk13.html.\n\
+http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\
 Please place the patchset in ${DISTDIR}.\n
 .endif
 
-# HotSpot and/or native threads require a recent version of FreeBSD
-.if ( defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT) ) && ( ${OSVERSION} < 470101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500043 ) )
+# JDK 1.4.1 require recent version of FreeBSD due to recent libc_r updates.
+# These checks are not prefect but it's better than nothing.
+.if (${OSVERSION} < 470101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500043 ))
 ECHO_MSG=/usr/bin/printf
 IGNORE= :\n\
 You must have a version of FreeBSD later than 4.7-STABLE February 2003\n\
-or 5-CURRENT February 2003 to use either native threads or HotSpot.\n
-.endif
-
-# Warn user about HotSpot build
-.if defined(WITH_HOTSPOT)
-pre-everything:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You have set WITH_HOTSPOT to enable the build of the HotSpot VM."
-	@${ECHO_MSG} "Please note that HotSpot development is still experimental and is"
-	@${ECHO_MSG} "not suitable for use in a production environment."
-	@${ECHO_MSG} "To use the browser plugin with HotSpot you will need to set the"
-	@${ECHO_MSG} "THREADS_FLAG environment variable when running the browser, e.g."
-	@${ECHO_MSG} "    setenv THREADS_FLAG native"
-	@${ECHO_MSG} "Compiling HotSpot into the JDK will also currently make the"
-	@${ECHO_MSG} "Classic VM unusable."
-	@${ECHO_MSG} ""
+or 5-CURRENT February 2003 to compile and use JDK 1.4.1.\n
 .endif
 
 pre-patch:
 	@cd ${WRKDIR} &&  \
+		${GZIP_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
 		${CHMOD} -R u+w * && \
-		${MKDIR} j2sdk1.3.1/ext/plugin/oji-plugin/include/bsd/jdk12 && \
-		${MKDIR} j2sdk1.3.1/ext/plugin/oji-plugin/include/solaris/navig5/private && \
-		${MKDIR} j2sdk1.3.1/src/bsd/doc/man && \
-		${MKDIR} hotspot1.3.1/build/bsd && \
-		${MKDIR} hotspot1.3.1/build/bsd/makefiles && \
-		${MKDIR} hotspot1.3.1/build/bsd/package && \
-		${MKDIR} hotspot1.3.1/src/os/bsd/launcher && \
-		${MKDIR} hotspot1.3.1/src/os/bsd/vm && \
-		${MKDIR} hotspot1.3.1/src/os_cpu/bsd_i486/vm && \
-			${PATCH} < ${WRKDIR}/jdk131.patches
-
-post-patch:
-.if defined(WITH_HOTSPOT)
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-	@for file in ${HOTSPOT_BUILD}; do \
-        	${REINPLACE_CMD} -e "s:gcc:gcc32:g ; s:g\+\+:g\+\+32:g" ${WRKSRC}/$${file}; \
-	done
-	@${REINPLACE_CMD} -e "s:PATH[)]gcc:PATH)gcc32:g ; s:PATH[)]g\+\+:PATH)g\+\+32:g" ${WRKSRC}/common/Defs-bsd.gmk 
-.endif
-.endif
+		${PATCH} -p0 < ${WRKDIR}/jdk14.patches
 
 .if !defined(NATIVE_BOOTSTRAP)
 pre-build:
@@ -229,35 +138,10 @@ pre-build:
 do-build:
 	# Start of jdk build
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-.if defined(WITH_HOTSPOT)
-	# Start of HotSpot build
-	@(cd ${WRKDIR}/hotspot1.3.1/build/linux ;  \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${HOTSPOT_TARGETS})
-.endif
 
 post-build:
-.if defined(WITH_HOTSPOT)
-	# Copy HotSpot VM to image dir
-	${MKDIR} ${JDKIMAGEDIR}/jre/lib/i386/client
-	${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler1/product/libjvm.so ${JDKIMAGEDIR}/jre/lib/i386/client/
-	${INSTALL_DATA} ${WRKDIR}/hotspot1.3.1/src/share/vm/Xusage.txt ${JDKIMAGEDIR}/jre/lib/i386/client/
-	${MKDIR} ${JDKIMAGEDIR}/jre/lib/i386/server
-	${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler2/product/libjvm.so ${JDKIMAGEDIR}/jre/lib/i386/server/
-	${INSTALL_DATA} ${WRKDIR}/hotspot1.3.1/src/share/vm/Xusage.txt ${JDKIMAGEDIR}/jre/lib/i386/server/
-	@(cd ${JDKIMAGEDIR}/jre/lib/i386; ${LN} -sf client hotspot)
-.if !defined(NODEBUG)
-	# Copy debug version of HotSpot VM to image dir
-	${MKDIR} ${JDKIMAGEDIR_G}/jre/lib/i386/client
-	${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler1/jvmg/libjvm_g.so ${JDKIMAGEDIR_G}/jre/lib/i386/client/
-	${MKDIR} ${JDKIMAGEDIR_G}/jre/lib/i386/server
-	${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler2/jvmg/libjvm_g.so ${JDKIMAGEDIR_G}/jre/lib/i386/server/
-.endif
-.endif
-	# Prune empty dirs
-	${FIND} ${JDKIMAGEDIR} -type d | ${SORT} -r | \
-		${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
-	${FIND} ${JDKIMAGEDIR_G} -type d | ${SORT} -r | \
-		${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
+	@# This file serves no purpose (in case of port)
+	@${RM} -f ${JDKIMAGEDIR}/src.zip
 
 .if !defined(NODEBUG)
 pre-install:
@@ -275,21 +159,8 @@ do-install:
 	cd ${JDKIMAGEDIR_G} && ${FIND} . \
 	  | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .endif
-	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}/jre/lib/ext
 
 post-install:
 	@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
-.if !defined(WITHOUT_PLUGIN)
-	@${ECHO_MSG}
-	@${ECHO_MSG} To use the Java plugin with Mozilla you must create a
-	@${ECHO_MSG} symbolic link from
-	@${ECHO_MSG}
-	@${ECHO_MSG} ${PREFIX}/jdk${JDK_VERSION}/jre/plugin/i386/ns600/libjavaplugin_oji.so
-	@${ECHO_MSG}
-	@${ECHO_MSG} to your Mozilla plugins directory, which is usually found at
-	@${ECHO_MSG}
-	@${ECHO_MSG} ${X11BASE}/lib/mozilla/plugins
-	@${ECHO_MSG}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo
index d9abbb0878ff..a75cd7da49b3 100644
--- a/java/jdk15/distinfo
+++ b/java/jdk15/distinfo
@@ -1,2 +1,2 @@
-MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
-MD5 (bsd-jdk131-patches-8.tar.gz) = 1fd14cea9ce15e9a7e5ee2f60f50dd01
+MD5 (j2sdk-1_4_1-src-scsl.zip) = e6f35d1183660682f4f03965d35b67c5
+MD5 (bsd-jdk14-patches-3.tar.gz) = aca8e42e71a0b7a7b779c7f2bea47f62
diff --git a/java/jdk15/files/patch-InetAddressImpl.c b/java/jdk15/files/patch-InetAddressImpl.c
deleted file mode 100644
index ddb4f8045b81..000000000000
--- a/java/jdk15/files/patch-InetAddressImpl.c
+++ /dev/null
@@ -1,114 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/native/java/net/InetAddressImpl.c	25 Jan 2003 23:22:26 -0000	1.7
-+++ ../src/solaris/native/java/net/InetAddressImpl.c	28 Feb 2003 09:34:18 -0000
-@@ -25,6 +25,7 @@
- 
- #include "java_net_InetAddressImpl.h"
- 
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- /* reentrant BIND includes --billh */
- 
- #include <sys/param.h>
-@@ -33,14 +34,16 @@
- 
- /* forward declarations --billh */
- 
-+static
- HOST_R_RETURN
--gethostbyname_r(const char *name,  struct hostent *hptr,
--		HOST_R_ARGS);
-+__j_gethostbyname_r(const char *name,  struct hostent *hptr,
-+		    HOST_R_ARGS);
- 
-+static
- HOST_R_RETURN
--gethostbyaddr_r(const char *addr, int len, int type,
--		struct hostent *hptr,
--		HOST_R_ARGS);
-+__j_gethostbyaddr_r(const char *addr, int len, int type,
-+		    struct hostent *hptr, HOST_R_ARGS);
-+#endif
- 
- /*
- */
-@@ -99,6 +102,8 @@
- 
- #ifdef __GLIBC__
- 	gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+	hp = __j_gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #else
- 	hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #endif
-@@ -106,6 +111,9 @@
- #ifdef __GLIBC__
- 	    gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
- 			    &res2, buf2, sizeof(buf2), &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+	    hp = __j_gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
-+				     &res2, buf2, sizeof(buf2), &h_error);
- #else
- 	    hp = gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
- 				 &res2, buf2, sizeof(buf2), &h_error);
-@@ -189,6 +197,8 @@
-     /* Try once, with our static buffer. */
- #ifdef __GLIBC__
-     gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+    hp = __j_gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #else    
-     hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #endif
-@@ -203,6 +213,9 @@
- #ifdef __GLIBC__
- 	    gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
- 			    &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+	    hp = __j_gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
-+				     &h_error);
- #else
- 	    hp = gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
- 				 &h_error);
-@@ -283,6 +296,9 @@
- #ifdef __GLIBC__
-     gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
- 		    buf, sizeof(buf), &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+    hp = __j_gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
-+			     buf, sizeof(buf), &h_error);
- #else
-     hp = gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
- 			 buf, sizeof(buf), &h_error);
-@@ -297,6 +313,9 @@
- #ifdef __GLIBC__
- 	    gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
- 			    &hent, tmp, BIG_HENT_BUF_SIZE, &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+	    hp = __j_gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
-+				     &hent, tmp, BIG_HENT_BUF_SIZE, &h_error);
- #else
- 	    hp = gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
- 				 &hent, tmp, BIG_HENT_BUF_SIZE, &h_error);
-@@ -335,8 +354,9 @@
- static HOST_R_RETURN 
- copy_hostent(struct hostent *, struct hostent *, HOST_R_COPY_ARGS);
- 
-+static
- HOST_R_RETURN
--gethostbyname_r(const char *name,  struct hostent *hptr, HOST_R_ARGS) {
-+__j_gethostbyname_r(const char *name,  struct hostent *hptr, HOST_R_ARGS) {
- 	struct hostent *he = gethostbyname(name);
- 
- 	HOST_R_ERRNO;
-@@ -347,8 +367,9 @@
- 	return (copy_hostent(he, hptr, HOST_R_COPY));
- }
- 
-+static
- HOST_R_RETURN
--gethostbyaddr_r(const char *addr, int len, int type,
-+__j_gethostbyaddr_r(const char *addr, int len, int type,
- 		struct hostent *hptr, HOST_R_ARGS) {
- 	struct hostent *he = gethostbyaddr(addr, len, type);
- 
diff --git a/java/jdk15/files/patch-common::Defs-bsd.gmk b/java/jdk15/files/patch-common::Defs-bsd.gmk
index d0c78fad9baf..fbeca94149d8 100644
--- a/java/jdk15/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk15/files/patch-common::Defs-bsd.gmk
@@ -1,27 +1,11 @@
-
-$FreeBSD$
-
---- common/Defs-bsd.gmk.orig	Mon Sep 10 17:02:16 2001
-+++ common/Defs-bsd.gmk	Mon Sep 10 17:02:42 2001
-@@ -128,7 +128,7 @@
- ifeq ($(TRUE_PLATFORM), NetBSD)
- DEVTOOLS_PATH = /usr/pkg/bin/
- else
+--- ../../j2se/make/common/Defs-bsd.gmk.orig	Fri Mar  7 01:38:41 2003
++++ ../../j2se/make/common/Defs-bsd.gmk	Fri Mar  7 01:38:01 2003
+@@ -155,7 +155,7 @@
+ 
+ # DEVTOOLS_PATH is for other tools required for building (such as
+ # zip, etc.)
 -DEVTOOLS_PATH = /usr/local/bin/
-+DEVTOOLS_PATH = $(LOCALBASE)/bin/
- endif
++DEVTOOLS_PATH = ${LOCALBASE}/bin/
  # Allow the user to override the default value...
  ifdef ALT_DEVTOOLS_PATH
-@@ -221,10 +221,10 @@
- else # ARCH
- CFLAGS_COMMON   = $(GCC_WARNINGS)
- endif # ARCH
--CFLAGS_OPT      = $(POPT)
-+CFLAGS_OPT      = $(POPT) $(SYS_CFLAGS)
- CFLAGS_DBG      = -g3
- CXXFLAGS_COMMON = $(GCC_WARNINGS)
--CXXFLAGS_OPT	= $(POPT)
-+CXXFLAGS_OPT	= $(POPT) $(SYS_CFLAGS)
- CXXFLAGS_DBG	= -g3
- 
- CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \
+ DEVTOOLS_PATH = $(subst //,/,$(ALT_DEVTOOLS_PATH)/)
diff --git a/java/jdk15/files/patch-platform_i486 b/java/jdk15/files/patch-platform_i486
deleted file mode 100644
index 176fe9a69716..000000000000
--- a/java/jdk15/files/patch-platform_i486
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/build/linux/platform_i486	Thu Jan 23 00:28:52 2003
-+++ ../../hotspot1.3.1/build/linux/platform_i486	Thu Jan 23 01:14:01 2003
-@@ -6,7 +6,7 @@
- 
- lib_arch = i386
- 
--compiler = gcc32
-+compiler = gcc
- 
- gnu_dis_arch = i386
- 
diff --git a/java/jdk15/files/patch-threads_bsd.c b/java/jdk15/files/patch-threads_bsd.c
deleted file mode 100644
index 0549832f1833..000000000000
--- a/java/jdk15/files/patch-threads_bsd.c
+++ /dev/null
@@ -1,726 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/hpi/native_threads/src/threads_bsd.c	7 Feb 2002 05:19:54 -0000	1.12
-+++ ../src/solaris/hpi/native_threads/src/threads_bsd.c	25 Feb 2003 16:31:54 -0000
-@@ -22,32 +22,23 @@
- #include "np.h"
- 
- #include <pthread.h>
-+#include <pthread_np.h>
- 
- #if defined(__FreeBSD__)
- 
--#include <pthread_np.h>
-+#include <assert.h>
- 
--/* Remove defines from pthread.h so pthread_private.h can be included */
--#undef pthread_condattr_default
--#undef pthread_mutexattr_default
- #undef pthread_attr_default
-+#undef pthread_mutexattr_default
-+#undef pthread_condattr_default
- #include "pthread_private.h"
- 
--#include <assert.h>
--#include <ucontext.h>
--#include <machine/ucontext.h>
--
--#include <sys/exec.h>
--#include <vm/vm.h>
--#include <vm/pmap.h>
--#include <machine/pmap.h>
--#include <machine/vmparam.h>
--
- #endif
- 
- #include <string.h>
- #include <signal.h>
- #include <sys/signal.h>
-+#include <sys/time.h>
- #include <sys/resource.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -63,14 +54,9 @@
- /* Private functions used to implement native threading. --billh */
- 
- #ifdef DEBUG_BSD_NATIVE_THREADS
--void _pthread_suspend_all_np(void);
--void _pthread_resume_all_np(void);
--#endif
--void record_uc(sys_thread_t *, ucontext_t *);
--void record_gc_registers_of(sys_thread_t *);
--
--void dumpThreadStates();
- void dumpThreadLogStates(pthread_t);
-+void dumpThreadStates();
-+#endif
- 
- /*
-  * Suspend a thread.  Used to implement java.lang.Thread.suspend(),
-@@ -108,28 +94,24 @@
- int
- np_stackinfo(void **addr, long *sizep)
- {
--    thread_t self = pthread_self();
--    int base;
--    int size;
--
--    if (!pthread_equal(self, _thread_initial)) {
--        *addr = self->stack;
--	*sizep = (long) PTHREAD_STACK_DEFAULT;
--
--    } else {
--	/* in main()'s thread */
--	struct rlimit r;
--
--	if (getrlimit(RLIMIT_STACK, &r) == -1)
--	    return SYS_ERR;
--
--	/* PS_STRINGS is also from sys/exec.h in FreeBSD, but as macro. --billh */
--
--	*addr  = (void *) (PS_STRINGS +1);
--	*sizep = (long)r.rlim_cur;
--    }
-+    pthread_attr_t attr;
-+    size_t size;
- 
-+    if ((errno = pthread_attr_init(&attr)))
-+	return SYS_ERR;
-+    if ((errno = pthread_attr_get_np(pthread_self(), &attr)))
-+	goto err;
-+    if ((errno = pthread_attr_getstackaddr(&attr, addr)))
-+	goto err;
-+    if ((errno = pthread_attr_getstacksize(&attr, &size)))
-+	goto err;
-+    *sizep = size;
-+    pthread_attr_destroy(&attr);
-     return SYS_OK;
-+
-+err:
-+    pthread_attr_destroy(&attr);
-+    return SYS_ERR;
- }
- 
- /*
-@@ -177,7 +159,7 @@
- 	Do this for the FreeBSD implementation too, since this is a silly
- 	function anyways.  --billh
- */
--	return TRUE;
-+    return TRUE;
- }
- 
- 
-@@ -190,38 +172,54 @@
- static void
- record_thread_regs()
- {
--    sys_thread_t *tid;
-+    struct pthread *self = pthread_self();
-+    sys_thread_t *tid = ThreadQueue;
-     int i;
--    int sp;
- 
--    tid = ThreadQueue;
--    for (i = 0; i < ActiveThreadCount && tid != 0; i++) {
--	int i;
--
--	if (tid->sys_thread != 0) {
--#ifdef __bsdi__
--	    /* if thread has already been initialized */
--	    if (pthread_getstackpointer_np(tid->sys_thread, &sp) == 0)
--		tid->sp = sp;
--	    else
--		tid->sp = 0;
--#elif __FreeBSD__
--#endif
--            tid->sp = tid->sys_thread->stack;
--//#endif	//__FreeBSD__
--/*	Potential race here if the stack isn't setup before GC. --billh */
--	} else {
-+    for (i = 0; i < ActiveThreadCount && tid != NULL; i++, tid = tid->next) {
-+	struct pthread *thread = tid->sys_thread;
-+
-+	if (thread == 0) {
- 	    /*
- 	     * thread is still in the process of being initalized.
- 	     * So GC should not care about this thread. Just
- 	     * set its sp to 0, and this will force GC to ignore it.
- 	     */
- 	    tid->sp = 0;
-+	    continue;
- 	}
- 
--	record_gc_registers_of(tid);
-+        tid->sp = thread->stack;
-+/*	Potential race here if the stack isn't setup before GC. --billh */
- 
--	tid = tid->next;
-+	/*
-+	 * The thread that calls this function will alway be the JVM GC thread,
-+	 * so skip over it in the list of threads.
-+	 */
-+	if (thread != self && (thread->flags & PTHREAD_FLAGS_PRIVATE) == 0) {
-+	    register_t *regbase;
-+
-+#ifdef DEBUG_BSD_NATIVE_THREADS
-+	    /*
-+	     * Got search candidate..
-+	     */
-+	    if (thread->state != PS_SUSPENDED)
-+		dumpThreadLogStates(thread);
-+#endif
-+
-+	    regbase = (register_t*) &thread->ctx.jb[0];
-+	    tid->regs[0] = regbase[6];	/* eax */
-+	    tid->regs[1] = 0;		/* ecx (missing) */
-+	    tid->regs[2] = 0;		/* edx (missing) */
-+	    tid->regs[3] = regbase[1];	/* ebx */
-+	    tid->regs[4] = regbase[3];	/* ebp */
-+	    tid->regs[5] = regbase[4];	/* esi */
-+	    tid->regs[6] = regbase[5];	/* edi */
-+
-+#ifdef DEBUG_BSD_NATIVE_THREADS
-+	    dumpThreadStates();
-+#endif
-+	}
-     }
- 
- #ifdef DEBUG_BSD_NATIVE_THREADS
-@@ -239,14 +237,7 @@
- {
-     sysAssert(SYS_QUEUE_LOCKED(sysThreadSelf()));
- 
--#ifdef DEBUG_BSD_NATIVE_THREADS
--    _pthread_suspend_all_np();
--#else
--    pthread_single_np();
--#endif
--
--//usleep(100000 *3);
--
-+    pthread_suspend_all_np();
-     record_thread_regs();
-     return SYS_OK;
- }
-@@ -259,42 +250,13 @@
- np_multi(void)
- {
-     sysAssert(SYS_QUEUE_LOCKED(sysThreadSelf()));
--#ifdef DEBUG_BSD_NATIVE_THREADS
--    _pthread_resume_all_np();
--#else
--    pthread_multi_np();
--#endif
-+    pthread_resume_all_np();
- }
- 
--
--
--
-+#ifdef DEBUG_BSD_NATIVE_THREADS
- /* pthreads hackery begins --billh */
- 
--#define ANALRETENTIVE (6 + 1)
--
--char SuspendList[ANALRETENTIVE][16] = 
--{
--	"SUSP_NO",		/* Not suspended. */
--	"SUSP_YES",		/* Suspended. */
--	"SUSP_JOIN",		/* Suspended, joining. */  
--	"SUSP_NOWAIT",		/* Suspended, was in a mutex or condition queue. */
--	"SUSP_MUTEX_WAIT",	/* Suspended, still in a mutex queue. */
--	"SUSP_COND_WAIT",	/* Suspended, still in a condition queue. */
--	"susp boundless"
--};
--
--char *getSuspendStateString(enum pthread_susp suspendState)
--{
--	if (suspendState < ANALRETENTIVE)
--		return &SuspendList[suspendState][0];
--	else 
--		return &SuspendList[ANALRETENTIVE-1][0];
--}
--
--#define SATAN (21 + 1) /* for the error string at the end of the list */
--
--char SignalList [SATAN][16]
-+char SignalList [][16]
- =
- {
- 	"PS_RUNNING",
-@@ -316,18 +278,17 @@
- 	"PS_JOIN",
- 	"PS_SUSPENDED",
- 	"PS_DEAD",
--	"PS_DEADLCK",
-+	"PS_DEADLOCK",
- 	"PS_STATE_MAX",
--	"PS_REQUEST_WAITING_SUSPENDED",
- 	"boundless"
- };
- 
- char *getThreadStateString(enum pthread_state threadState)
- {
- 	if (threadState < SATAN)
--		return &SignalList[threadState][0];
--	else 
--		return &SignalList[SATAN-1][0];
-+		return SignalList[threadState];
-+	else
-+		return SignalList[SATAN-1];
- }
- 
- void dumpThreadStates()
-@@ -336,114 +297,29 @@
- 	struct pthread	*thread;
- 	struct pthread	*self = pthread_self();
- 
--#ifdef DEBUG_BSD_NATIVE_THREADS
- 	_thread_kern_sig_defer();
- 	TAILQ_FOREACH(thread, &_thread_list, tle) {
- 		if (thread != self) { /* special case this --billh */
--			printf("\tthread %d\t%s\t%s\n",
-+			printf("\tthread %d\t%s\n",
- 				threadCount,
--				getThreadStateString(thread->state),
--				getSuspendStateString(thread->suspended));
-+				getThreadStateString(thread->state));
- 
- 			if (thread->state != PS_SUSPENDED)
- 				dumpThreadLogStates(thread);
--		}
--		else
--		{
--			printf("\tgc thread %d\t%s\t%s\n",
-+		} else {
-+			printf("\tgc thread %d\t%s\n",
- 				threadCount,
--				getThreadStateString(thread->state),
--				getSuspendStateString(thread->suspended));
-+				getThreadStateString(thread->state))
- 		}
- 		++threadCount;
- 	}
- 	_thread_kern_sig_undefer();
- 	printf("\n");
--#endif
--}
--
--
--#ifdef DEBUG_BSD_NATIVE_THREADS
--extern void _pthread_suspend_np_by_pthread_common(pthread_t);
--extern void _pthread_resume_by_pthread_common(pthread_t, enum pthread_susp);
--
--void
--_pthread_suspend_all_np(void)
--{
--	struct pthread	*thread;
--	struct pthread	*self = pthread_self();
--
--fprintf(stderr, "pthread_suspend_all_np\n");
--	/*
--	 * Defer signals to protect the scheduling queues from
--	 * access by the signal handler:
--	 */
--	_thread_kern_sig_defer();
--
--	/* Suspend all threads other than the current thread: */
--	TAILQ_FOREACH(thread, &_thread_list, tle) {
--		if (thread != self) {
--			_pthread_suspend_np_by_pthread_common(thread);
--		}
--	}
--
--	/*
--	 * Undefer and handle pending signals, yielding if necessary:
--	 */
--	_thread_kern_sig_undefer();
--fprintf(stderr, "pthread_suspend_all_np END\n");
--}
--
--/* Resume a thread: */
--void
--_pthread_resume_all_np(void)
--{
--	enum		pthread_susp old_suspended;
--	struct pthread	*thread;
--	struct pthread	*self = pthread_self();
--
--fprintf(stderr, "pthread_resume_all_np\n");
--	_thread_kern_sig_defer();
--
--	/*
--		Iterate through the thread list and resume suspended threads.
--		this is copied from pthread_resume_np(). --billh
--	*/
--
--	TAILQ_FOREACH(thread, &_thread_list, tle) {
--		if (thread != self) {
--			/* Cancel any pending suspensions: */
--
--			old_suspended = thread->suspended;
--			thread->suspended = SUSP_NO;
--
--			_pthread_resume_by_pthread_common(thread, old_suspended);
--
--		} // if !thread_self
--	} // TAILQ_FOREACH
--
--	/*
--	 * Undefer and handle pending signals, yielding if
--	 * necessary:
--	 */
--	_thread_kern_sig_undefer();
--fprintf(stderr, "pthread_resume_all_np END\n");
- }
--#endif
- 
- /*
- 	[A snippet from Dan Eichen's email on the subject]
- 
--	It uses _longjmp (non-signal-saving/restoring) for the most part.
--	The only exception is when the process (currently running thread) is 
--	interrupted by a signal.  So your context types are a jmp_buf and
--	a ucontext_t (if interrupted by a signal).  If thread->ctxtype is
--	CTX_UC, the context is stored as a ucontext in thread->ctx.uc.
--	Otherwise, the context is stored as a jmp_buf in thread->ctx.jb.
--	We don't currently use CTX_JB and CTX_SJB, so don't even bother
--	with those cases.  Those should go away actually; all we need
--	to know is if it is a ucontext_t or a jmp_buf.
--
- 	You can also look at src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c.
- 	It knows how to iterate through all the threads and pull out
- 	(and even set) thread contexts.
-@@ -462,19 +338,8 @@
- 	--billh
- */
- 
--void clear_gc_registers(sys_thread_t * jthread)
--{
--/* clear out x86 registers for the thread's "self" --billh */
--
--	jthread->regs[0] = 0; jthread->regs[1] = 0;
--	jthread->regs[2] = 0; jthread->regs[3] = 0;
--	jthread->regs[4] = 0; jthread->regs[5] = 0;
--	jthread->regs[6] = 0;
--}
--
- void dumpThreadLogStates(pthread_t thread)
- {
--#ifdef DEBUG_BSD_NATIVE_THREADS
- int i;
- 	for(i=0; i < STATE_LOG_SIZE; ++i)
- 	{
-@@ -494,311 +359,5 @@
- 		}
- 	}
- 	printf("\t\t***XXX\n");
--#endif
--}
--
--void record_gc_registers_of(sys_thread_t *javaThread)
--{
--struct pthread	*self	= pthread_self();
--struct pthread	*thread	= NULL;
--
--	assert( javaThread != NULL );
--	assert( javaThread->sys_thread != NULL );
--
--	thread = javaThread->sys_thread;
--
--	/*
--	 * The thread that calls this function will alway be the JVM GC thread,
--	 * so skip over it in the list of threads.
--	 */
--	if (	(thread == self)
--		|| ((thread->flags & PTHREAD_FLAGS_PRIVATE) != 1)
--	   )
--	{
--		record_uc(javaThread, &thread->ctx.uc);
--#ifdef DEBUG_BSD_NATIVE_THREADS
--		goto Terminate; // And do nothing with this pthread entry. 
--#endif
--	}
--
--	/*
--	 * Got search candiate..
--	 */
--	if (thread->state != PS_SUSPENDED)
--		dumpThreadLogStates(thread);
--
--	switch ((int)thread->ctxtype)
--	{
--		case CTX_JB_NOSIG:	/* 0) jmp_buf context without signal mask for blocking IO, etc... */
--		case CTX_JB:		/* 1) should never be CTX_JB */
--		case CTX_SJB:		/* 2) should never be CTX_SJB */
--			clear_gc_registers(javaThread);
--#ifdef DEBUG_BSD_NATIVE_THREADS
--			goto Terminate;
--#endif
--			break;
--		case CTX_UC:		/* 3) */
--			/* context is a ucontext_t */
--			record_uc(javaThread, &thread->ctx.uc);
--#ifdef DEBUG_BSD_NATIVE_THREADS
--			goto Terminate;
--#endif
--			break;
--		default:
--#ifdef DEBUG_BSD_NATIVE_THREADS
--			fprintf(stderr, "ctxtype failed %d.\n", thread->ctxtype);
--			goto TermFailed;
--#endif
--			break;
--	}
--
--#ifdef DEBUG_BSD_NATIVE_THREADS
--TermFailed:
--	fprintf(stderr, "Failed to find pthread struct.\n"); fflush(stderr);
--	assert(0);
--
--Terminate:
--	dumpThreadStates();
--#endif
- }
--
--void record_uc(sys_thread_t *t, ucontext_t *uc)
--{
--	mcontext_t *mc = &(uc->uc_mcontext);
--
--	t->regs[0] = mc->mc_eax;
--	t->regs[1] = mc->mc_ecx;
--	t->regs[2] = mc->mc_edx;
--	t->regs[3] = mc->mc_ebx;
--	t->regs[4] = mc->mc_ebp;
--	t->regs[5] = mc->mc_esi;
--	t->regs[6] = mc->mc_edi;
--}
--
--/*
--From /usr/src/lib/libc/i386/gen/_setjmp.S:
--ENTRY(_setjmp)
--	movl	4(%esp),%eax
--	movl	0(%esp),%edx
--	movl	%edx, 0(%eax)	/ * rta * /
--	movl	%ebx, 4(%eax)
--	movl	%esp, 8(%eax)
--	movl	%ebp,12(%eax)
--	movl	%esi,16(%eax)
--	movl	%edi,20(%eax)
--	fnstcw	24(%eax)
--	xorl	%eax,%eax
--	ret
--
--typedef JmpBufStruct
--{
--	int	edx, // Accumulator for operands and results data.
--		ebx, // Pointer to data in the DS segment.
--		esp, // Stack pointer (in the SS segment).
--		ebp, // Pointer to data on the stack (in the SS segment).
--		esi, // Pointer to data in the segment pointer to by the DS register; source pointer for string operations.
--		edi; // Pointer to data (or destination) in the segment pointer to by the ES register; destination pointer for string operations.
--
--} JmpBufStruct;
--
--
--void record_jb(sys_thread_t *t, JmpBufStruct *jb)
--{
--	t->regs[0] = jb->eax; // What about these two register ? they seem missing in jmp_buf.
--	t->regs[1] = / *jb->ecx;* / 0;
--	t->regs[2] = jb->edx; // The rest of these registers are defined...
--	t->regs[3] = jb->ebx;
--	t->regs[4] = jb->ebp;
--	t->regs[5] = jb->esi;
--	t->regs[6] = jb->edi;
--}
--*/
--
--#if 0
--static void
--finish_suspension(void *arg)
--{
--	if (_thread_run->suspended != SUSP_NO)
--		_thread_kern_sched_state(PS_SUSPENDED, __FILE__, __LINE__);
--}
--
--void _pthread_suspend_np_by_pthread_common(pthread_t thread)
--{
--struct timeval  tv;
--struct timespec current_ts;
--
--	switch (thread->state) {
--	case PS_RUNNING:
--		/*
--		 * Remove the thread from the priority queue and
--		 * set the state to suspended:
--		 */
--		PTHREAD_PRIOQ_REMOVE(thread);
--		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
--		break;
--
--	case PS_SPINBLOCK:
--	case PS_FDR_WAIT:
--	case PS_FDW_WAIT:
--	case PS_POLL_WAIT:
--	case PS_SELECT_WAIT:
--		/*
--		 * Remove these threads from the work queue
--		 * and mark the operation as interrupted:
--		 */
--		if ((thread->flags & PTHREAD_FLAGS_IN_WORKQ) != 0)
--			PTHREAD_WORKQ_REMOVE(thread);
--		_thread_seterrno(thread,EINTR);
--
--		/* FALLTHROUGH */
--	case PS_SLEEP_WAIT:
--		thread->interrupted = 1;
--
--		/* FALLTHROUGH */
--	case PS_SIGTHREAD:
--	case PS_WAIT_WAIT:
--	case PS_SIGSUSPEND:
--	case PS_SIGWAIT:
--		/*
--		 * Remove these threads from the waiting queue and
--		 * set their state to suspended:
--		 */
--		PTHREAD_WAITQ_REMOVE(thread);
--		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
--		break;
--
--	case PS_MUTEX_WAIT:
--		/* Mark the thread as suspended and still in a queue. */
--		thread->suspended = SUSP_MUTEX_WAIT;
--
--		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
--		break;
--	case PS_COND_WAIT:
--#if 0
--		/* This is for a pthreads_cond_timedwait() --billh */
--		if (thread->wakeup_time.tv_sec != -1) {
--			/* (1) Use to restore the waiting-queue time that's left when the
--			 * thread is resumed. --billh
--			 */
--			_subtract_timespec3(thread, &current_ts, &thread->remaining_wakeup_time);
--
--			/* (2) So that it's inserted at the end of the waiting queue and
--			 * not scanned by the uthreads_kern.c waiting queue logic. It also
--			 * means to make it wait forever.
--			 */
--			thread->wakeup_time.tv_sec  = -1;
--			thread->wakeup_time.tv_nsec = -1;
--
--			/* (3) Remove and reinsert it at the end of waiting-queue
--			 * (automatic on the insertion attempt when (2)).
--			 */
--			PTHREAD_WORKQ_REMOVE(thread);
--			PTHREAD_WORKQ_INSERT(thread);
--		}
--#endif
--
--		/* Mark the thread as suspended and still in a queue. */
--		thread->suspended = SUSP_COND_WAIT;
--
--		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
--		break;
--	case PS_JOIN:
--		/* Mark the thread as suspended and joining: */
--		thread->suspended = SUSP_JOIN;
--
--		PTHREAD_NEW_STATE(thread, PS_SUSPENDED);
--		break;
--	case PS_FDLR_WAIT:
--	case PS_FDLW_WAIT:
--	case PS_FILE_WAIT:
--		/* Mark the thread as suspended: */
--		thread->suspended = SUSP_YES;
--
--		/*
--		 * Threads in these states may be in queues.
--		 * In order to preserve queue integrity, the
--		 * cancelled thread must remove itself from the
--		 * queue.  Mark the thread as interrupted and
--		 * set the state to running.  When the thread
--		 * resumes, it will remove itself from the queue
--		 * and call the suspension completion routine.
--		 */
--		thread->interrupted = 1;
--		_thread_seterrno(thread, EINTR);
--		PTHREAD_NEW_STATE(thread, PS_RUNNING);
--		thread->continuation = finish_suspension;
--		break;
--
--	case PS_DEAD:
--	case PS_DEADLOCK:
--	case PS_STATE_MAX:
--	case PS_SUSPENDED:
--		/* Nothing needs to be done: */
--		break;
--	}
--}
--
--void _pthread_resume_by_pthread_common(pthread_t thread, enum pthread_susp old_suspended)
--{
--struct timeval  tv;
--struct timespec current_ts,
--		remaining_spec;
--
--	/* Is it currently suspended? */
--	if (thread->state == PS_SUSPENDED) {
--		/*
--		 * Defer signals to protect the scheduling queues
--		 * from access by the signal handler:
--		 */
--		_thread_kern_sig_defer();
--
--		switch (old_suspended) {
--		case SUSP_MUTEX_WAIT:
--			/* Set the thread's state back. */
--			PTHREAD_SET_STATE(thread,PS_MUTEX_WAIT);
--			break;
--		case SUSP_COND_WAIT:
--			/* For cases where it was doing a pthread_cond_timedwait()
--			 * Mark the remaining suspend time.
--			 * --billh
--			 */
--#if 0
--			if (thread->remaining_wakeup_time.tv_sec != -1) {
--				GET_CURRENT_TOD(tv);
--				TIMEVAL_TO_TIMESPEC(&tv, &current_ts);
--
--				_subtract_timespec3(remaining_spec, &thread->wakeup_time, &current_ts);
--				_thread_kern_set_timeout_by_pthread_timespec(thread, &remaining_spec);
--			}
--#endif
--
--			/* Set the thread's state back. */
--			PTHREAD_SET_STATE(thread,PS_COND_WAIT);
--			break;
--		case SUSP_JOIN:
--			/* Set the thread's state back. */
--			PTHREAD_SET_STATE(thread,PS_JOIN);
--			break;
--		case SUSP_NOWAIT:
--			/* Allow the thread to run. */
--			PTHREAD_SET_STATE(thread,PS_RUNNING);
--			PTHREAD_WAITQ_REMOVE(thread);
--			PTHREAD_PRIOQ_INSERT_TAIL(thread);
--			break;
--		case SUSP_NO:
--		case SUSP_YES:
--			/* Allow the thread to run. */
--			PTHREAD_SET_STATE(thread,PS_RUNNING);
--			PTHREAD_PRIOQ_INSERT_TAIL(thread);
--			break;
--		}
--
--		/*
--		 * Undefer and handle pending signals, yielding if
--		 * necessary:
--		 */
--		_thread_kern_sig_undefer();
--	}
--}
--
- #endif
diff --git a/java/jdk15/files/patch-threads_md.c b/java/jdk15/files/patch-threads_md.c
deleted file mode 100644
index d29f1c864ecb..000000000000
--- a/java/jdk15/files/patch-threads_md.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/hpi/native_threads/src/threads_md.c	21 Nov 2001 04:02:04 -0000	1.4
-+++ ../src/solaris/hpi/native_threads/src/threads_md.c	24 Feb 2003 03:17:30 -0000
-@@ -23,6 +23,7 @@
- #include <setjmp.h>

- #include <signal.h>

- #include <sys/types.h>

-+#include <sys/time.h>

- #include <sys/signal.h>

- #include <sys/resource.h>

- #ifdef __FreeBSD__

diff --git a/java/jdk15/pkg-descr b/java/jdk15/pkg-descr
index f923cbfd2320..e3405a6f9a1a 100644
--- a/java/jdk15/pkg-descr
+++ b/java/jdk15/pkg-descr
@@ -1,5 +1,5 @@
 This is the latest patchset from the Java 2 FreeBSD porting project.  This 
-port allows you to easily build a native JDK1.3.1 for FreeBSD.
+port allows you to easily build a native JDK1.4.1 for FreeBSD.
 
 Please note that due to the current Sun licensing policy the resulting binaries
 can't be distributed and you are only permitted to use/hack it personally.
diff --git a/java/jdk15/pkg-message b/java/jdk15/pkg-message
index 1078eecc4824..ce79ffc57690 100644
--- a/java/jdk15/pkg-message
+++ b/java/jdk15/pkg-message
@@ -1,587 +1,705 @@
-SUN COMMUNITY SOURCE LICENSE
-Version 2.3
-(Rev. Date February 22, 1999)
- 
+SUN COMMUNITY SOURCE LICENSE Version 2.3 (Rev.  Date Feb. 
+23, 1999)
+        
 RECITALS
-
-Original Contributor has developed Specifications and Source Code 
-implementations of certain Technology; and
-
-Original Contributor desires to license the Technology to a large community to 
-facilitate research, innovation and product development while maintaining 
-compatibility of such products with the Technology as delivered by Original 
+        
+Original Contributor has developed Specifications and Source
+Code implementations of certain Technology; and
+        
+Original Contributor desires to license the Technology to a
+large community to facilitate research, innovation and
+product development while maintaining compatibility of such
+products with the Technology as delivered by Original
 Contributor; and
+        
+Original Contributor desires to license certain Sun
+Trademarks for the purpose of branding products that are
+compatible with the relevant Technology delivered by
+Original Contributor; and
+               
+You desire to license the Technology and possibly certain
+Sun Trademarks from Original Contributor on the terms and
+conditions specified in this License.
+                 
+In consideration for the mutual covenants contained herein,
+You and Original Contributor agree as follows:
+        
+AGREEMENT
+1.  Introduction.  The Sun Community Source License and
+effective attachments ("License") may include five distinct
+licenses:  Research Use, TCK, Internal Deployment Use,
+Commercial Use and Trademark License.  The Research Use
+license is effective when You click and accept this License.
+The TCK and Internal Deployment Use licenses are effective
+when You click and accept this License, unless otherwise
+specified in the TCK and Internal Deployment Use
+attachments.  The Commercial Use and Trademark licenses must
+be signed by You and Original Contributor in order to become
+effective.  Once effective, these licenses and the
+associated requirements and responsibilities are cumulative.
+Capitalized terms used in this License are defined in the
+Glossary.
+
+2.  License Grants.
+
+2.1 Original Contributor Grant.  Subject to Your compliance
+with Sections 3, 8.10 and Attachment A of this License,
+Original Contributor grants to You a worldwide,
+royalty-free, non-exclusive license, to the extent of
+Original Contributor's Intellectual Property Rights covering
+the Original Code, Upgraded Code and Specifications, to do
+the following:
+
+a) Research Use License:
+
+(i) use, reproduce and modify the Original Code, Upgraded
+Code and Specifications to create Modifications and
+Reformatted Specifications for Research Use by You,
+
+(ii) publish and display Original Code, Upgraded Code and
+Specifications with, or as part of Modifications, as
+permitted under Section 3.1 b) below,
+
+(iii) reproduce and distribute copies of Original Code and
+Upgraded Code to Licensees and students for Research Use by
+You,
+
+(iv) compile, reproduce and distribute Original Code and
+Upgraded Code in Executable form, and Reformatted
+Specifications to anyone for Research Use by You.
+
+b) Other than the licenses expressly granted in this
+License, Original Contributor retains all right, title, and
+interest in Original Code and Upgraded Code and
+Specifications.
 
-Original Contributor desires to license certain Sun Trademarks for the purpose 
-of branding products that are compatible with the relevant Technology delivered 
-by Original Contributor; and
-
-You desire to license the Technology and possibly certain Sun Trademarks from 
-Original Contributor on the terms and conditions specified in this License.
-
-In consideration for the mutual covenants contained herein, You and Original 
-Contributor agree as follows:
-
-AGREEMENT 
-
-1.	Introduction. The Sun Community Source License and effective attachments 
-("License") may include five distinct licenses: Research Use, TCK, Internal 
-Deployment Use, Commercial Use and Trademark License. The Research Use license 
-is effective when You click and accept this License. The TCK and Internal 
-Deployment Use licenses are effective when You click and accept this License, 
-unless otherwise specified in the TCK and Internal Deployment Use attachments. 
-The Commercial Use and Trademark licenses must be signed by You and Original 
-Contributor in order to become effective. Once effective, these licenses and the 
-associated requirements and responsibilities are cumulative. Capitalized terms 
-used in this License are defined in the Glossary.
- 
-2.	License Grants.
-
-2.1	Original Contributor Grant. Subject to Your compliance with Sections 3, 
-8.10 and Attachment A of this License, Original Contributor grants to You a 
-worldwide, royalty-free, non- exclusive license, to the extent of Original 
-Contributor's Intellectual Property Rights covering the Original Code, Upgraded 
-Code and Specifications, to do the following:
- 
-a)	Research Use License: 
-	(i)	use, reproduce and modify the Original Code, Upgraded Code and 
-Specifications to create Modifications and Reformatted Specifications for 
-Research Use by You, 
-	(ii)	publish and display Original Code, Upgraded Code and 
-Specifications with, or as part of Modifications, as permitted under Section 3.1 
-b) below, 
-	(iii)	reproduce and distribute copies of Original Code and Upgraded 
-Code to Licensees and students for Research Use by You,
-	(iv) 	compile, reproduce and distribute Original Code and Upgraded 
-Code in Executable form, and Reformatted Specifications to anyone for Research 
-Use by You.
- 
-b)	Other than the licenses expressly granted in this License, Original 
-Contributor retains all right, title, and interest in Original Code and Upgraded 
-Code and Specifications. 
-           
-2.2	Your Grants. 
-
-a)	To Other Licensees. You hereby grant to each Licensee a license to Your 
-Error Corrections and Shared Modifications, of the same scope and extent as 
-Original Contributor's licenses under Section 2.1 a) above relative to Research 
-Use, Attachment C relative to Internal Deployment Use, and Attachment D relative 
-to Commercial Use.
- 
-b)	To Original Contributor. You hereby grant to Original Contributor a 
-worldwide, royalty-free, non-exclusive, perpetual and irrevocable license, to 
-the extent of Your Intellectual Property Rights covering Your Error Corrections, 
-Shared Modifications and Reformatted Specifications, to use, reproduce, modify, 
-display and distribute Your Error Corrections, Shared Modifications and 
-Reformatted Specifications, in any form, including the right to sublicense such 
-rights through multiple tiers of distribution.
- 
-c)	Other than the licenses expressly granted in Sections 2.2 a) and b) 
-above, and the restriction set forth in Section 3.1 d)(iv) below, You retain all 
-right, title, and interest in Your Error Corrections, Shared Modifications and 
+2.2 Your Grants.
+
+a) To Other Licensees.  You hereby grant to each Licensee a
+license to Your Error Corrections and Shared Modifications,
+of the same scope and extent as Original Contributor's
+licenses under Section 2.1 a) above relative to Research
+Use, Attachment C relative to Internal Deployment Use, and
+Attachment D relative to Commercial Use.
+
+b) To Original Contributor.  You hereby grant to Original
+Contributor a worldwide, royalty-free, non-exclusive,
+perpetual and irrevocable license, to the extent of Your
+Intellectual Property Rights covering Your Error
+Corrections, Shared Modifications and Reformatted
+Specifications, to use, reproduce, modify, display and
+distribute Your Error Corrections, Shared Modifications and
+Reformatted Specifications, in any form, including the right
+to sublicense such rights through multiple tiers of
+distribution.
+
+c) Other than the licenses expressly granted in Sections 2.2
+a) and b) above, and the restriction set forth in Section
+3.1 d)(iv) below, You retain all right, title, and interest
+in Your Error Corrections, Shared Modifications and
 Reformatted Specifications.
- 
-2.3	Contributor Modifications. You may use, reproduce, modify, display and 
-distribute Contributor Error Corrections, Shared Modifications and Reformatted 
-Specifications, obtained by You under this License, to the same scope and extent 
-as with Original Code, Upgraded Code and Specifications. 
- 
-2.4	Subcontracting. You may deliver the Source Code of Covered Code to other 
-Licensees having at least a Research Use license, for the sole purpose of 
-furnishing development services to You in connection with Your rights granted in 
-this License. All such Licensees must execute appropriate documents with respect 
-to such work consistent with the terms of this License, and acknowledging their 
-work-made-for-hire status or assigning exclusive right to the work product and 
-associated Intellectual Property Rights to You.
- 
-3.	Requirements and Responsibilities.
-3.1	Research Use License. As a condition of exercising the rights granted 
-under Section 2.1 a) above, You agree to comply with the following:
-
-a)	Your Contribution to the Community. All Error Corrections and Shared 
-Modifications which You create or contribute to are automatically subject to the 
-licenses granted under Section 2.2 above. You are encouraged to license all of 
-Your other Modifications under Section 2.2 as Shared Modifications, but are not 
-required to do so. You agree to notify Original Contributor of any errors in the 
+
+2.3 Contributor Modifications.  You may use, reproduce,
+modify, display and distribute Contributor Error
+Corrections, Shared Modifications and Reformatted
+Specifications, obtained by You under this License, to the
+same scope and extent as with Original Code, Upgraded Code
+and Specifications.
+
+2.4 Subcontracting.  You may deliver the Source Code of
+Covered Code to other Licensees having at least a Research
+Use license, for the sole purpose of furnishing development
+services to You in connection with Your rights granted in
+this License.  All such Licensees must execute appropriate
+documents with respect to such work consistent with the
+terms of this License, and acknowledging their
+work-made-for-hire status or assigning exclusive right to
+the work product and associated Intellectual Property Rights
+to You.
+
+3.Requirements and Responsibilities.
+
+3.1 Research Use License.  As a condition of exercising the rights 
+granted under Section 2.1 a) above, You agree to comply with the following:
+
+a) Your Contribution to the Community.  All Error
+Corrections and Shared Modifications which You create or
+contribute to are automatically subject to the licenses
+granted under Section 2.2 above.  You are encouraged to
+license all of Your other Modifications under Section 2.2 as
+Shared Modifications, but are not required to do so.  You
+agree to notify Original Contributor of any errors in the
 Specification.
 
-b)	Source Code Availability. You agree to provide all Your Error 
-Corrections to Original Contributor as soon as reasonably practicable and, in 
-any event, prior to Internal Deployment Use or Commercial Use, if applicable.   
-Original Contributor may, at its discretion, post Source Code for Your Error 
-Corrections and Shared Modifications on the Community Webserver. You may also 
-post Error Corrections and Shared Modifications on a web-server of Your choice; 
-provided, that You must take reasonable precautions to ensure that only 
-Licensees have access to such Error Corrections and Shared Modifications. Such 
-precautions shall include, without limitation, a password protection scheme 
-limited to Licensees and a click-on, download certification of Licensee status 
-required of those attempting to download from the server. An example of an 
+b) Source Code Availability.  You agree to provide all Your
+Error Corrections to Original Contributor as soon as
+reasonably practicable and, in any event, prior to Internal
+Deployment Use or Commercial Use, if applicable.  Original
+Contributor may, at its discretion, post Source Code for
+Your Error Corrections and Shared Modifications on the
+Community Webserver.  You may also post Error Corrections
+and Shared Modifications on a web-server of Your choice;
+provided, that You must take reasonable precautions to
+ensure that only Licensees have access to such Error
+Corrections and Shared Modifications.  Such precautions
+shall include, without limitation, a password protection
+scheme limited to Licensees and a click-on, download
+certification of Licensee status required of those
+attempting to download from the server.  An example of an
 acceptable certification is attached as Attachment A-2.
 
-c)	Notices. All Error Corrections and Shared Modifications You create or 
-contribute to must include a file documenting the additions and changes You made 
-and the date of such additions and changes. You must also include the notice set 
-forth in Attachment A-1 in the file header. If it is not possible to put the 
-notice in a particular Source Code file due to its structure, then You must 
-include the notice in a location (such as a relevant directory file), where a 
+c) Notices.  All Error Corrections and Shared Modifications
+You create or contribute to must include a file documenting
+the additions and changes You made and the date of such
+additions and changes.  You must also include the notice set
+forth in Attachment A-1 in the file header.  If it is not
+possible to put the notice in a particular Source Code file
+due to its structure, then You must include the notice in a
+location (such as a relevant directory file), where a
 recipient would be most likely to look for such a notice.
 
-d)	Redistribution.
-
-	(i)	Source. Covered Code may be distributed in Source Code form only 
-to another Licensee (except for students as provided below). You may not offer 
-or impose any terms on any Covered Code that alter the rights, requirements, or 
-responsibilities of such Licensee. You may distribute Covered Code to students 
-for use in connection with their course work and research projects undertaken at 
-accredited educational institutions. Such students need not be Licensees, but 
-must be given a copy of the notice set forth in Attachment A-3 and such notice 
-must also be included in a file header or prominent location in the Source Code 
-made available to such students.
-
-	(ii)	Executable. You may distribute Executable version(s) of Covered 
-Code to Licensees and other third parties only for the purpose of evaluation and 
-comment in connection with Research Use by You and under a license of Your 
-choice, but which limits use of such Executable version(s) of Covered Code only 
-to that purpose. 
-
-	(iii)	 Modified Class, Interface and Package Naming. In connection 
-with Research Use by You only, You may use Original
-Contributor’s class, interface and package names only to accurately reference or 
-invoke the Source Code files You modify.
-Original Contributor grants to You a limited license to the extent necessary for 
-such purposes.
-
-	(iv)	You expressly agree that any distribution, in whole or in part, 
-of Modifications developed by You shall only be done pursuant to the term and 
-conditions of this License.
-
-e)	Extensions.
-
-	(i)	Covered Code. You may not include any Source Code of Community 
-Code in any Extensions;
-
-	(ii) 	Publication. No later than the date on which You first 
-distribute such Extension for Commercial Use, You must publish to the industry, 
-on a non-confidential basis and free of all copyright restrictions with respect 
-to reproduction and use, an accurate and current specification for any 
-Extension. In addition, You must make available an appropriate test suite, 
-pursuant to the same rights as the specification, sufficiently detailed to allow 
-any third party reasonably skilled in the technology to produce implementations 
-of the Extension compatible with the specification. Such test suites must be 
-made available as soon as reasonably practicable but, in no event, later than 
-ninety (90) days after Your first Commercial Use of the Extension. You must use 
-reasonable efforts to promptly clarify and correct the specification and the 
-test suite upon written request by Original Contributor.
-
-	(iii)	Open. You agree to refrain from enforcing any Intellectual 
-Property Rights You may have covering any interface(s) of Your Extension, which 
-would prevent the implementation of such interface(s) by Original Contributor or 
-any Licensee. This obligation does not prevent You from enforcing any 
-Intellectual Property Right You have that would otherwise be infringed by an 
-implementation of Your Extension. 
-
-	(iv)	Class, Interface and Package Naming. You may not add any 
-packages, or any public or protected classes or interfaces with names that 
-originate or might appear to originate from Original Contributor including, 
-without limitation, package or class names which begin with "sun", "java", 
-"javax", "jini", "net.jini", "com.sun" or their equivalents in any subsequent 
-class, interface and/ or package naming convention adopted by Original 
-Contributor. It is specifically suggested that You name any new packages using 
-the "Unique Package Naming Convention" as described in "The Java Language 
-Specification" by James Gosling, Bill Joy, and Guy Steele, ISBN 0-201-63451-1, 
-August 1996. Section 7.7 "Unique Package Names", on page 125 of this 
+d) Redistribution.
+
+(i) Source.  Covered Code may be distributed in Source Code
+form only to another Licensee (except for students as
+provided below).  You may not offer or impose any terms on
+any Covered Code that alter the rights, requirements, or
+responsibilities of such Licensee.  You may distribute
+Covered Code to students for use in connection with their
+course work and research projects undertaken at accredited
+educational institutions.  Such students need not be
+Licensees, but must be given a copy of the notice set forth
+in Attachment A-3 and such notice must also be included in a
+file header or prominent location in the Source Code made
+available to such students.
+
+(ii) Executable.  You may distribute Executable version(s)
+of Covered Code to Licensees and other third parties only
+for the purpose of evaluation and comment in connection with
+Research Use by You and under a license of Your choice, but
+which limits use of such Executable version(s) of Covered
+Code only to that purpose.
+
+(iii) Modified Class,Interface and Package Naming.  In
+connection with Research Use by You only, You may use
+Original Contributor's class, interface and package names
+only to accurately reference or invoke the Source Code files
+You modify.  Original Contributor grants to You a limited
+license to the extent necessary for such purposes.
+
+(iv) You expressly agree that any distribution, in whole or
+in part, of Modifications developed by You shall only be
+done pursuant to the term and conditions of this License.
+
+e) Extensions.
+
+(i) Covered Code.  You may not include any Source Code of
+Community Code in any Extensions;
+
+(ii) Publication.  No later than the date on which You first
+distribute such Extension for Commercial Use, You must
+publish to the industry, on a non-confidential basis and
+free of all copyright restrictions with respect to
+reproduction and use, an accurate and current specification
+for any Extension.  In addition, You must make available an
+appropriate test suite, pursuant to the same rights as the
+specification, sufficiently detailed to allow any third
+party reasonably skilled in the technology to produce
+implementations of the Extension compatible with the
+specification.  Such test suites must be made available as
+soon as reasonably practicable but, in no event, later than
+ninety (90) days after Your first Commercial Use of the
+Extension.  You must use reasonable efforts to promptly
+clarify and correct the specification and the test suite
+upon written request by Original Contributor.
+
+(iii) Open.  You agree to refrain from enforcing any
+Intellectual Property Rights You may have covering any
+interface(s) of Your Extension, which would prevent the
+implementation of such interface(s) by Original Contributor
+or any Licensee.  This obligation does not prevent You from
+enforcing any Intellectual Property Right You have that
+would otherwise be infringed by an implementation of Your
+Extension.
+
+(iv) Class, Interface and Package Naming.  You may not add
+any packages, or any public or protected classes or
+interfaces with names that originate or might appear to
+originate from Original Contributor including, without
+limitation, package or class names which begin with "sun",
+"java", "javax", "jini", "net.jini", "com.sun" or their
+equivalents in any subsequent class, interface and/ or
+package naming convention adopted by Original Contributor.
+It is specifically suggested that You name any new packages
+using the "Unique Package Naming Convention" as described in
+"The Java Language Specification" by James Gosling, Bill
+Joy, and Guy Steele, ISBN 0-201-63451-1, August 1996.
+Section 7.7 "Unique Package Names", on page 125 of this
 specification which states, in part:
 
-"You form a unique package name by first having (or belonging to an organization 
-that has) an Internet domain name, such as "sun.com". You then reverse the name, 
-component by component, to obtain, in this example, "Com.sun", and use this as a 
-prefix for Your package names, using a convention developed within Your 
-organization to further administer package names."
-
-3.2	Additional Requirements and Responsibilities. Any additional 
-requirements and responsibilities relating to the Technology are listed in 
-Attachment F (Additional Requirements and Responsibilities), if applicable, and 
-are hereby incorporated into this Section 3.
- 
-4.	Versions of the License.
- 
-4.1	License Versions. Original Contributor may publish revised versions of 
-the License from time to time. Each version will be given a distinguishing 
-version number.
- 
-4.2	Effect. Once a particular version of Covered Code has been provided 
-under a version of the License, You may always continue to use such Covered Code 
-under the terms of that version of the License. You may also choose to use such 
-Covered Code under the terms of any subsequent version of the License. No one 
-other than Original Contributor has the right to promulgate License versions.
- 
-5.	Disclaimer of Warranty.
- 
-5.1	COVERED CODE IS PROVIDED UNDER THIS LICENSE "AS IS", WITHOUT WARRANTY OF 
-ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES 
-THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR 
-PURPOSE OR NON-INFRINGING. YOU AGREE TO BEAR THE ENTIRE RISK IN CONNECTION WITH 
-YOUR USE AND DISTRIBUTION OF COVERED CODE UNDER THIS LICENSE. THIS DISCLAIMER OF 
-WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED 
-CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO THIS DISCLAIMER.
- 
-5.2	You acknowledge that Original Code, Upgraded Code and Specifications are 
-not designed or intended for use in (i) on-line control of aircraft, air 
-traffic, aircraft navigation or aircraft communications; or (ii) in the design, 
-construction, operation or maintenance of any nuclear facility. Original 
-Contributor disclaims any express or implied warranty of fitness for such uses.
- 
-6.	Termination.
- 
-6.1	By You. You may terminate this Research Use license at anytime by 
-providing written notice to Original Contributor.
-
-6.2	By Original Contributor. This License and the rights granted hereunder 
-will terminate:
-
-	(i)	 automatically if You fail to comply with the terms of this 
-License and fail to cure such breach within 30 days of receipt of written notice 
-of the breach; 
-
-	(ii)	immediately in the event of circumstances specified in Sections 
-7.1 and 8.4; or 
-
-	(iii)	at Original Contributor's discretion upon any action initiated 
-in the first instance by You alleging that use or distribution by Original 
-Contributor or any Licensee, of Original Code, Upgraded Code, Error Corrections 
-or Shared Modifications contributed by You, or Specifications, infringe a patent 
-owned or controlled by You. 
-
-6.3	Effective of Termination. Upon termination, You agree to discontinue use 
-and return or destroy all copies of Covered Code in Your possession. All 
-sublicenses to the Covered Code which You have properly granted shall survive 
-any termination of this License. Provisions which, by their nature, should 
-remain in effect beyond the termination of this License shall survive including, 
-without limitation, Sections 2.2, 3, 5, 7 and 8.
- 
-6.4	Each party waives and releases the other from any claim to compensation 
-or indemnity for permitted or lawful termination of the business relationship 
-established by this License. 
- 
-7.	Liability.
- 
-7.1	Infringement. Should any of the Original Code, Upgraded Code, TCK or 
-Specifications ("Materials") become the subject of a claim of infringement, 
-Original Contributor may, at its sole option, (i) attempt to procure the rights 
-necessary for You to continue using the Materials, (ii) modify the Materials so 
-that they are no longer infringing, or (iii) terminate Your right to use the 
-Materials, immediately upon written notice, and refund to You the amount, if 
-any, having then actually been paid by You to Original Contributor for the 
-Original Code, Upgraded Code and TCK, depreciated on a straight line, five year 
-basis.
- 
-7.2	LIMITATION OF LIABILITY. TO THE FULL EXTENT ALLOWED BY APPLICABLE LAW, 
-ORIGINAL CONTRIBUTOR's LIABILITY TO YOU FOR CLAIMS RELATING TO THIS LICENSE, 
-WHETHER FOR BREACH OR IN TORT, SHALL BE LIMITED TO ONE HUNDRED PERCENT (100%) OF 
-THE AMOUNT HAVING THEN ACTUALLY BEEN PAID BY YOU TO ORIGINAL CONTRIBUTOR FOR ALL 
-COPIES LICENSED HEREUNDER OF THE PARTICULAR ITEMS GIVING RISE TO SUCH CLAIM, IF 
-ANY. IN NO EVENT WILL YOU (RELATIVE TO YOUR SHARED MODIFICATIONS OR ERROR 
-CORRECTIONS) OR SUN BE LIABLE FOR ANY INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL OR 
-CONSEQUENTIAL DAMAGES IN CONNECTION WITH OR ARISING OUT OF THIS LICENSE 
-(INCLUDING, WITHOUT LIMITATION, LOSS OF PROFITS, USE, DATA, OR OTHER ECONOMIC 
-ADVANTAGE), HOWEVER IT ARISES AND ON ANY THEORY OF LIABILITY, WHETHER IN AN 
-ACTION FOR CONTRACT, STRICT LIABILITY OR TORT (INCLUDING NEGLIGENCE) OR 
-OTHERWISE, WHETHER OR NOT YOU OR ORIGINAL CONTRIBUTOR HAS BEEN ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE AND NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE 
-OF ANY REMEDY.
- 
-8.	Miscellaneous.
- 
-8.1	Trademark. You agree to comply with the then current Sun Trademark & 
-Logo Usage Requirements accessible through the SCSL Webpage. Except as expressly 
-provided in the License, You are granted no right, title or license to, or 
-interest in, any Sun Trademarks. You agree not to (i) challenge Original 
-Contributor's ownership or use of Sun Trademarks; (ii) attempt to register any 
-Sun Trademarks, or any mark or logo substantially similar thereto; or (iii) 
-incorporate any Sun Trademarks into Your own trademarks, product names, service 
-marks, company names, or domain names.
- 
-8.2	Integration. This License represents the complete agreement concerning 
-the subject matter hereof. 
-
-8.3	Assignment. Original Contributor may assign this License, and its rights 
-and obligations hereunder, in its sole discretion. You may assign the Research 
-Use portions of this License to a third party upon prior written notice to 
-Original Contributor (which may be provided via the Community Web-Server). You 
-may not assign the Commercial Use license or TCK license, including by way of 
-merger (regardless of whether You are the surviving entity) or acquisition, 
-without Original Contributor's prior written consent. 
- 
-8.4	Severability. If any provision of this License is held to be 
-unenforceable, such provision shall be reformed only to the extent necessary to 
-make it enforceable. Notwithstanding the foregoing, if You are prohibited by law 
-from fully and specifically complying with Sections 2.2 or 3, this License will 
-immediately terminate and You must immediately discontinue any use of Covered 
-Code. 
- 
-8.5	Governing Law. This License shall be governed by the laws of the United 
-States and the State of California, as applied to contracts entered into and to 
-be performed in California between California residents. The application of the 
-United Nations Convention on Contracts for the International Sale of Goods is 
-expressly excluded. 
- 
-8.6	Dispute Resolution. 
-
-a)	Any dispute arising out of or relating to this License shall be finally 
-settled by arbitration as set out herein, except that either party may bring any 
-action, in a court of competent jurisdiction (which jurisdiction shall be 
-exclusive), with respect to any dispute relating to such party's Intellectual 
-Property Rights or with respect to Your compliance with the TCK license. 
-Arbitration shall be administered: (i) by the American Arbitration Association 
-(AAA), (ii) in accordance with the rules of the United Nations Commission on 
-International Trade Law (UNCITRAL) (the "Rules") in effect at the time of 
-arbitration as modified herein; and (iii) the arbitrator will apply the 
-substantive laws of California and United States. Judgement upon the award 
-rendered by the arbitrator may be entered in any court having jurisdiction to 
-enforce such award. 
-
-b)	All arbitration proceedings shall be conducted in English by a single 
-arbitrator selected in accordance with the Rules, who must be fluent in English 
-and be either a retired judge or practicing attorney having at least ten (10) 
-years litigation experience and be reasonably familiar with the technology 
-matters relative to the dispute. Unless otherwise agreed, arbitration venue 
-shall be in London, Tokyo, or San Francisco, whichever is closest to defendant's 
-principal business office.   The arbitrator may award monetary damages only and 
-nothing shall preclude either party from seeking provisional or emergency relief 
-from a court of competent jurisdiction. The arbitrator shall have no authority 
-to award damages in excess of those permitted in this License and any such award 
-in excess is void. All awards will be payable in U.S. dollars and may include, 
-for the prevailing party (i) pre-judgment award interest, (ii) reasonable 
-attorneys' fees incurred in connection with the arbitration, and (iii) 
-reasonable costs and expenses incurred in enforcing the award. The arbitrator 
-will order each party to produce identified documents and respond to no more 
-than twenty-five single question interrogatories.
-
-8.7	Construction. Any law or regulation which provides that the language of 
-a contract shall be construed against the drafter shall not apply to this 
-License. 
- 
-8.8	U.S. Government End Users. The Covered Code is a "commercial item", as 
-that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial 
-computer software" and "commercial computer software documentation", as such 
-terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 
-12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. 
-Government End Users acquire Covered Code with only those rights set forth 
-herein. You agree to pass this notice to Your licensees.
- 
-8.9	Press Announcements. All press announcements relative to the execution 
-of this License must be reviewed and approved by Original Contributor and You 
-prior to release.      
- 
-8.10	International Use.
- 
-a)	Export/Import laws. Covered Code is subject to U.S. export control laws 
-and may be subject to export or import regulations in other countries. Each 
-party agrees to comply strictly with all such laws and regulations and 
-acknowledges their responsibility to obtain such licenses to export, re- export, 
-or import as may be required. You agree to pass these obligations to Your 
-licensees.
- 
-b)	Intellectual Property Protection. Due to limited intellectual property 
-protection and enforcement in certain countries, You agree not to redistribute 
-the Original Code, Upgraded Code, TCK and Specifications to any country other 
+"You form a unique package name by first having (or
+belonging to an organization that has) an Internet domain
+name, such as "sun.com".  You then reverse the name,
+component by component, to obtain, in this example,
+"Com.sun", and use this as a prefix for Your package names,
+using a convention developed within Your organization to
+further administer package names."
+
+3.2 Additional Requirements and Responsibilities.  Any
+additional requirements and responsibilities relating to the
+Technology are listed in Attachment F (Additional
+Requirements and Responsibilities), if applicable, and are
+hereby incorporated into this Section 3.
+
+4.  Versions of the License.
+
+4.1 License Versions.  Original Contributor may publish
+revised versions of the License from time to time.  Each
+version will be given a distinguishing version number.
+
+4.2 Effect.  Once a particular version of Covered Code has
+been provided under a version of the License, You may always
+continue to use such Covered Code under the terms of that
+version of the License.  You may also choose to use such
+Covered Code under the terms of any subsequent version of
+the License.  No one other than Original Contributor has the
+right to promulgate License versions.
+
+5.  Disclaimer of Warranty.
+
+5.1 COVERED CODE IS PROVIDED UNDER THIS LICENSE "AS IS,"
+WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+PURPOSE OR NON-INFRINGING.  YOU AGREE TO BEAR THE ENTIRE
+RISK IN CONNECTION WITH YOUR USE AND DISTRIBUTION OF COVERED
+CODE UNDER THIS LICENSE.  THIS DISCLAIMER OF WARRANTY
+CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.  NO USE OF
+ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO
+THIS DISCLAIMER.
+
+5.2 You acknowledge that Original Code, Upgraded Code and
+Specifications are not designed or intended for use in (i)
+on-line control of aircraft, air traffic, aircraft
+navigation or aircraft communications; or (ii) in the
+design, construction, operation or maintenance of any
+nuclear facility.  Original Contributor disclaims any
+express or implied warranty of fitness for such uses.
+
+6.  Termination.
+
+6.1 By You.  You may terminate this Research Use license at
+anytime by providing written notice to Original Contributor.
+
+6.2 By Original Contributor.  This License and the rights
+granted hereunder will terminate:
+
+(i) automatically if You fail to comply with the terms of
+this License and fail to cure such breach within 30 days of
+receipt of written notice of the breach;
+
+(ii) immediately in the event of circumstances specified in
+Sections 7.1 and 8.4; or
+
+(iii) at Original Contributor's discretion upon any action
+initiated in the first instance by You alleging that use or
+distribution by Original Contributor or any Licensee, of
+Original Code, Upgraded Code, Error Corrections or Shared
+Modifications contributed by You, or Specifications,
+infringe a patent owned or controlled by You.
+
+6.3 Effective of Termination.  Upon termination, You agree
+to discontinue use and return or destroy all copies of
+Covered Code in your possession.  All sublicenses to the
+Covered Code which you have properly granted shall survive
+any termination of this License.  Provisions which, by their
+nature, should remain in effect beyond the termination of
+this License shall survive including, without limitation,
+Sections 2.2, 3, 5, 7 and 8.
+
+6.4 Each party waives and releases the other from any claim
+to compensation or indemnity for permitted or lawful
+termination of the business relationship established by this
+License.
+
+7.  Liability.
+
+7.1 Infringement.  Should any of the Original Code, Upgraded
+Code, TCK or Specifications ("Materials") become the subject
+of a claim of infringement, Original Contributor may, at its
+sole option, (i) attempt to procure the rights necessary for
+You to continue using the Materials, (ii) modify the
+Materials so that they are no longer infringing, or (iii)
+terminate Your right to use the Materials, immediately upon
+written notice, and refund to You the amount, if any, having
+then actually been paid by You to Original Contributor for
+the Original Code, Upgraded Code and TCK, depreciated on a
+straight line, five year basis.
+
+7.2 LIMITATION OF LIABILITY.  TO THE FULL EXTENT ALLOWED BY
+APPLICABLE LAW, ORIGINAL CONTRIBUTOR's LIABILITY TO YOU FOR
+CLAIMS RELATING TO THIS LICENSE, WHETHER FOR BREACH OR IN
+TORT, SHALL BE LIMITED TO ONE HUNDRED PERCENT (100%) OF THE
+AMOUNT HAVING THEN ACTUALLY BEEN PAID BY YOU TO ORIGINAL
+CONTRIBUTOR FOR ALL COPIES LICENSED HEREUNDER OF THE
+PARTICULAR ITEMS GIVING RISE TO SUCH CLAIM, IF ANY.  IN NO
+EVENT WILL YOU (RELATIVE TO YOUR SHARED MODIFICATIONS OR
+ERROR CORRECTIONS) OR SUN BE LIABLE FOR ANY INDIRECT,
+PUNITIVE, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES IN
+CONNECTION WITH OR ARISING OUT OF THIS LICENSE (INCLUDING,
+WITHOUT LIMITATION, LOSS OF PROFITS, USE, DATA, OR OTHER
+ECONOMIC ADVANTAGE), HOWEVER IT ARISES AND ON ANY THEORY OF
+LIABILITY, WHETHER IN AN ACTION FOR CONTRACT, STRICT
+LIABILITY OR TORT (INCLUDING NEGLIGENCE) OR OTHERWISE,
+WHETHER OR NOT YOU OR ORIGINAL CONTRIBUTOR HAS BEEN ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE AND NOTWITHSTANDING THE
+FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY.
+
+8.  Miscellaneous.
+
+8.1 Trademark.  You agree to comply with the then current
+Sun Trademark & Logo Usage Requirements accessible through
+the SCSL Webpage.  Except as expressly provided in the
+License, You are granted no right, title or license to, or
+interest in, any Sun Trademarks.  You agree not to (i)
+challenge Original Contributor's ownership or use of Sun
+Trademarks; (ii) attempt to register any Sun Trademarks, or
+any mark or logo substantially similar thereto; or (iii)
+incorporate any Sun Trademarks into your own trademarks,
+product names, service marks, company names, or domain
+names.
+
+8.2 Integration.  This License represents the complete
+agreement concerning the subject matter hereof.
+
+8.3 Assignment.  Original Contributor may assign this
+License, and its rights and obligations hereunder, in its
+sole discretion.  You may assign the Research Use portions
+of this License to a third party upon prior written notice
+to Original Contributor (which may be provided via the
+Community Web-Server).  You may not assign the Commercial
+Use license or TCK license, including by way of merger
+(regardless of whether You are the surviving entity) or
+acquisition, without Original Contributor's prior written
+consent.
+
+8.4 Severability.  If any provision of this License is held
+to be unenforceable, such provision shall be reformed only
+to the extent necessary to make it enforceable.
+Notwithstanding the foregoing, if You are prohibited by law
+from fully and specifically complying with Sections 2.2 or
+3, this License will immediately terminate and You must
+immediately discontinue any use of Covered Code.
+
+8.5 Governing Law.  This License shall be governed by the
+laws of the United States and the State of California, as
+applied to contracts entered into and to be performed in
+California between California residents.  The application of
+the United Nations Convention on Contracts for the
+International Sale of Goods is expressly excluded.
+
+8.6 Dispute Resolution.
+
+a) Any dispute arising out of or relating to this License
+shall be finally settled by arbitration as set out herein,
+except that either party may bring any action, in a court of
+competent jurisdiction (which jurisdiction shall be
+exclusive), with respect to any dispute relating to such
+party's Intellectual Property Rights or with respect to Your
+compliance with the TCK license.  Arbitration shall be
+administered:  (i) by the American Arbitration Association
+(AAA), (ii) in accordance with the rules of the United
+Nations Commission on International Trade Law (UNCITRAL)
+(the "Rules") in effect at the time of arbitration as
+modified herein; and (iii) the arbitrator will apply the
+substantive laws of California and United States.  Judgment
+upon the award rendered by the arbitrator may be entered in
+any court having jurisdiction to enforce such award.
+
+b) All arbitration proceedings shall be conducted in English
+ by a single arbitrator selected in accordance with the
+ Rules, who must be fluent in English and be either a
+ retired judge or practicing attorney having at least ten
+ (10) years litigation experience and be reasonably familiar
+ with the technology matters relative to the dispute.
+ Unless otherwise agreed, arbitration venue shall be in
+ London, Tokyo, or San Francisco, whichever is closest to
+ defendant's principal business office.  The arbitrator may
+ award monetary damages only and nothing shall preclude
+ either party from seeking provisional or emergency relief
+ from a court of competent jurisdiction.  The arbitrator
+ shall have no authority to award damages in excess of those
+ permitted in this License and any such award in excess is
+ void.  All awards will be payable in U.S.  dollars and may
+ include, for the prevailing party (i) pre-judgment award
+ interest, (ii) reasonable attorneys' fees incurred in
+ connection with the arbitration, and (iii) reasonable costs
+ and expenses incurred in enforcing the award.  The
+ arbitrator will order each party to produce identified
+ documents and respond to no more than twenty-five single
+ question interrogatories.
+
+8.7 Construction.  Any law or regulation which provides that
+the language of a contract shall be construed against the
+drafter shall not apply to this License.
+
+8.8 U.S.  Government End Users.  The Covered Code is a
+"commercial item," as that term is defined in 48 C.F.R.
+2.101 (Oct.  1995), consisting of "commercial computer
+software" and "commercial computer software documentation,"
+as such terms are used in 48 C.F.R.  12.212 (Sept.  1995).
+Consistent with 48 C.F.R.  12.212 and 48 C.F.R.  227.7202-1
+through 227.7202-4 (June 1995), all U.S.  Government End
+Users acquire Covered Code with only those rights set forth
+herein.  You agree to pass this notice to Your licensees.
+
+8.9 Press Announcements.  All press announcements relative
+to the execution of this License must be reviewed and
+approved by Original Contributor and You prior to release.
+
+8.10 International Use.
+
+a) Export/Import laws.  Covered Code is subject to U.S.
+export control laws and may be subject to export or import
+regulations in other countries.  Each party agrees to comply
+strictly with all such laws and regulations and acknowledges
+their responsibility to obtain such licenses to export,
+re-export, or import as may be required.  You agree to pass
+these obligations to Your licensees.
+
+b) Intellectual Property Protection.  Due to limited
+intellectual property protection and enforcement in certain
+countries, You agree not to redistribute the Original Code,
+Upgraded Code, TCK and Specifications to any country other
 than the list of restricted countries on the SCSL Webpage.
- 
-8.11	Language. This License is in the English language only, which language 
-shall be controlling in all respects, and all versions of this License in any 
-other language shall be for accommodation only and shall not be binding on the 
-parties to this License. All communications and notices made or given pursuant 
-to this License, and all documentation and support to be provided, unless 
-otherwise noted, shall be in the English language.
-
-PLEASE READ THE TERMS OF THIS LICENSE CAREFULLY. BY CLICKING ON THE "ACCEPT" 
-BUTTON BELOW YOU ARE ACCEPTING AND AGREEING TO THE TERMS AND CONDITIONS OF THIS 
-LICENSE WITH SUN MICROSYSTEMS, INC. IF YOU ARE AGREEING TO THIS LICENSE ON 
-BEHALF OF A COMPANY, YOU REPRESENT THAT YOU ARE AUTHORIZED TO BIND THE COMPANY 
-TO SUCH A LICENSE. WHETHER YOU ARE ACTING ON YOUR OWN BEHALF, OR REPRESENTING A 
-COMPANY, YOU MUST BE OF MAJORITY AGE AND BE OTHERWISE COMPETENT TO ENTER INTO 
-CONTRACTS. IF YOU DO NOT MEET THIS CRITERIA OR YOU DO NOT AGREE TO ANY OF THE 
-TERMS AND CONDITIONS OF THIS LICENSE, CLICK ON THE REJECT BUTTON TO EXIT.
- 
-ACCEPT              REJECT
+
+8.11 Language.  This License is in the English language
+only, which language shall be controlling in all respects,
+and all versions of this License in any other language shall
+be for accommodation only and shall not be binding on the
+parties to this License.  All communications and notices
+made or given pursuant to this License, and all
+documentation and support to be provided, unless otherwise
+noted, shall be in the English language.
+
+PLEASE READ THE TERMS OF THIS LICENSE CAREFULLY.  BY
+CLICKING ON THE "ACCEPT" BUTTON BELOW YOU ARE ACCEPTING AND
+AGREEING TO THE TERMS AND CONDITIONS OF THIS LICENSE WITH
+SUN MICROSYSTEMS, INC.  IF YOU ARE AGREEING TO THIS LICENSE
+ON BEHALF OF A COMPANY, YOU REPRESENT THAT YOU ARE
+AUTHORIZED TO BIND THE COMPANY TO SUCH A LICENSE.  WHETHER
+YOU ARE ACTING ON YOUR OWN BEHALF, OR REPRESENTING A
+COMPANY, YOU MUST BE OF MAJORITY AGE AND BE OTHERWISE
+COMPETENT TO ENTER INTO CONTRACTS.  IF YOU DO NOT MEET THIS
+CRITERIA OR YOU DO NOT AGREE TO ANY OF THE TERMS AND
+CONDITIONS OF THIS LICENSE, CLICK ON THE REJECT BUTTON TO
+EXIT.
+
+ACCEPT REJECT
 
 GLOSSARY
 
-1.	 "Commercial Use" means any use (excluding Internal Deployment Use) or 
-distribution, directly or indirectly of Compliant Covered Code by You to any 
-third party, alone or bundled with any other software or hardware, for direct or 
-indirect commercial or strategic gain or advantage, subject to execution of 
-Attachment D by You and Original Contributor. 
-
-2.	"Community Code" means the Original Code, Upgraded Code, Error 
-Corrections, Shared Modifications, or any combination thereof.
-
-3.	"Community Webserver(s)" means the webservers designated by Original 
-Contributor for posting Error Corrections and Shared Modifications.
- 
-4.	"Compliant Covered Code" means Covered Code that complies with the 
-requirements of the TCK.
- 
-5.	"Contributor" means each Licensee that creates or contributes to the 
-creation of any Error Correction or Shared Modification.
-
-6.	"Covered Code" means the Original Code, Upgraded Code, Modifications, or 
-any combination thereof.
-
-7.	"Error Correction" means any change made to Community Code which 
-conforms to the Specification and corrects the adverse effect of a failure of 
-Community Code to perform any function set forth in or required by the 
-Specifications.
+1.  "Commercial Use" means any use (excluding Internal
+Deployment Use) or distribution, directly or indirectly of
+Compliant Covered Code by You to any third party, alone or
+bundled with any other software or hardware, for direct or
+indirect commercial or strategic gain or advantage, subject
+to execution of Attachment D by You and Original
+Contributor.
+
+2.  "Community Code" means the Original Code, Upgraded Code,
+Error Corrections, Shared Modifications, or any combination
+thereof.
+
+3.  "Community Webserver(s)" means the webservers designated
+by Original Contributor for posting Error Corrections and
+Shared Modifications.
+
+4.  "Compliant Covered Code" means Covered Code that
+complies with the requirements of the TCK.
+
+5.  "Contributor" means each Licensee that creates or
+contributes to the creation of any Error Correction or
+Shared Modification.
+
+6.  "Covered Code" means the Original Code, Upgraded Code,
+Modifications, or any combination thereof.
+
+7.  "Error Correction" means any change made to Community
+Code which conforms to the Specification and corrects the
+adverse effect of a failure of Community Code to perform any
+function set forth in or required by the Specifications.
+
+7.  "Executable" means Covered Code that has been converted
+to a form other than Source Code.
+
+9.  "Extension(s)" means any additional classes or other
+programming code and/or interfaces developed by or for You
+which:  (i) are designed for use with the Technology; (ii)
+constitute an API for a library of computing functions or
+services; and (iii) are disclosed to third party software
+developers for the purpose of developing software which
+invokes such additional classes or other programming code
+and/or interfaces.  The foregoing shall not apply to
+software development by Your subcontractors to be
+exclusively used by You.
+
+10.  "Intellectual Property Rights" means worldwide
+statutory and common law rights associated solely with (i)
+patents and patent applications; (ii) works of authorship
+including copyrights, copyright applications, copyright
+registrations and "moral rights"; (iii) the protection of
+trade and industrial secrets and confidential information;
+and (iv) divisions, continuations, renewals, and
+re-issuances of the foregoing now existing or acquired in
+the future.
+
+11.  "Internal Deployment Use" means use of Compliant
+Covered Code (excluding Research Use) within Your business
+or organization only by Your employees and/or agents,
+subject to execution of Attachment C by You and Original
+Contributor, if required.
+
+12.  "Licensee" means any party that has entered into and
+has in effect a version of this License with Original
+Contributor.
+
+13.  "Modification(s)" means (i) any change to Covered Code;
+(ii) any new file or other representation of computer
+program statements that contains any portion of Covered
+Code; and/or (iii) any new Source Code implementing any
+portion of the Specifications.
+
+14.  "Original Code" means the initial Source Code for the
+Technology as described on the Technology Download Site.
+
+15.  "Original Contributor" means Sun Microsystems, Inc.,
+its affiliates and its successors and assigns.
+
+16.  "Reformatted Specifications" means any revision to the
+Specifications which translates or reformats the
+Specifications (as for example in connection with Your
+documentation) but which does not alter, subset or superset
+the functional or operational aspects of the Specifications.
+
+17.  "Research Use" means use and distribution of Covered
+Code only for Your research, development, educational or
+personal and individual use, and expressly excludes Internal
+Deployment Use and Commercial Use.
+
+18.  "SCSL Webpage" means the Sun Community Source license
+webpage located at http://sun.com/software/communitysource,
+or such other url that Sun may designate from time to time.
+
+19.  "Shared Modifications" means Modifications provided by
+You, at Your option, pursuant to Section 2.2, or received by
+You from a Contributor pursuant to Section 2.3.
+
+20.  "Source Code" means computer program statements written
+in any high-level, readable form suitable for modification
+and development.
+
+21.  "Specifications" means the specifications for the
+Technology and other documentation, as designated on the
+Technology Download Site, as may be revised by Original
+Contributor from time to time.
+
+22.  "Sun Trademarks" means Original Contributor's SUN,
+JAVA, and JINI trademarks and logos, whether now used or
+adopted in the future.  
+
+23.  "Technology" means the 
+technology described in Attachment B, and Upgrades.
+
+24.  "Technology Compatibility Kit" or "TCK" means the test
+programs, procedures and/or other requirements, designated
+by Original Contributor for use in verifying compliance of
+Covered Code with the Specifications, in conjunction with
+the Original Code and Upgraded Code.  Original Contributor
+may, in its sole discretion and from time to time, revise a
+TCK to correct errors and/or omissions and in connection
+with Upgrades.
+
+25.  "Technology Download Site" means the site(s) designated
+by Original Contributor for access to the Original Code,
+Upgraded Code, TCK and Specifications.
+
+26.  "Upgrade(s)" means new versions of Technology
+designated exclusively by Original Contributor as an
+"Upgrade" and released by Original Contributor from time to
+time.
+
+27.  "Upgraded Code" means the Source Code for Upgrades,
+possibly including Modifications made by Contributors.
+
+28.  "You(r)" means an individual, or a legal entity acting
+by and through an individual or individuals, exercising
+rights either under this License or under a future version
+of this License issued pursuant to Section 4.1.  For legal
+entities, "You(r)" includes any entity that by majority
+voting interest controls, is controlled by, or is under
+common control with You.
 
-7.	"Executable" means Covered Code that has been converted to a form other 
-than Source Code.
-
-9.	"Extension(s)" means any additional classes or other programming code 
-and/or interfaces developed by or for You which: (i) are designed for use with 
-the Technology; (ii) constitute an API for a library of computing functions or 
-services; and (iii) are disclosed to third party software developers for the 
-purpose of developing software which invokes such additional classes or other 
-programming code and/or interfaces. The foregoing shall not apply to software 
-development by Your subcontractors to be exclusively used by You. 
-
-10.	"Intellectual Property Rights" means worldwide statutory and common law 
-rights associated solely with (i) patents and patent applications; (ii) works of 
-authorship including copyrights, copyright applications, copyright registrations 
-and "moral rights"; (iii) the protection of trade and industrial secrets and 
-confidential information; and (iv) divisions, continuations, renewals, and re- 
-issuances of the foregoing now existing or acquired in the future.
-
-11.	"Internal Deployment Use" means use of Compliant Covered Code (excluding 
-Research Use) within Your business or organization only by Your employees and/or 
-agents, subject to execution of Attachment C by You and Original Contributor, if 
-required. 
-
-12.	"Licensee" means any party that has entered into and has in effect a 
-version of this License with Original Contributor.
-
-13.	"Modification(s)" means (i) any change to Covered Code; (ii) any new 
-file or other representation of computer program statements that contains any 
-portion of Covered Code; and/or (iii) any new Source Code implementing any 
-portion of the Specifications. 
- 
-14.	"Original Code" means the initial Source Code for the Technology as 
-described on the Technology Download Site.
-
-15.	"Original Contributor" means Sun Microsystems, Inc., its affiliates and 
-its successors and assigns.
- 
-16.	"Reformatted Specifications" means any revision to the Specifications 
-which translates or reformats the Specifications (as for example in connection 
-with Your documentation) but which does not alter, subset or superset the 
-functional or operational aspects of the Specifications.
- 
-17.	"Research Use" means use and distribution of Covered Code only for Your 
-research, development, educational or personal and individual use, and expressly 
-excludes Internal Deployment Use and Commercial Use.
- 
-18.	"SCSL Webpage" means the Sun Community Source license webpage located at 
-http://sun.com/software/communitysource, or such other url that Sun may 
-designate from time to time.
- 
-19.	"Shared Modifications" means Modifications provided by You, at Your 
-option, pursuant to Section 2.2, or received by You from a Contributor pursuant 
-to Section 2.3.
- 
-20.	"Source Code" means computer program statements written in any 
-high-level, readable form suitable for modification and development.
- 
-21.	"Specifications" means the specifications for the Technology and other 
-documentation, as designated on the Technology Download Site, as may be revised 
-by Original Contributor from time to time.
- 
-22.	"Sun Trademarks" means Original Contributor's SUN, JAVA, and JINI 
-trademarks and logos, whether now used or adopted in the future.
-
-23.	"Technology" means the technology described in Attachment B, and 
-Upgrades.
- 
-24.	"Technology Compatibility Kit" or "TCK" means the test programs, 
-procedures and/or other requirements, designated by Original Contributor for use 
-in verifying compliance of Covered Code with the Specifications, in conjunction 
-with the Original Code and Upgraded Code. Original Contributor may, in its sole 
-discretion and from time to time, revise a TCK to correct errors and/or 
-omissions and in connection with Upgrades.
- 
-25.	"Technology Download Site" means the site(s) designated by Original 
-Contributor for access to the Original Code, Upgraded Code, TCK and 
-Specifications.
- 
-26.	"Upgrade(s)" means new versions of Technology designated exclusively by 
-Original Contributor as an "Upgrade" and released by Original Contributor from 
-time to time.
- 
-27.	"Upgraded Code" means the Source Code for Upgrades, possibly including 
-Modifications made by Contributors.
- 
-28.	"You(r)" means an individual, or a legal entity acting by and through an 
-individual or individuals, exercising rights either under this License or under 
-a future version of this License issued pursuant to Section 4.1.   For legal 
-entities, "You(r)" includes any entity that by majority voting interest 
-controls, is controlled by, or is under common control with You.
- 
 ATTACHMENT A
- 
+
 REQUIRED NOTICES
- 
- 
+
 ATTACHMENT A-1
- 
-REQUIRED IN ALL CASES
- 
-"The contents of this file, or the files included with this file, are subject to 
-the current version of Sun Community Source License for [fill in name of 
-applicable Technology] (the "License"); You may not use this file except in 
-compliance with the License. You may obtain a copy of the License at 
-http://sun.com/software/communitysource. See the License for the rights, 
-obligations and limitations governing use of the contents of the file. 
- 
- 
-The Original and Upgraded Code is [fill in name and version of applicable 
-Technology]. The developer of the Original and Upgraded Code is Sun 
-Microsystems, Inc. Sun Microsystems, Inc. owns the copyrights in the portions it 
-created. All Rights Reserved.
 
+REQUIRED IN ALL CASES
 
- Contributor(s): _______________________________________________
+"The contents of this file, or the files included with this
+file, are subject to the current version of Sun Community
+Source License for [fill in name of applicable Technology]
+(the "License"); You may not use this file except in
+compliance with the License.  You may obtain a copy of the
+License at http://sun.com/software/communitysource.  See the
+License for the rights, obligations and limitations
+governing use of the contents of the file.
 
-Associated Test Suite(s) Location: ________________________________"
+The Original and Upgraded Code is [fill in name and version
+of applicable Technology].  The developer of the Original
+and Upgraded Code is Sun Microsystems, Inc.  Sun
+Microsystems, Inc.  owns the copyrights in the portions it
+created.  All Rights Reserved.
 
+Contributor(s):
+_______________________________________________
 
+Associated Test Suite(s) Location:
+________________________________
 
 ATTACHMENT A-2
- 
-SAMPLE LICENSEE CERTIFICATION 
- 
-"By clicking the 'Agree' button below, You certify that You are a Licensee in 
-good standing under the Sun Community Source License, [fill in applicable 
-Technology and Version] ("License") and that Your access, use and distribution 
-of code and information You may obtain at this site is subject to the License."”
 
+SAMPLE LICENSEE CERTIFICATION
 
+"By clicking the `Agree' button below, You certify that You
+are a Licensee in good standing under the Sun Community
+Source License, [fill in applicable Technology and Version]
+("License") and that Your access, use and distribution of
+code and information You may obtain at this site is subject
+to the License."
 
 ATTACHMENT A-3
- 
+
 REQUIRED STUDENT NOTIFICATION
- 
-"This software and related documentation has been obtained by your educational 
-institution subject to the Sun Community Source License, [fill in applicable 
-Technology]. You have been provided access to the software and related 
-documentation for use only in connection with your course work and research 
-activities as a matriculated student of your educational institution. Any other 
-use is expressly prohibited. 
- 
-THIS SOFTWARE AND RELATED DOCUMENTATION CONTAINS PROPRIETARY MATERIAL OF SUN 
-MICROSYSTEMS, INC, WHICH ARE PROTECTED BY VARIOUS INTELLECTUAL PROPERTY RIGHTS.
- 
-You may not use this file except in compliance with the License. You may obtain 
-a copy of the License on the web at http://sun.com/software/communitysource."”
 
+"This software and related documentation has been obtained
+by your educational institution subject to the Sun Community
+Source License, [fill in applicable Technology].  You have
+been provided access to the software and related
+documentation for use only in connection with your course
+work and research activities as a matriculated student of
+your educational institution.  Any other use is expressly
+prohibited.
 
+THIS SOFTWARE AND RELATED DOCUMENTATION CONTAINS PROPRIETARY
+MATERIAL OF SUN MICROSYSTEMS, INC, WHICH ARE PROTECTED BY
+VARIOUS INTELLECTUAL PROPERTY RIGHTS.
+
+You may not use this file except in compliance with the
+License.  You may obtain a copy of the License on the web at
+http://sun.com/software/communitysource."
 
 ATTACHMENT B
 
@@ -589,378 +707,446 @@ Java(tm) 2 SDK Technology
 
 Description of "Technology"
 
-Java(tm) 2 SDK Technology v.1.3.1 as described on the Technology Download Site.
-
-
+Java(tm) 2 SDK Technology v.1.4.1 as described on the
+Technology Download Site.
 
 ATTACHMENT C
 
 INTERNAL DEPLOYMENT USE
 
-This Attachment C is only effective for the Technology specified in Attachment 
-B, upon execution of Attachment D (Commercial Use License) including the 
-requirement to pay royalties. In the event of a conflict between the terms of 
-this Attachment C and Attachment D, the terms of Attachment D shall govern.
-
-1.	Internal Deployment License Grant. Subject to Your compliance with 
-Section 2 below, and Section 8.10 of the Research Use license; in addition to 
-the Research Use license and the TCK license, Original Contributor grants to You 
-a worldwide, non-exclusive license, to the extent of Original Contributor's 
-Intellectual Property Rights covering the Original Code, Upgraded Code and 
+This Attachment C is only effective for the Technology
+specified in Attachment B, upon execution of Attachment D
+(Commercial Use License) including the requirement to pay
+royalties.  In the event of a conflict between the terms of
+this Attachment C and Attachment D, the terms of Attachment
+D shall govern.
+
+1.  Internal Deployment License Grant.  Subject to Your
+compliance with Section 2 below, and Section 8.10 of the
+Research Use license; in addition to the Research Use
+license and the TCK license, Original Contributor grants to
+You a worldwide, non-exclusive license, to the extent of
+Original Contributor's Intellectual Property Rights covering
+the Original Code, Upgraded Code and Specifications, to do
+the following:
+
+a) reproduce and distribute internally, Original Code and
+Upgraded Code as part of Compliant Covered Code, and
+Specifications, for Internal Deployment Use,
+
+b) compile such Original Code and Upgraded Code, as part of
+Compliant Covered Code, and reproduce and distribute
+internally the same in Executable form for Internal
+Deployment Use, and
+
+c) reproduce and distribute internally, Reformatted
+Specifications for use in connection with Internal
+Deployment Use.
+
+2.  Additional Requirements and Responsibilities.  In
+addition to the requirements and responsibilities described
+under Section 3.1 of the Research Use license, and as a
+condition to exercising the rights granted under Section 3
+above, You agree to the following additional requirements
+and responsibilities:
+
+2.1 Compatibility.  All Covered Code must be Compliant
+Covered Code prior to any Internal Deployment Use or
+Commercial Use, whether originating with You or acquired
+from a third party.  Successful compatibility testing must
+be completed in accordance with the TCK License.  If You
+make any further Modifications to any Covered Code
+previously determined to be Compliant Covered Code, you must
+ensure that it continues to be Compliant Covered Code.
+
+ATTACHMENT D COMMERCIAL USE LICENSE
+
+1.  Effect.  This Attachment D is effective only if signed
+below by You and Original Contributor, and applies to Your
+Commercial Use of Original Code and Upgraded Code.
+
+2.  Term.  Upon execution of this Attachment D by You and
+Original Contributor, this Commercial Use license shall have
+an initial term of 3 years and shall automatically renew for
+additional one year terms unless either party provides
+notice to the other no less than 60 days prior to an
+anniversary date.
+
+3.  Commercial Use License Grant.  Subject to Your
+compliance with Section 4 below, Section 8.10 of the
+Research Use license, and the TCK license; in addition to
+the Research Use license, the TCK license, and the Internal
+Deployment Use license, Original Contributor grants to You a
+worldwide, non-exclusive, non-transferable license, to the
+extent of Original Contributor's Intellectual Property
+Rights covering the Original Code, Upgraded Code and
 Specifications, to do the following:
 
-a)	reproduce and distribute internally, Original Code and Upgraded Code as 
-part of Compliant Covered Code, and Specifications, for Internal Deployment Use,
- 
-b)	compile such Original Code and Upgraded Code, as part of Compliant 
-Covered Code, and reproduce and distribute internally the same in Executable 
-form for Internal Deployment Use, and
-
-c)	reproduce and distribute internally, Reformatted Specifications for use 
-in connection with Internal Deployment Use.
- 
- 2.	Additional Requirements and Responsibilities. In addition to the 
-requirements and responsibilities described under Section 3.1 of the Research 
-Use license, and as a condition to exercising the rights granted under Section 3 
-above, You agree to the following additional requirements and responsibilities:
- 
-2.1	Compatibility. All Covered Code must be Compliant Covered Code prior to 
-any Internal Deployment Use or Commercial Use, whether originating with You or 
-acquired from a third party. Successful compatibility testing must be completed 
-in accordance with the TCK License. If You make any further Modifications to any 
-Covered Code previously determined to be Compliant Covered Code, You must ensure 
-that it continues to be Compliant Covered Code.
-
-
-
-ATTACHMENT D
-COMMERCIAL USE LICENSE
- 
-1.	Effect. This Attachment D is effective only if signed below by You and 
-Original Contributor, and applies to Your Commercial Use of Original Code and 
-Upgraded Code.
- 
-2.	Term. Upon execution of this Attachment D by You and Original 
-Contributor, this Commercial Use license shall have an initial term of 3 years 
-and shall automatically renew for additional one year terms unless either party 
-provides notice to the other no less than 60 days prior to an anniversary date.
- 
-3.	Commercial Use License Grant. Subject to Your compliance with Section 4 
-below, Section 8.10 of the Research Use license, and the TCK license; in 
-addition to the Research Use license, the TCK license, and the Internal 
-Deployment Use license, Original Contributor grants to You a worldwide, 
-non-exclusive, non-transferable license, to the extent of Original Contributor's 
-Intellectual Property Rights covering the Original Code, Upgraded Code and 
-Specifications, to do the following:
-
-a)	reproduce and distribute Compliant Covered Code;
-
-b)	compile Compliant Covered Code and reproduce and distribute the same in 
-Executable form through multiple tiers of distribution; and
-
-c)	reproduce and distribute Reformatted Specifications in association with 
-Compliant Covered Code.				
-
-4.	Additional Requirements and Responsibilities. In addition to the 
-requirements and responsibilities specified in the Research Use license, the TCK 
-license and the Internal Deployment license, and as a condition to exercising 
-the rights granted in Section 3 above, You agree to the following additional 
-requirements and responsibilities:
-
-a)	Distribution of Source Code. Source Code of Compliant Covered Code may 
-be distributed     only to another Licensee of the same Technology.
-
-b)	Distribution of Executable Code. You may distribute the Executable 
-version(s) of Compliant Covered Code under a license of Your choice, which may 
-contain terms different from this License, provided (i) that You are in 
-compliance with the terms of this License, and (ii) You must make it absolutely 
-clear that any terms which differ from this License are offered by You alone, 
-not by Original Contributor or any other Contributor. 
-
-c)	Branding. Products integrating Compliant Covered Code used for 
-Commercial Use must be branded with the Technology compliance logo under a 
-separate trademark license required to be executed by You and Original 
-Contributor concurrent with execution of this Attachment D.
- 
-5.	Indemnity/Limitation of Liability. The provisions of Section 7.1 of the 
-Research Use license are superseded by the following:
-
-a)	Your Indemnity Obligation. You hereby agree to defend, at Your expense, 
-any legal proceeding brought against Original Contributor or any Licensee to the 
-extent it is based on a claim: (i) that the use, reproduction or distribution of 
-any of Your Error Corrections or Shared Modifications is an infringement of a 
-third party trade secret or a copyright in a country that is a signatory to the 
-Berne Convention; (ii) arising in connection with any representation, warranty, 
-support, indemnity, liability or other license terms You may offer in connection 
-with any Covered Code; or (iii) arising from Your Commercial Use of Covered 
-Code, other than a claim covered by Section 5.b) below, or a patent claim based 
-solely on Covered Code not provided by You. You will pay all damages costs and 
-fees awarded by a court of competent jurisdiction, or such settlement amount 
-negotiated by You, attributable to such claim.
-
-b)	Original Contributor's Indemnity Obligation. Original Contributor will 
-defend, at its expense, any legal proceeding brought against You, to the extent 
-it is based on a claim that Your authorized Commercial Use of Original Code and 
-Upgraded Code is an infringement of a third party trade secret or a copyright in 
-a country that is a signatory to the Berne Convention, and will pay all damages 
-costs and fees awarded by a court of competent jurisdiction, or such settlement 
-amount negotiated by Original Contributor, attributable to such claim. The 
-foregoing shall not apply to any claims of intellectual property infringement 
-based upon the combination of code or documentation supplied by Original 
-Contributor with code, technology or documentation from other sources.
-
-c)	Right of Intervention. Original Contributor will have the right, but not 
-the obligation, to defend You, at Original Contributor's expense, in connection 
-with a claim that Your Commercial Use of Original Code and Upgraded Code is an 
-infringement of a third party patent and will, if Original Contributor chooses 
-to defend You, pay all damages costs and fees awarded by a court of competent 
-jurisdiction, or such settlement amount negotiated by Original Contributor, 
-attributable to such claim.
-
-d)	Prerequisites. Under Sections 5.b) and c) above, You must, and under 
-Section 5.a) above, Original Contributor or any Licensee must: (i) provide 
-notice of the claim promptly to the party providing an indemnity; (ii) give the 
-indemnifying party sole control of the defense and settlement of the claim; 
-(iii) provide the indemnifying party, at indemnifying party's expense, all 
-available information, assistance and authority to defend; and (iv) not have 
-compromised or settled such claim or proceeding without the indemnifying party's 
-prior written consent. 
-
-e)	Additional Remedies. Should any Original Code, Upgraded Code, TCK, 
-Specifications, or Modifications become, or in the indemnifying party's opinion 
-be likely to become, the subject of a claim of infringement for which indemnity 
-is provided above, the indemnifying party may, at its sole option, attempt to 
-procure on reasonable terms the rights necessary for the indemnified party to 
-exercise its license rights under this License with respect to the infringing 
-items, or to modify the infringing items so that they are no longer infringing 
-without substantially impairing their function or performance. If the 
-indemnifying party is unable to do the foregoing after reasonable efforts, then 
-the indemnifying party may send a notice of such inability to the indemnified 
-party together with a refund of any license fees received by the indemnifying 
-party from the indemnified party for the infringing items applicable to the 
-indemnified party's future use or distribution of such infringing items, in 
-which case the indemnifying party will not be liable for any damages resulting 
-from infringing activity with respect to the infringing items occurring after 
-such notice and refund.
-
-6.	Support Programs.
-
-Support to You. Technical support is not provided to You by Original Contributor 
-under this License. You may contract for one or more support programs from 
-Original Contributor relating to the Technology which are described on the SCSL 
+a) reproduce and distribute Compliant Covered Code;
+
+b) compile Compliant Covered Code and reproduce and
+distribute the same in Executable form through multiple
+tiers of distribution; and
+
+c) reproduce and distribute Reformatted Specifications in
+association with Compliant Covered Code.
+
+4.  Additional Requirements and Responsibilities.  In
+addition to the requirements and responsibilities specified
+in the Research Use license, the TCK license and the
+Internal Deployment license, and as a condition to
+exercising the rights granted in Section 3 above, You agree
+to the following additional requirements and
+responsibilities:
+
+a) Distribution of Source Code.  Source Code of Compliant
+Covered Code may be distributed only to another Licensee of
+the same Technology.
+
+b) Distribution of Executable Code.  You may distribute the
+Executable version(s) of Compliant Covered Code under a
+license of Your choice, which may contain terms different
+from this License, provided (i) that You are in compliance
+with the terms of this License, and (ii) You must make it
+absolutely clear that any terms which differ from this
+License are offered by You alone, not by Original
+Contributor or any other Contributor.
+
+c) Branding.  Products integrating Compliant Covered Code
+used for Commercial Use must be branded with the Technology
+compliance logo under a separate trademark license required
+to be executed by You and Original Contributor concurrent
+with execution of this Attachment D.
+
+5.  Indemnity/Limitation of Liability.  The provisions of
+Section 7.1 of the Research Use license are superseded by
+the following:
+
+a) Your Indemnity Obligation.  You hereby agree to defend,
+at Your expense, any legal proceeding brought against
+Original Contributor or any Licensee to the extent it is
+based on a claim:  (i) that the use, reproduction or
+distribution of any of Your Error Corrections or Shared
+Modifications is an infringement of a third party trade
+secret or a copyright in a country that is a signatory to
+the Berne Convention; (ii) arising in connection with any
+representation, warranty, support, indemnity, liability or
+other license terms You may offer in connection with any
+Covered Code; or (iii) arising from Your Commercial Use of
+Covered Code, other than a claim covered by Section 5.b)
+below, or a patent claim based solely on Covered Code not
+provided by You.  You will pay all damages costs and fees
+awarded by a court of competent jurisdiction, or such
+settlement amount negotiated by You, attributable to such
+claim.
+
+b) Original Contributor's Indemnity Obligation.  Original
+Contributor will defend, at its expense, any legal
+proceeding brought against You, to the extent it is based on
+a claim that Your authorized Commercial Use of Original Code
+and Upgraded Code is an infringement of a third party trade
+secret or a copyright in a country that is a signatory to
+the Berne Convention, and will pay all damages costs and
+fees awarded by a court of competent jurisdiction, or such
+settlement amount negotiated by Original Contributor,
+attributable to such claim.  The foregoing shall not apply
+to any claims of intellectual property infringement based
+upon the combination of code or documentation supplied by
+Original Contributor with code, technology or documentation
+from other sources.
+
+c) Right of Intervention.  Original Contributor will have
+the right, but not the obligation, to defend You, at
+Original Contributor's expense, in connection with a claim
+that Your Commercial Use of Original Code and Upgraded Code
+is an infringement of a third party patent and will, if
+Original Contributor chooses to defend You, pay all damages
+costs and fees awarded by a court of competent jurisdiction,
+or such settlement amount negotiated by Original
+Contributor, attributable to such claim.
+
+d) Prerequisites.  Under Sections 5.b) and c) above, You
+must, and under Section 5.a) above, Original Contributor or
+any Licensee must:  (i) provide notice of the claim promptly
+to the party providing an indemnity; (ii) give the
+indemnifying party sole control of the defense and
+settlement of the claim; (iii) provide the indemnifying
+party, at indemnifying party's expense, all available
+information, assistance and authority to defend; and (iv)
+not have compromised or settled such claim or proceeding
+without the indemnifying party's prior written consent.
+
+e) Additional Remedies.  Should any Original Code, Upgraded
+Code, TCK, Specifications, or Modifications become, or in
+the indemnifying party's opinion be likely to become, the
+subject of a claim of infringement for which indemnity is
+provided above, the indemnifying party may, at its sole
+option, attempt to procure on reasonable terms the rights
+necessary for the indemnified party to exercise its license
+rights under this License with respect to the infringing
+items, or to modify the infringing items so that they are no
+longer infringing without substantially impairing their
+function or performance.  If the indemnifying party is
+unable to do the foregoing after reasonable efforts, then
+the indemnifying party may send a notice of such inability
+to the indemnified party together with a refund of any
+license fees received by the indemnifying party from the
+indemnified party for the infringing items applicable to the
+indemnified party's future use or distribution of such
+infringing items, in which case the indemnifying party will
+not be liable for any damages resulting from infringing
+activity with respect to the infringing items occurring
+after such notice and refund.
+
+6.  Support Programs.
+
+Support to You.  Technical support is not provided to You by
+Original Contributor under this License.  You may contract
+for one or more support programs from Original Contributor
+relating to the Technology which are described on the SCSL
 Webpage.
 
-Customer Support. You are responsible for providing technical and maintenance 
-support services to Your customers for Your products and services incorporating 
-the Compliant Covered code. 
- 
-7.	Royalties and Payments.
+Customer Support.  You are responsible for providing
+technical and maintenance support services to Your customers
+for Your products and services incorporating the Compliant
+Covered code.
+
+7.  Royalties and Payments.
 
 Technology specified in Attachment B.
- 
-
-Field of Use:____________________			
-
-Royalty per Unit $_______________
-
-
-b)	Royalty Payments. Payment of royalties shall be made quarterly, shall be 
-due thirty (30) days following the end of the calendar quarter to which they 
-relate and shall be submitted with a written statement documenting the basis for 
-the royalty calculation. 
-
-c)	Taxes. All payments required by this License shall be made in United 
-States dollars, are exclusive of taxes, and Licensee agrees to bear and be 
-responsible for the payment of all such taxes, including, but not limited to, 
-all sales, use, rental receipt, personal property or other taxes and their 
-equivalents which may be levied or assessed in connection with this License 
-(excluding only taxes based on Original Contributor's net income). To the extent 
-Licensee is required to withhold taxes based upon Original Contributor's income 
-in any country, You agree to provide Original Contributor with written evidence 
-of such withholding, suitable for Original Contributor to obtain a tax credit in 
-the United States.
-
-d)	Records. You agree to maintain account books and records consistent with 
-Generally Accepted Accounting Principles appropriate to Your domicile, as may be 
-in effect from time to time, sufficient to allow the correctness of the 
-royalties required to be paid pursuant to this License to be determined.				
-
-e)	Audit Rights. Original Contributor shall have the right to audit such 
-accounts upon reasonable prior notice using an independent auditor of Original 
-Contributor's choice (the "Auditor"). The Auditor shall be bound to keep 
-confidential the details of Your business affairs and to limit disclosure of the 
-results of any audit to the sufficiency of the accounts and the amount, if any, 
-of a payment adjustment that should be made. Such audits shall not occur more 
-than once each year (unless discrepancies are discovered in excess of the five 
-percent (5%) threshold set forth in Section 7.f) below, in which case two 
-consecutive quarters per year may be audited). Except as set forth in Section 
-7.f) below, Original Contributor shall bear all costs and expenses associated 
-with the exercise of its rights to audit.
- 
-f)	Payment Errors. In the event that any errors in payments shall be 
-determined, such errors shall be corrected by appropriate adjustment in payment 
-for the quarterly period during which the error is discovered. In the event of 
-an underpayment of more than five percent (5%) of the proper amount owed, upon 
-such underpayment being properly determined by the Auditor, You agree to 
-reimburse Original Contributor the amount of the underpayment and all reasonable 
-costs and expenses associated with the exercise of its rights to audit, and 
-interest on the overdue amount at the maximum allowable interest rate from the 
-date of accrual of such obligation. 
-
-8.	Notice of Breach or Infringement. Each party shall notify the other 
-immediately in writing when it becomes aware of any breach or violation of the 
-terms of this License, or when You become aware of any potential or actual 
-infringement by a third party of the Technology or Sun's Intellectual Property 
-Rights therein. 
- 
-9.	Proprietary Rights Notices. You may not remove any copyright notices, 
-trademark notices or other proprietary legends of Original Contributor or its 
-suppliers contained on or in the Original Code, Upgraded Code and 
+
+Field of Use:____________________
+
+Royalty per Unit $_____________
+
+b) Royalty Payments.  Payment of royalties shall be made
+quarterly, shall be due thirty (30) days following the end
+of the calendar quarter to which they relate and shall be
+submitted with a written statement documenting the basis for
+the royalty calculation.
+
+c) Taxes.  All payments required by this License shall be
+made in United States dollars, are exclusive of taxes, and
+Licensee agrees to bear and be responsible for the payment
+of all such taxes, including, but not limited to, all sales,
+use, rental receipt, personal property or other taxes and
+their equivalents which may be levied or assessed in
+connection with this License (excluding only taxes based on
+Original Contributor's net income).  To the extent Licensee
+is required to withhold taxes based upon Original
+Contributor's income in any country, You agree to provide
+Original Contributor with written evidence of such
+withholding, suitable for Original Contributor to obtain a
+tax credit in the United States.
+
+d) Records.  You agree to maintain account books and records
+consistent with Generally Accepted Accounting Principles
+appropriate to Your domicile, as may be in effect from time
+to time, sufficient to allow the correctness of the
+royalties required to be paid pursuant to this License to be
+determined.
+
+e) Audit Rights.  Original Contributor shall have the right
+to audit such accounts upon reasonable prior notice using an
+independent auditor of Original Contributor's choice (the
+"Auditor").  The Auditor shall be bound to keep confidential
+the details of Your business affairs and to limit disclosure
+of the results of any audit to the sufficiency of the
+accounts and the amount, if any, of a payment adjustment
+that should be made.  Such audits shall not occur more than
+once each year (unless discrepancies are discovered in
+excess of the five percent (5%) threshold set forth in
+Section 7.f) below, in which case two consecutive quarters
+per year may be audited).  Except as set forth in Section
+7.f) below, Original Contributor shall bear all costs and
+expenses associated with the exercise of its rights to
+audit.
+
+f) Payment Errors.  In the event that any errors in payments
+shall be determined, such errors shall be corrected by
+appropriate adjustment in payment for the quarterly period
+during which the error is discovered.  In the event of an
+underpayment of more than five percent (5%) of the proper
+amount owed, upon such underpayment being properly
+determined by the Auditor, You agree to reimburse Original
+Contributor the amount of the underpayment and all
+reasonable costs and expenses associated with the exercise
+of its rights to audit, and interest on the overdue amount
+at the maximum allowable interest rate from the date of
+accrual of such obligation.
+
+8.  Notice of Breach or Infringement.  Each party shall
+notify the other immediately in writing when it becomes
+aware of any breach or violation of the terms of this
+License, or when You become aware of any potential or actual
+infringement by a third party of the Technology or Sun's
+Intellectual Property Rights therein.
+
+9.  Proprietary Rights Notices.  You may not remove any
+copyright notices, trademark notices or other proprietary
+legends of Original Contributor or its suppliers contained
+on or in the Original Code, Upgraded Code and
 Specifications.
- 
-10.	Notices. All written notices required by this License must be delivered 
-in person or by means evidenced by a delivery receipt and will be effective upon 
-receipt by the persons at the addresses specified below.
-
-
-Original Contributor:				You:
-
-Sun Microsystems, Inc.				_____________________________
- 
-901 San Antonio Road				______________________________
-
-Palo Alto, California 94303			______________________________
- 
-Attn.: VP, Sun Software and 
-Technology Sales				______________________________
- 
-cc: Sun Software and Technology, 
-General Counsel
- 
-11.	Disclaimer of Agency. The relationship created hereby is that of 
-licensor and licensee and the parties hereby acknowledge and agree that nothing 
-herein shall be deemed to constitute You as a franchisee of Original 
-Contributor. You hereby waive the benefit of any state or federal statutes 
-dealing with the establishment and regulation of franchises.												
- 
- Agreed:
-
-You:						Original Contributor:
-
-_____________________________			Sun Microsystems, Inc.
-(Your Name)						 
-
-By:__________________________			By:________________________
-
-Name:________________________			Name:______________________
- 
-Title_________________________			Title:_____________________
- 
-Date:_________________________			Date:______________________
-
-
-
-
-ATTACHMENT E 
-TECHNOLOGY COMPATIBILITY KIT
- 
-The following license is effective for the Java(tm)2 SDK Version 1.3.1 
-Technology Compatibility Kit only upon execution of a separate support agreement 
-between You and Original Contributor (subject to an annual fee) as described on 
-the SCSL Webpage. The Technology Compatibility Kit for the Technology specified 
-in Attachment B may be accessed at the Technology Download Site only upon 
-execution of the support agreement.
- 
-1.	TCK License.
-
-a)	Subject to the restrictions set forth in Section 1.b below and Section 
-8.10 of the Research Use license, in addition to the Research Use license, 
-Original Contributor grants to You a worldwide, non-exclusive, non-transferable 
-license, to the extent of Original Contributor's Intellectual Property Rights in 
-the TCK (without the right to sublicense), to use the TCK to develop and test 
-Covered Code.
- 
-b)	TCK Use Restrictions. You are not authorized to create derivative works 
-of the TCK or use the TCK to test any implementation of the Specification that 
-is not Covered Code. You may not publish Your test results or make claims of 
-comparative compatibility with respect to other implementations of the 
-Specification. In consideration for the license grant in Section 1.a above You 
-agree not to develop Your own tests which are intended to validate conformation 
-with the Specification.
-
-2.	Requirements for Determining Compliance.
- 
-2.1	Definitions.
-
-a)	"Added Value" means code which:
-
-	(i)	has a principal purpose which is substantially different from 
-that of the stand-alone Technology; 
-
-	(ii)	represents a significant functional and value enhancement to the 
-Technology;
-
-	(iii) 	operates in conjunction with the Technology; and
-
-	(iv)	is not marketed as a technology which replaces or substitutes 
-for the Technology.
-
-b)	“"Java Classes" means the specific class libraries associated with each 
-Technology defined in Attachment B.
-
-c)	“"Java Runtime Interpreter" means the program(s) which implement the 
-Java virtual machine for the Technology as defined in the Specification.
-
-d)	“"Platform Dependent Part" means those Original Code and Upgraded Code 
-files of the Technology which are not in a "share" directory or subdirectory 
-thereof.
 
-e)	“"Shared Part" means those Original Code and Upgraded Code files of the 
-Technology which are identified as "shared" (or words of similar meaning) or 
-which are in any "share" directory or subdirectory thereof, except those files 
-specifically designated by Original Contributor as modifiable.
+10.  Notices.  All written notices required by this License
+must be delivered in person or by means evidenced by a
+delivery receipt and will be effective upon receipt by the
+persons at the addresses specified below.
+
+Original Contributor:  		You:
 
-f)	 "User's Guide" means the users guide for the TCK which Sun makes 
-available to You to provide direction in how to run the TCK and properly 
-interpret the results, as may be revised by Sun from time to time.
+Sun Microsystems, Inc.  	_____________________________
 
-2.2	Development Restrictions. Compliant Covered Code:
+4150 Network Circle 		______________________________
 
-a)	must include Added Value;
+Santa Clara, California 95054 	______________________________
 
-b)	must fully comply with the Specifications for the Technology specified 
-in Attachment B;
+Attn.:  VP, Sun Software and 
+Technology Sales		______________________________
+cc:  Legal (Software Sales) 
 
-c)	must include the Shared Part, complete and unmodified;
+11.  Disclaimer of Agency.  The relationship created hereby
+is that of licensor and licensee and the parties hereby
+acknowledge and agree that nothing herein shall be deemed to
+constitute You as a franchisee of Original Contributor.  You
+hereby waive the benefit of any state or federal statutes
+dealing with the establishment and regulation of franchises.
 
-d)	may not modify the functional behavior of the Java Runtime Interpreter 
-or the Java Classes;
+Agreed:
 
-e)	may not modify, subset or superset the interfaces of the Java Runtime 
-Interpreter or the Java Classes;
+You: 				Original Contributor:
 
-f)	may not subset or superset the Java Classes; and
+_____________________________ 	Sun Microsystems, Inc.
+(Your Name) 
 
-g)	may not modify or extend the required public class or public interface 
-declarations whose names begin with "java", "javax", "jini", "net.jini", 
-"sun.hotjava", "COM.sun" or their equivalents in any subsequent naming 
-convention.
+By:_________________________	By:_____________________
 
-2.3	Compatibility Testing. Successful compatibility testing must be 
-completed by You, or at Original Contributor's option, a third party designated 
-by Original Contributor, to conduct such tests, in accordance with the User's 
-Guide, and using the most current version of the applicable TCK available from 
-Original Contributor one hundred twenty (120) days (two hundred forty [240] days 
-in the case of silicon implementations) prior to: (i) Your Internal Deployment 
-Use; and (ii) each release of Compliant Covered Code by You for Commercial Use. 
-In the event that You elect to use a version of Upgraded Code that is newer than 
-that which is required under this Section 2.3, then You agree to pass the 
-version of the TCK that corresponds to such newer version of Upgraded Code.
+Title:_______________________	Title:____________________
 
-2.4	Test Results. You agree to provide to Original Contributor or the third 
-party test facility if applicable, Your test results that demonstrate that 
-Covered Code is Compliant Covered Code and that Original Contributor may publish 
-or otherwise distribute such test results.
+Date:______________________ 	Date:____________________
 
+ATTACHMENT E TECHNOLOGY COMPATIBILITY KIT
+
+The following license is effective for the Java(tm)2 SDK
+Technology Compatibility Kit only upon execution
+of a separate support agreement between You and Original
+Contributor (subject to an annual fee) as described on the
+SCSL Webpage.  The Technology Compatibility Kit for the
+Technology specified in Attachment B may be accessed at the
+Technology Download Site only upon execution of the support
+agreement.
+
+1.  TCK License.
+
+a) Subject to the restrictions set forth in Section 1.b
+below and Section 8.10 of the Research Use license, in
+addition to the Research Use license, Original Contributor
+grants to You a worldwide, non-exclusive, non-transferable
+license, to the extent of Original Contributor's
+Intellectual Property Rights in the TCK (without the right
+to sublicense), to use the TCK to develop and test Covered
+Code.
+
+b) TCK Use Restrictions.  You are not authorized to create
+derivative works of the TCK or use the TCK to test any
+implementation of the Specification that is not Covered
+Code.  You may not publish your test results or make claims
+of comparative compatibility with respect to other
+implementations of the Specification.  In consideration for
+the license grant in Section 1.a above you agree not to
+develop your own tests which are intended to validate
+conformation with the Specification.
+
+2.  Requirements for Determining Compliance.
+
+2.1 Definitions.
+
+a) "Added Value" means code which:
+
+(i) has a principal purpose which is substantially different
+from that of the stand-alone Technology;
+
+(ii) represents a significant functional and value
+enhancement to the Technology;
+
+(iii) operates in conjunction with the Technology; and
+
+(iv) is not marketed as a technology which replaces or
+substitutes for the Technology.
+
+b) "Java Classes" means the specific class libraries
+associated with each Technology defined in Attachment B.
+
+c) "Java Runtime Interpreter" means the program(s) which
+implement the Java virtual machine for the Technology as
+defined in the Specification.
+
+d) "Platform Dependent Part" means those Original Code and
+Upgraded Code files of the Technology which are not in a
+"share" directory or subdirectory thereof.
+
+e) "Shared Part" means those Original Code and Upgraded Code
+files of the Technology which are identified as "shared" (or
+words of similar meaning) or which are in any "share"
+directory or subdirectory thereof, except those files
+specifically designated by Original Contributor as
+modifiable.
+
+f) "User's Guide" means the users guide for the TCK which
+Sun makes available to You to provide direction in how to
+run the TCK and properly interpret the results, as may be
+revised by Sun from time to time.
+
+2.2 Development Restrictions.  Compliant Covered Code:
+
+a) must include Added Value;
+
+b) must fully comply with the Specifications for the
+Technology specified in Attachment B;
+
+c) must include the Shared Part, complete and unmodified;
+
+d) may not modify the functional behavior of the Java
+Runtime Interpreter or the Java Classes;
+
+e) may not modify, subset or superset the interfaces of the
+Java Runtime Interpreter or the Java Classes;
+
+f) may not subset or superset the Java Classes; and
+
+g) may not modify or extend the required public class or
+public interface declarations whose names begin with "java",
+"javax", "jini", "net.jini", "sun.hotjava", "COM.sun" or
+their equivalents in any subsequent naming convention.
+
+2.3 Compatibility Testing.  Successful compatibility testing
+must be completed by You, or at Original Contributor's
+option, a third party designated by Original Contributor, to
+conduct such tests, in accordance with the User's Guide, and
+using the most current version of the applicable TCK
+available from Original Contributor one hundred twenty (120)
+days (two hundred forty [240] days in the case of silicon
+implementations) prior to:  (i) Your Internal Deployment
+Use; and (ii) each release of Compliant Covered Code by You
+for Commercial Use.  In the event that You elect to use a
+version of Upgraded Code that is newer than that which is
+required under this Section 2.3, then You agree to pass the
+version of the TCK that corresponds to such newer version of
+Upgraded Code.
 
+2.4 Test Results.  You agree to provide to Original
+Contributor or the third party test facility if applicable,
+Your test results that demonstrate that Covered Code is
+Compliant Covered Code and that Original Contributor may
+publish or otherwise distribute such test results.
+
+ATTACHMENT F ADDITIONAL REQUIREMENTS AND RESPONSIBILITIES
+
+Original Contributor and/or its licensors grant You a non-exclusive and
+non-transferable license for the internal use only of any fonts
+accompanying the Technology.  Title to fonts and all associated
+intellectual property rights are retained by Original Contributor
+and/or its licensors. Unless enforcement is prohibited by applicable law, 
+You may not modify, decompile, or reverse engineer the fonts. 
+You may not redistribute the fonts in any form.
 
diff --git a/java/jdk15/pkg-plist b/java/jdk15/pkg-plist
index 1563ab802105..9cd59d47ecc3 100644
--- a/java/jdk15/pkg-plist
+++ b/java/jdk15/pkg-plist
@@ -1,150 +1,32 @@
 jdk%%JDK_VERSION%%/COPYRIGHT
 jdk%%JDK_VERSION%%/LICENSE
-jdk%%JDK_VERSION%%/LICENSE.fr
 jdk%%JDK_VERSION%%/README
 jdk%%JDK_VERSION%%/README.html
-jdk%%JDK_VERSION%%/bin/.java_wrapper
-%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/ControlPanel
-%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/HtmlConverter
 jdk%%JDK_VERSION%%/bin/appletviewer
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/appletviewer_g
-jdk%%JDK_VERSION%%/bin/awt_robot
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/awt_robot_g
 jdk%%JDK_VERSION%%/bin/extcheck
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/extcheck_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/appletviewer
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/appletviewer_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/extcheck
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/extcheck_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/idlj
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/idlj_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/jar
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jar_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/jarsigner
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jarsigner_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/java
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_g
-%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_vm
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_vm_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/javac
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javac_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/javadoc
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javadoc_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/javah
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javah_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/javap
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javap_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/jdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jdb_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/keytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/keytool_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/native2ascii
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/native2ascii_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjava
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjava_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjavac
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjavac_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjdb_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/policytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/policytool_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/rmic
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/rmic_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/rmid
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/rmid_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/rmiregistry
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/rmiregistry_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/serialver
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/serialver_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/tnameserv
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/tnameserv_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/appletviewer
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/appletviewer_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/extcheck
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/extcheck_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/idlj
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/idlj_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jar
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jar_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jarsigner
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jarsigner_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_g
-%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javac
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javac_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javadoc
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javadoc_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javah
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javah_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javap
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javap_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jdb
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jdb_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/keytool
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/keytool_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/native2ascii
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/native2ascii_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjava
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjava_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjavac
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjavac_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjdb
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjdb_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/policytool
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/policytool_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmic
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmic_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmid
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmid_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmiregistry
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmiregistry_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/serialver
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/serialver_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/tnameserv
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/tnameserv_g
 jdk%%JDK_VERSION%%/bin/idlj
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/idlj_g
 jdk%%JDK_VERSION%%/bin/jar
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jar_g
 jdk%%JDK_VERSION%%/bin/jarsigner
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jarsigner_g
 jdk%%JDK_VERSION%%/bin/java
 jdk%%JDK_VERSION%%/bin/java-rmi.cgi
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/java_g
 jdk%%JDK_VERSION%%/bin/javac
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javac_g
 jdk%%JDK_VERSION%%/bin/javadoc
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javadoc_g
 jdk%%JDK_VERSION%%/bin/javah
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javah_g
 jdk%%JDK_VERSION%%/bin/javap
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javap_g
 jdk%%JDK_VERSION%%/bin/jdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jdb_g
 jdk%%JDK_VERSION%%/bin/keytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/keytool_g
+jdk%%JDK_VERSION%%/bin/kinit
+jdk%%JDK_VERSION%%/bin/klist
+jdk%%JDK_VERSION%%/bin/ktab
 jdk%%JDK_VERSION%%/bin/native2ascii
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/native2ascii_g
-jdk%%JDK_VERSION%%/bin/oldjava
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/oldjava_g
-jdk%%JDK_VERSION%%/bin/oldjavac
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/oldjavac_g
-jdk%%JDK_VERSION%%/bin/oldjdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/oldjdb_g
+jdk%%JDK_VERSION%%/bin/orbd
 jdk%%JDK_VERSION%%/bin/policytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/policytool_g
 jdk%%JDK_VERSION%%/bin/rmic
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmic_g
 jdk%%JDK_VERSION%%/bin/rmid
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmid_g
 jdk%%JDK_VERSION%%/bin/rmiregistry
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmiregistry_g
 jdk%%JDK_VERSION%%/bin/serialver
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/serialver_g
+jdk%%JDK_VERSION%%/bin/servertool
 jdk%%JDK_VERSION%%/bin/tnameserv
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/tnameserv_g
 jdk%%JDK_VERSION%%/demo/applets/Animator/Animation.class
 jdk%%JDK_VERSION%%/demo/applets/Animator/AnimationFrame.class
 jdk%%JDK_VERSION%%/demo/applets/Animator/Animator.class
@@ -184,8 +66,8 @@ jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcControls.class
 jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcTest.class
 jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcTest.java
 jdk%%JDK_VERSION%%/demo/applets/ArcTest/example1.html
-jdk%%JDK_VERSION%%/demo/applets/BarChart/Chart.class
-jdk%%JDK_VERSION%%/demo/applets/BarChart/Chart.java
+jdk%%JDK_VERSION%%/demo/applets/BarChart/BarChart.class
+jdk%%JDK_VERSION%%/demo/applets/BarChart/BarChart.java
 jdk%%JDK_VERSION%%/demo/applets/BarChart/example1.html
 jdk%%JDK_VERSION%%/demo/applets/Blink/Blink$1.class
 jdk%%JDK_VERSION%%/demo/applets/Blink/Blink.class
@@ -195,8 +77,8 @@ jdk%%JDK_VERSION%%/demo/applets/CardTest/CardPanel.class
 jdk%%JDK_VERSION%%/demo/applets/CardTest/CardTest.class
 jdk%%JDK_VERSION%%/demo/applets/CardTest/CardTest.java
 jdk%%JDK_VERSION%%/demo/applets/CardTest/example1.html
-jdk%%JDK_VERSION%%/demo/applets/Clock/Clock2.class
-jdk%%JDK_VERSION%%/demo/applets/Clock/Clock2.java
+jdk%%JDK_VERSION%%/demo/applets/Clock/Clock.class
+jdk%%JDK_VERSION%%/demo/applets/Clock/Clock.java
 jdk%%JDK_VERSION%%/demo/applets/Clock/example1.html
 jdk%%JDK_VERSION%%/demo/applets/DitherTest/DitherCanvas.class
 jdk%%JDK_VERSION%%/demo/applets/DitherTest/DitherControls.class
@@ -279,8 +161,8 @@ jdk%%JDK_VERSION%%/demo/applets/ImageMap/example1.html
 jdk%%JDK_VERSION%%/demo/applets/ImageMap/imagemapcheat.html
 jdk%%JDK_VERSION%%/demo/applets/ImageMap/images/jim.graham.gif
 jdk%%JDK_VERSION%%/demo/applets/ImageMap/sources.html
-jdk%%JDK_VERSION%%/demo/applets/JumpingBox/MouseTrack.class
-jdk%%JDK_VERSION%%/demo/applets/JumpingBox/MouseTrack.java
+jdk%%JDK_VERSION%%/demo/applets/JumpingBox/JumpingBox.class
+jdk%%JDK_VERSION%%/demo/applets/JumpingBox/JumpingBox.java
 jdk%%JDK_VERSION%%/demo/applets/JumpingBox/example1.html
 jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/adapt-or-die.au
 jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/cannot.be.completed.au
@@ -357,34 +239,6 @@ jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/cube.obj
 jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/dinasaur.obj
 jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/hughes_500.obj
 jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/knoxS.obj
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess/CreateCoffees.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess/CreateCoffees.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase/CreateCoffees.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase/CreateCoffees.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess/CreateSuppliers.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess/CreateSuppliers.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase/CreateSuppliers.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase/CreateSuppliers.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr/InsertCoffees.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr/InsertCoffees.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase/InsertCoffees.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase/InsertCoffees.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess/InsertSuppliers.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess/InsertSuppliers.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase/InsertSuppliers.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase/InsertSuppliers.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/JavaDB/CAFEJAVA.MDB
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/JavaDB/CAFEJAVA.ldb
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/private.fls
 jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/FileChooserDemo.jar
 jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/README.txt
 jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images/gifIcon.gif
@@ -395,78 +249,75 @@ jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src/FileChooserDemo.java
 jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/Font2DTest.html
 jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/Font2DTest.jar
 jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_de.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_en.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_en_GB.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_ko.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/resource.data
 jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/Font2DTest.java
+jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/Font2DTestApplet.java
+jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/FontPanel.java
+jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/RangeMenu.java
 jdk%%JDK_VERSION%%/demo/jfc/Java2D/Java2Demo.html
 jdk%%JDK_VERSION%%/demo/jfc/Java2D/Java2Demo.jar
 jdk%%JDK_VERSION%%/demo/jfc/Java2D/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/AnimatingControlsSurface.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/AnimatingSurface.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/CloningFeature.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/ControlsSurface.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/CustomControls.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/CustomControlsContext.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoFonts.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoGroup.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoImages.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/GlobalControls.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/GlobalPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Intro.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Java2Demo.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Java2DemoApplet.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/MemoryMonitor.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/PerformanceMonitor.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/RunWindow.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Surface.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/TextureChooser.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Tools.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/Arcs.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/BezierAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/Curves.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/Ellipses.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/Areas.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/ClipAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/Intersection.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/Text.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors/BullsEye.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors/ColorConvert.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors/Rotator3D.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite/ACimages.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite/ACrules.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite/FadeAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/AllFonts.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/AttributedStr.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/Highlighting.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/Outline.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/Tree.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/DukeAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/ImageOps.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/JPEGFlip.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/WarpImage.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/Caps.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/Dash.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/Joins.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/LineAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix/Balls.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix/BezierScroller.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix/Stars3D.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/GradAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/Gradient.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/Texture.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/TextureAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/Append.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/CurveQuadTo.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/FillStroke.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/WindingRule.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms/Rotate.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms/SelectTx.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms/TransformAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/AnimatingControlsSurface.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/AnimatingSurface.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/CloningFeature.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/ControlsSurface.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/CustomControls.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/CustomControlsContext.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/DemoFonts.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/DemoGroup.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/DemoImages.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/DemoPanel.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/GlobalControls.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/GlobalPanel.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Intro.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Java2Demo.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Java2DemoApplet.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/MemoryMonitor.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/PerformanceMonitor.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/RunWindow.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Surface.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/TextureChooser.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Tools.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Arcs.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/BezierAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Curves.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Ellipses.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping/Areas.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping/ClipAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping/Intersection.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping/Text.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Colors/BullsEye.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Colors/ColorConvert.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Colors/Rotator3D.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Composite/ACimages.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Composite/ACrules.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Composite/FadeAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/AllFonts.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/AttributedStr.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/Highlighting.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/Outline.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/Tree.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images/DukeAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images/ImageOps.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images/JPEGFlip.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images/WarpImage.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines/Caps.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines/Dash.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines/Joins.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines/LineAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Mix/Balls.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Mix/BezierScroller.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Mix/Stars3D.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint/GradAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint/Gradient.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint/Texture.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint/TextureAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths/Append.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths/CurveQuadTo.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths/FillStroke.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths/WindingRule.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Transforms/Rotate.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Transforms/SelectTx.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Transforms/TransformAnim.java
 jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/back.gif
 jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/credits.html
 jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/duke.gif
@@ -522,9 +373,6 @@ jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleData.java
 jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleTree.java
 jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleTreeCellRenderer.java
 jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleTreeModel.java
-jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/SimpleExample.jar
-jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/src/SimpleExample.java
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/README.txt
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/Stylepad.jar
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Notepad.properties
@@ -565,7 +413,193 @@ jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/src/SwingApplet.java
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/README.txt
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2.html
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2.jar
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2Plugin.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/ant.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/bug.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/About.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/COPYRIGHT
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/apple.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/asparagus.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/banana.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/broccoli.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/cantaloupe.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/carrot.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/corn.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/grapefruit.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/grapes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/kiwi.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/onion.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/peach.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/pear.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/pepper.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/pickle.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/pineapple.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/raspberry.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/strawberry.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/tomato.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/watermelon.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/cab.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/cab_small.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/fish.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/fish_small.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/moon.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/moon_small.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/sun.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/sun_small.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/COPYRIGHT
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/ant.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/book.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/bug.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/bug2.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/crest.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/king.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/micro.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/seaweed.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Splash.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b1.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b1d.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b1p.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b1r.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b2.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b2d.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b2p.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b2r.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b3.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b3d.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b3p.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b3r.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/bl.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/bldn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/bm.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/bmdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/br.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/brdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/c.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cb.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cbr.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cbrs.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cbs.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/ml.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/mldn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/mr.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/mrdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rb.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rbp.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rbr.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rbrs.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rbs.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tl.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tldn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tm.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tmdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/toggle.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/toggledn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tr.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/trdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/brenteyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/brenthair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/brentmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/georgeseyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/georgeshair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/georgesmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/hanseyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/hanshair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/hansmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/howardeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/howardhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/howardmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jameseyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jameshair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jamesmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jeffeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jeffhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jeffmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/joneyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jonhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jonmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/laraeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/larahair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/laramouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/larryeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/larryhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/larrymouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/lisaeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/lisahair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/lisamouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/michaeleyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/michaelhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/michaelmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/philipeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/philiphair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/philipmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/scotteyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/scotthair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/scottmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser/find.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser/gifIcon.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser/help.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser/jpgIcon.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/htmldemo/back.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/htmldemo/forward.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/htmldemo/header.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/blue.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/cyan.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/gray.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/green.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/magenta.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/red.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/yellow.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/optionpane/bottle.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/optionpane/ibd.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/optionpane/ibu.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/COPYRIGHT
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/colheader.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/crayons.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/lowerleft.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/rowheader.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/upperleft.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/upperright.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/splitpane/README
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/splitpane/earth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/splitpane/moon.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/blake.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/brooke.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/david.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/ewan.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/ewan.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/hania.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/laine.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/matthew.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/stephen.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JButton.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JColorChooser.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JComboBox.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JDesktop.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JDialog.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JEditorPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JFileChooser.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JList.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JMenu.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JOptionPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JProgressBar.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JRadioButton.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JScrollBar.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JScrollPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JSlider.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JSplitPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JTabbedPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JTable.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JTree.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/ToolTip.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tooltip/cow.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/index.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/king.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/preface.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/seaweed.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/swingset.properties
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/swingset_zh_CN.properties
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/title.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/tree.txt
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/AquaTheme.java
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/BezierAnimationPanel.java
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ButtonDemo.java
@@ -608,260 +642,86 @@ jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableExample4.java
 jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableMap.java
 jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableSorter.java
 jdk%%JDK_VERSION%%/demo/jpda/examples.jar
-jdk%%JDK_VERSION%%/demo/sound/JavaSound.html
-jdk%%JDK_VERSION%%/demo/sound/JavaSound.jar
-jdk%%JDK_VERSION%%/demo/sound/README.txt
-jdk%%JDK_VERSION%%/demo/sound/media/ambient.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/bark.aiff
-jdk%%JDK_VERSION%%/demo/sound/media/bong.wav
-jdk%%JDK_VERSION%%/demo/sound/media/classical.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/modern-rock.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/sfx-medley.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/spacemusic.au
-jdk%%JDK_VERSION%%/demo/sound/media/trance.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/trippygaia1.mid
-jdk%%JDK_VERSION%%/demo/sound/src/CapturePlayback.java
-jdk%%JDK_VERSION%%/demo/sound/src/ControlContext.java
-jdk%%JDK_VERSION%%/demo/sound/src/Groove.java
-jdk%%JDK_VERSION%%/demo/sound/src/JavaSound.java
-jdk%%JDK_VERSION%%/demo/sound/src/JavaSoundApplet.java
-jdk%%JDK_VERSION%%/demo/sound/src/Juke.java
-jdk%%JDK_VERSION%%/demo/sound/src/MidiSynth.java
-jdk%%JDK_VERSION%%/demo/sound/src/TempoDial.java
-jdk%%JDK_VERSION%%/include-old/StubPreamble.h
-jdk%%JDK_VERSION%%/include-old/alloc_cache.h
-jdk%%JDK_VERSION%%/include-old/bag.h
-jdk%%JDK_VERSION%%/include-old/bool.h
-jdk%%JDK_VERSION%%/include-old/breakpoints.h
-jdk%%JDK_VERSION%%/include-old/byteorder.h
-jdk%%JDK_VERSION%%/include-old/common_exceptions.h
-jdk%%JDK_VERSION%%/include-old/debug.h
-jdk%%JDK_VERSION%%/include-old/dll.h
-jdk%%JDK_VERSION%%/include-old/exceptions.h
-jdk%%JDK_VERSION%%/include-old/freebsd/byteorder_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/gc_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/hpi_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/io_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/jawt_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/jmath_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/jvm_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/miscdefs_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/path_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/sysmacros_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/timeval_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/typedefs_md.h
-jdk%%JDK_VERSION%%/include-old/gc.h
-jdk%%JDK_VERSION%%/include-old/hpi.h
-jdk%%JDK_VERSION%%/include-old/interpreter.h
-jdk%%JDK_VERSION%%/include-old/javaString.h
-jdk%%JDK_VERSION%%/include-old/java_lang_ClassLoader.h
-jdk%%JDK_VERSION%%/include-old/java_lang_String.h
-jdk%%JDK_VERSION%%/include-old/java_lang_Thread.h
-jdk%%JDK_VERSION%%/include-old/java_lang_ThreadGroup.h
-jdk%%JDK_VERSION%%/include-old/jawt.h
-jdk%%JDK_VERSION%%/include-old/jit.h
-jdk%%JDK_VERSION%%/include-old/jmath.h
-jdk%%JDK_VERSION%%/include-old/jvm.h
-jdk%%JDK_VERSION%%/include-old/jvmdi.h
-jdk%%JDK_VERSION%%/include-old/jvmpi.h
-jdk%%JDK_VERSION%%/include-old/log.h
-jdk%%JDK_VERSION%%/include-old/monitor.h
-jdk%%JDK_VERSION%%/include-old/monitor_cache.h
-jdk%%JDK_VERSION%%/include-old/native.h
-jdk%%JDK_VERSION%%/include-old/oldnmi.h
-jdk%%JDK_VERSION%%/include-old/oobj.h
-jdk%%JDK_VERSION%%/include-old/opcodes.h
-jdk%%JDK_VERSION%%/include-old/path.h
-jdk%%JDK_VERSION%%/include-old/reflect.h
-jdk%%JDK_VERSION%%/include-old/signature.h
-jdk%%JDK_VERSION%%/include-old/sys_api.h
-jdk%%JDK_VERSION%%/include-old/threads.h
-jdk%%JDK_VERSION%%/include-old/tree.h
-jdk%%JDK_VERSION%%/include-old/typecodes.h
-jdk%%JDK_VERSION%%/include-old/typedefs.h
-jdk%%JDK_VERSION%%/include-old/utf.h
-jdk%%JDK_VERSION%%/include-old/util.h
-jdk%%JDK_VERSION%%/include-old/vmprofiler.h
-jdk%%JDK_VERSION%%/include-old/wrap.h
-jdk%%JDK_VERSION%%/include/freebsd/jawt_md.h
-jdk%%JDK_VERSION%%/include/freebsd/jni_md.h
+jdk%%JDK_VERSION%%/include/bsd/jawt_md.h
+jdk%%JDK_VERSION%%/include/bsd/jni_md.h
 jdk%%JDK_VERSION%%/include/jawt.h
 jdk%%JDK_VERSION%%/include/jni.h
 jdk%%JDK_VERSION%%/include/jvmdi.h
 jdk%%JDK_VERSION%%/include/jvmpi.h
 jdk%%JDK_VERSION%%/jre/CHANGES
 jdk%%JDK_VERSION%%/jre/COPYRIGHT
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/ControlPanel.html
 jdk%%JDK_VERSION%%/jre/LICENSE
-jdk%%JDK_VERSION%%/jre/LICENSE.fr
 jdk%%JDK_VERSION%%/jre/README
 jdk%%JDK_VERSION%%/jre/Welcome.html
-jdk%%JDK_VERSION%%/jre/bin/.java_wrapper
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/ControlPanel
-jdk%%JDK_VERSION%%/jre/bin/awt_robot
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/appletviewer
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/appletviewer_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/extcheck
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/extcheck_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/idlj
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/idlj_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jar
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jar_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jarsigner
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jarsigner_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_g
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_vm
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_vm_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javac
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javac_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javadoc
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javadoc_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javah
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javah_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javap
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javap_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jdb_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/keytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/keytool_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/native2ascii
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/native2ascii_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjava
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjava_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjavac
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjavac_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjdb_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/policytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/policytool_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmic
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmic_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmid
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmid_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmiregistry
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmiregistry_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/serialver
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/serialver_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/tnameserv
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/tnameserv_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/appletviewer_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/extcheck_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/idlj_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jar_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jarsigner_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_g
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javac_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javadoc_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javah_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javap_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jdb_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/keytool
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/keytool_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/native2ascii_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjava_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjavac_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjdb_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/policytool
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/policytool_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmic_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmid
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmid_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmiregistry
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmiregistry_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/serialver_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/tnameserv
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/tnameserv_g
 jdk%%JDK_VERSION%%/jre/bin/java
 jdk%%JDK_VERSION%%/jre/bin/keytool
+jdk%%JDK_VERSION%%/jre/bin/kinit
+jdk%%JDK_VERSION%%/jre/bin/klist
+jdk%%JDK_VERSION%%/jre/bin/ktab
+jdk%%JDK_VERSION%%/jre/bin/orbd
 jdk%%JDK_VERSION%%/jre/bin/policytool
 jdk%%JDK_VERSION%%/jre/bin/rmid
 jdk%%JDK_VERSION%%/jre/bin/rmiregistry
+jdk%%JDK_VERSION%%/jre/bin/servertool
 jdk%%JDK_VERSION%%/jre/bin/tnameserv
 jdk%%JDK_VERSION%%/jre/lib/audio/soundbank.gm
+jdk%%JDK_VERSION%%/jre/lib/charsets.jar
 jdk%%JDK_VERSION%%/jre/lib/cmm/CIEXYZ.pf
 jdk%%JDK_VERSION%%/jre/lib/cmm/GRAY.pf
 jdk%%JDK_VERSION%%/jre/lib/cmm/LINEAR_RGB.pf
 jdk%%JDK_VERSION%%/jre/lib/cmm/PYCC.pf
 jdk%%JDK_VERSION%%/jre/lib/cmm/sRGB.pf
 jdk%%JDK_VERSION%%/jre/lib/content-types.properties
+jdk%%JDK_VERSION%%/jre/lib/ext/dnsns.jar
+jdk%%JDK_VERSION%%/jre/lib/ext/ldapsec.jar
+jdk%%JDK_VERSION%%/jre/lib/ext/localedata.jar
+jdk%%JDK_VERSION%%/jre/lib/ext/sunjce_provider.jar
 jdk%%JDK_VERSION%%/jre/lib/flavormap.properties
 jdk%%JDK_VERSION%%/jre/lib/font.properties
 jdk%%JDK_VERSION%%/jre/lib/font.properties.ja
-jdk%%JDK_VERSION%%/jre/lib/font.properties.ru
-jdk%%JDK_VERSION%%/jre/lib/font.properties.uk
 jdk%%JDK_VERSION%%/jre/lib/font.properties.zh
-jdk%%JDK_VERSION%%/jre/lib/font.properties.zh_CN
 jdk%%JDK_VERSION%%/jre/lib/font.properties.zh_TW
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiBold.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiItalic.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightItalic.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightRegular.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiBold.ttf
-jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiOblique.ttf
-jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansOblique.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansRegular.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBold.ttf
-jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBoldOblique.ttf
-jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterOblique.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir
-jdk%%JDK_VERSION%%/jre/lib/i18n.jar
-jdk%%JDK_VERSION%%/jre/lib/i386/classic/Xusage.txt
-jdk%%JDK_VERSION%%/jre/lib/i386/classic/libjvm.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/classic/libjvm_g.so
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/Xusage.txt
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm.so
-%%HOTSPOT:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm_g.so
-jdk%%JDK_VERSION%%/jre/lib/i386/green_threads/libhpi.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/green_threads/libhpi_g.so
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/hotspot
+jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot
+jdk%%JDK_VERSION%%/jre/lib/i386/client/Xusage.txt
+jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig.so
+jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm.so
+jdk%%JDK_VERSION%%/jre/lib/i386/jvm.cfg
 jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc_g.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libagent.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libagent_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libawt.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libawt_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libcmm.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libcmm_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr_g.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libhprof.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libhprof_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libioser12.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libioser12_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libjaas_unix.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjava.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni.so
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjawt.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjawt_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjcov.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjcov_g.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libjsig.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjsound.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjsound_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libnet.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libnet_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libnio.so
+jdk%%JDK_VERSION%%/jre/lib/i386/librmi.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libverify.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libverify_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libzip.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libzip_g.so
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi.so
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi_g.so
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/Xusage.txt
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm.so
-%%HOTSPOT:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi.so
+jdk%%JDK_VERSION%%/jre/lib/i386/server/Xusage.txt
+jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig.so
+jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm.so
+jdk%%JDK_VERSION%%/jre/lib/im/indicim.jar
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/cursors.properties
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/invalid32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_CopyDrop32x32.gif
@@ -870,43 +730,428 @@ jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkDrop32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveDrop32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/javaplugin.jar
-jdk%%JDK_VERSION%%/jre/lib/jvm.cfg
+jdk%%JDK_VERSION%%/jre/lib/jce.jar
+jdk%%JDK_VERSION%%/jre/lib/jsse.jar
 jdk%%JDK_VERSION%%/jre/lib/jvm.hprof.txt
 jdk%%JDK_VERSION%%/jre/lib/jvm.jcov.txt
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
+jdk%%JDK_VERSION%%/jre/lib/logging.properties
 jdk%%JDK_VERSION%%/jre/lib/psfont.properties.ja
 jdk%%JDK_VERSION%%/jre/lib/psfontj2d.properties
 jdk%%JDK_VERSION%%/jre/lib/rt.jar
+jdk%%JDK_VERSION%%/jre/lib/security/US_export_policy.jar
 jdk%%JDK_VERSION%%/jre/lib/security/cacerts
 jdk%%JDK_VERSION%%/jre/lib/security/java.policy
 jdk%%JDK_VERSION%%/jre/lib/security/java.security
+jdk%%JDK_VERSION%%/jre/lib/security/local_policy.jar
 jdk%%JDK_VERSION%%/jre/lib/sunrsasign.jar
-jdk%%JDK_VERSION%%/jre/lib/tzmappings
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin.so
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin_g.so
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji.so
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji_g.so
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Abidjan
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Accra
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Addis_Ababa
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Algiers
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Asmera
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bamako
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bangui
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Banjul
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bissau
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Blantyre
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Brazzaville
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bujumbura
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Cairo
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Casablanca
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ceuta
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Conakry
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Dakar
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Dar_es_Salaam
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Djibouti
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Douala
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/El_Aaiun
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Freetown
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Gaborone
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Harare
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Johannesburg
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kampala
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Khartoum
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kigali
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kinshasa
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lagos
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Libreville
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lome
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Luanda
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lubumbashi
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lusaka
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Malabo
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Maputo
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Maseru
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Mbabane
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Mogadishu
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Monrovia
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Nairobi
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ndjamena
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Niamey
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Nouakchott
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ouagadougou
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Porto-Novo
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Sao_Tome
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Timbuktu
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Tripoli
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Tunis
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Windhoek
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Adak
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Anchorage
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Anguilla
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Antigua
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Araguaina
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Aruba
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Asuncion
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Barbados
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Belem
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Belize
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Boa_Vista
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Bogota
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Boise
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Buenos_Aires
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cambridge_Bay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cancun
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Caracas
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Catamarca
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayenne
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayman
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Chicago
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Chihuahua
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cordoba
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Costa_Rica
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cuiaba
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Curacao
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Danmarkshavn
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Dawson
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Dawson_Creek
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Denver
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Detroit
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Dominica
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Edmonton
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Eirunepe
+jdk%%JDK_VERSION%%/jre/lib/zi/America/El_Salvador
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Fortaleza
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Glace_Bay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Godthab
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Goose_Bay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Grand_Turk
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Grenada
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Guadeloupe
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Guatemala
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Guayaquil
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Guyana
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Halifax
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Havana
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Hermosillo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Knox
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Marengo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vevay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Indianapolis
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Inuvik
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Iqaluit
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Jamaica
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Jujuy
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Juneau
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Kentucky/Monticello
+jdk%%JDK_VERSION%%/jre/lib/zi/America/La_Paz
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Lima
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Los_Angeles
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Louisville
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Maceio
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Managua
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Manaus
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Martinique
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Mazatlan
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Mendoza
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Menominee
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Merida
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Mexico_City
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Miquelon
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Monterrey
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Montevideo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Montreal
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Montserrat
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Nassau
+jdk%%JDK_VERSION%%/jre/lib/zi/America/New_York
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Nipigon
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Nome
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Noronha
+jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota/Center
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Panama
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Pangnirtung
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Paramaribo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Phoenix
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Port-au-Prince
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Port_of_Spain
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Porto_Velho
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Puerto_Rico
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Rainy_River
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Rankin_Inlet
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Recife
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Regina
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Rio_Branco
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Santiago
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Santo_Domingo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Sao_Paulo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Scoresbysund
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Johns
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Kitts
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Lucia
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Thomas
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Vincent
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Swift_Current
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Tegucigalpa
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Thule
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Thunder_Bay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Tijuana
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Tortola
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Vancouver
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Whitehorse
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Winnipeg
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Yakutat
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Yellowknife
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Casey
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Davis
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/DumontDUrville
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Mawson
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/McMurdo
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Palmer
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Syowa
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Vostok
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aden
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Almaty
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Amman
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Anadyr
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aqtau
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aqtobe
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ashgabat
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Baghdad
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bahrain
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Baku
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bangkok
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Beirut
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bishkek
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Brunei
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Calcutta
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Choibalsan
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Chongqing
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Colombo
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Damascus
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dhaka
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dili
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dubai
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dushanbe
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Gaza
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Harbin
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hong_Kong
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hovd
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Irkutsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jakarta
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jayapura
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jerusalem
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kabul
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kamchatka
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Karachi
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kashgar
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Katmandu
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Krasnoyarsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuala_Lumpur
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuching
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuwait
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Macau
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Magadan
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Makassar
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Manila
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Muscat
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Nicosia
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Novosibirsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Omsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Oral
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Phnom_Penh
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Pontianak
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Pyongyang
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Qatar
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Qyzylorda
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Rangoon
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh87
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh88
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh89
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Saigon
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Sakhalin
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Samarkand
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Seoul
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Shanghai
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Singapore
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Taipei
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tashkent
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tbilisi
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tehran
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Thimphu
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tokyo
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ulaanbaatar
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Urumqi
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Vientiane
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Vladivostok
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yakutsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yekaterinburg
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yerevan
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Azores
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Bermuda
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Canary
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Cape_Verde
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Faeroe
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Madeira
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Reykjavik
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/South_Georgia
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/St_Helena
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Stanley
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Adelaide
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Brisbane
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Broken_Hill
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Darwin
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Hobart
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lindeman
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lord_Howe
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Melbourne
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Perth
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Sydney
+jdk%%JDK_VERSION%%/jre/lib/zi/CET
+jdk%%JDK_VERSION%%/jre/lib/zi/EET
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+1
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+10
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+11
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+12
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+2
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+3
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+4
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+5
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+6
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+7
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+8
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+9
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-1
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-10
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-11
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-12
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-13
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-14
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-2
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-3
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-4
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-5
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-6
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-7
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-8
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-9
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/UCT
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/UTC
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Amsterdam
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Andorra
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Athens
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Belfast
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Belgrade
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Berlin
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Brussels
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Bucharest
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Budapest
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Chisinau
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Copenhagen
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Dublin
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Gibraltar
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Helsinki
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Istanbul
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Kaliningrad
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Kiev
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Lisbon
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/London
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Luxembourg
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Madrid
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Malta
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Minsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Monaco
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Moscow
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Oslo
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Paris
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Prague
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Riga
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Rome
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Samara
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Simferopol
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Sofia
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Stockholm
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Tallinn
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Tirane
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Uzhgorod
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vaduz
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vienna
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vilnius
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Warsaw
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zaporozhye
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zurich
+jdk%%JDK_VERSION%%/jre/lib/zi/GMT
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Antananarivo
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Chagos
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Christmas
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Cocos
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Comoro
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Kerguelen
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mahe
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Maldives
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mauritius
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mayotte
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Reunion
+jdk%%JDK_VERSION%%/jre/lib/zi/MET
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Apia
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Auckland
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Chatham
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Easter
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Efate
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Enderbury
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Fakaofo
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Fiji
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Funafuti
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Galapagos
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Gambier
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Guadalcanal
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Guam
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Honolulu
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Johnston
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kiritimati
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kosrae
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kwajalein
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Majuro
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Marquesas
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Midway
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Nauru
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Niue
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Norfolk
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Noumea
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Pago_Pago
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Palau
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Pitcairn
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Ponape
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Port_Moresby
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Rarotonga
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Saipan
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tahiti
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tarawa
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tongatapu
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Truk
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wake
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wallis
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Yap
+jdk%%JDK_VERSION%%/jre/lib/zi/WET
+jdk%%JDK_VERSION%%/jre/lib/zi/ZoneInfoMappings
 jdk%%JDK_VERSION%%/lib/dt.jar
-%%PLUGIN:%%jdk%%JDK_VERSION%%/lib/htmlconverter.jar
-jdk%%JDK_VERSION%%/lib/i386/libdt_socket.so
-jdk%%JDK_VERSION%%/lib/i386/libjdwp.so
 jdk%%JDK_VERSION%%/lib/ir.idl
 jdk%%JDK_VERSION%%/lib/orb.idl
 jdk%%JDK_VERSION%%/lib/tools.jar
 jdk%%JDK_VERSION%%/man/man1/appletviewer.1
 jdk%%JDK_VERSION%%/man/man1/extcheck.1
+jdk%%JDK_VERSION%%/man/man1/idlj.1
 jdk%%JDK_VERSION%%/man/man1/jar.1
 jdk%%JDK_VERSION%%/man/man1/jarsigner.1
 jdk%%JDK_VERSION%%/man/man1/java.1
@@ -917,169 +1162,207 @@ jdk%%JDK_VERSION%%/man/man1/javap.1
 jdk%%JDK_VERSION%%/man/man1/jdb.1
 jdk%%JDK_VERSION%%/man/man1/keytool.1
 jdk%%JDK_VERSION%%/man/man1/native2ascii.1
+jdk%%JDK_VERSION%%/man/man1/orbd.1
+jdk%%JDK_VERSION%%/man/man1/policytool.1
 jdk%%JDK_VERSION%%/man/man1/rmic.1
 jdk%%JDK_VERSION%%/man/man1/rmid.1
 jdk%%JDK_VERSION%%/man/man1/rmiregistry.1
 jdk%%JDK_VERSION%%/man/man1/serialver.1
+jdk%%JDK_VERSION%%/man/man1/servertool.1
 jdk%%JDK_VERSION%%/man/man1/tnameserv.1
-jdk%%JDK_VERSION%%/src.jar
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/appletviewer_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/extcheck_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/idlj_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jar_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jarsigner_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/java_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javac_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javadoc_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javah_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javap_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jdb_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/keytool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/kinit_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/klist_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/ktab_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/native2ascii_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/orbd_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/policytool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmic_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmid_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmiregistry_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/serialver_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/servertool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/tnameserv_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/java_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/keytool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/kinit_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/klist_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/ktab_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/orbd_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/policytool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/rmid_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/rmiregistry_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/servertool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/tnameserv_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libawt_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libcmm_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libhprof_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libioser12_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjaas_unix_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjawt_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjcov_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjsig_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjsound_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libnet_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libnio_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/librmi_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libverify_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libzip_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm_g.so
 @exec   mkdir -p %D/share/doc/java
 @unexec rmdir %D/share/doc/java 2>/dev/null || true
 @exec   %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%"
 @unexec %D/bin/unregistervm FREEBSD-JDK%%JDK_VERSION%%
-@dirrm jdk%%JDK_VERSION%%/man/man1
-@dirrm jdk%%JDK_VERSION%%/man
-@dirrm jdk%%JDK_VERSION%%/lib/i386
-@dirrm jdk%%JDK_VERSION%%/lib
-%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns600
-%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns4
-%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386
-@dirrm jdk%%JDK_VERSION%%/jre/plugin
-@dirrm jdk%%JDK_VERSION%%/jre/lib/security
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale
-@dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors
-@dirrm jdk%%JDK_VERSION%%/jre/lib/images
-%%HOTSPOT:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/server
-%%NATIVE:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/native_threads
-@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/green_threads
-%%HOTSPOT:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/client
-@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/classic
-@dirrm jdk%%JDK_VERSION%%/jre/lib/i386
-@dirrm jdk%%JDK_VERSION%%/jre/lib/fonts
-@dirrm jdk%%JDK_VERSION%%/jre/lib/ext
-@dirrm jdk%%JDK_VERSION%%/jre/lib/cmm
-@dirrm jdk%%JDK_VERSION%%/jre/lib/audio
-@dirrm jdk%%JDK_VERSION%%/jre/lib
-@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/native_threads
-@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/green_threads
-@dirrm jdk%%JDK_VERSION%%/jre/bin/i386
-@dirrm jdk%%JDK_VERSION%%/jre/bin
-@dirrm jdk%%JDK_VERSION%%/jre
-@dirrm jdk%%JDK_VERSION%%/include/freebsd
-@dirrm jdk%%JDK_VERSION%%/include-old/freebsd
-@dirrm jdk%%JDK_VERSION%%/include-old
-@dirrm jdk%%JDK_VERSION%%/include
-@dirrm jdk%%JDK_VERSION%%/demo/sound/src
-@dirrm jdk%%JDK_VERSION%%/demo/sound/media
-@dirrm jdk%%JDK_VERSION%%/demo/sound
-@dirrm jdk%%JDK_VERSION%%/demo/jpda
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SimpleExample
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/JavaDB
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos
-@dirrm jdk%%JDK_VERSION%%/demo/jfc
-@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame/models
-@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame
-@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/images
-@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio
-@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe
-@dirrm jdk%%JDK_VERSION%%/demo/applets/SymbolTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/SpreadSheet
-@dirrm jdk%%JDK_VERSION%%/demo/applets/SortDemo
-@dirrm jdk%%JDK_VERSION%%/demo/applets/SimpleGraph
-@dirrm jdk%%JDK_VERSION%%/demo/applets/NervousText
-@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models
-@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer
-@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds
-@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox
-@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/images
-@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/audio
-@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap
-@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphicsTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout/audio
-@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Fractal
-@dirrm jdk%%JDK_VERSION%%/demo/applets/DrawTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/DitherTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Clock
-@dirrm jdk%%JDK_VERSION%%/demo/applets/CardTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Blink
-@dirrm jdk%%JDK_VERSION%%/demo/applets/BarChart
-@dirrm jdk%%JDK_VERSION%%/demo/applets/ArcTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/SimpleAnimation
+@dirrm jdk%%JDK_VERSION%%/bin
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/audio
 @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/SimpleAnimation
 @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/audio
 @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator
+@dirrm jdk%%JDK_VERSION%%/demo/applets/ArcTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/BarChart
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Blink
+@dirrm jdk%%JDK_VERSION%%/demo/applets/CardTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Clock
+@dirrm jdk%%JDK_VERSION%%/demo/applets/DitherTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/DrawTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Fractal
+@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout/audio
+@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout
+@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphicsTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/audio
+@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/images
+@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap
+@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds
+@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox
+@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models
+@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer
+@dirrm jdk%%JDK_VERSION%%/demo/applets/NervousText
+@dirrm jdk%%JDK_VERSION%%/demo/applets/SimpleGraph
+@dirrm jdk%%JDK_VERSION%%/demo/applets/SortDemo
+@dirrm jdk%%JDK_VERSION%%/demo/applets/SpreadSheet
+@dirrm jdk%%JDK_VERSION%%/demo/applets/SymbolTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio
+@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/images
+@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe
+@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame/models
+@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame
 @dirrm jdk%%JDK_VERSION%%/demo/applets
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Colors
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Composite
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Mix
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Transforms
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/htmldemo
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/optionpane
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/splitpane
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tooltip
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample
+@dirrm jdk%%JDK_VERSION%%/demo/jfc
+@dirrm jdk%%JDK_VERSION%%/demo/jpda
 @dirrm jdk%%JDK_VERSION%%/demo
-@dirrm jdk%%JDK_VERSION%%/bin/i386/native_threads
-@dirrm jdk%%JDK_VERSION%%/bin/i386/green_threads
-@dirrm jdk%%JDK_VERSION%%/bin/i386
-@dirrm jdk%%JDK_VERSION%%/bin
+@dirrm jdk%%JDK_VERSION%%/include/bsd
+@dirrm jdk%%JDK_VERSION%%/include
+@dirrm jdk%%JDK_VERSION%%/jre/bin
+@dirrm jdk%%JDK_VERSION%%/jre/lib/audio
+@dirrm jdk%%JDK_VERSION%%/jre/lib/applet
+@dirrm jdk%%JDK_VERSION%%/jre/lib/cmm
+@dirrm jdk%%JDK_VERSION%%/jre/lib/ext
+@dirrm jdk%%JDK_VERSION%%/jre/lib/fonts
+@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/client
+@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/native_threads
+@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/server
+@dirrm jdk%%JDK_VERSION%%/jre/lib/i386
+@dirrm jdk%%JDK_VERSION%%/jre/lib/im
+@dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors
+@dirrm jdk%%JDK_VERSION%%/jre/lib/images
+@dirrm jdk%%JDK_VERSION%%/jre/lib/security
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Africa
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/America/Kentucky
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/America
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Asia
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Australia
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Etc
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Europe
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Indian
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Pacific
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi
+@dirrm jdk%%JDK_VERSION%%/jre/lib
+@dirrm jdk%%JDK_VERSION%%/jre
+@dirrm jdk%%JDK_VERSION%%/lib
+@dirrm jdk%%JDK_VERSION%%/man/man1
+@dirrm jdk%%JDK_VERSION%%/man
 @dirrm jdk%%JDK_VERSION%%
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 034053061605..c669cc52d1f6 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -1,85 +1,65 @@
-# New ports collection makefile for:	jdk13
-# Date created:				10 October 2000
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+# New ports collection makefile for:	jdk14
+# Date created:				6 March 2003
+# Whom:					Alexey Zelkin <phantom@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
-#		 http://www.eyesbeyond.com/freebsddom/java/jdk13.html
-SRCFILE=	j2sdk-${JDK_VERSION:S/./_/g}-src${EXTRACT_SUFX}
-PATCHSETFILE=	bsd-jdk131-patches-${JDK_PATCHSET_VERSION}.tar.gz
+#		 http://www.eyesbeyond.com/freebsddom/java/jdk14.html
+SRCFILE=	j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
+PATCHSETFILE=	bsd-jdk14-patches-${JDK_PATCHSET_VERSION}.tar.gz
 DISTFILES=	${SRCFILE} ${PATCHSETFILE}
 
-MAINTAINER=	glewis@FreeBSD.org
-COMMENT=	Java Development Kit 1.3
+MAINTAINER=	phantom@FreeBSD.org
+COMMENT=	Java Development Kit 1.4.1
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		zip:${PORTSDIR}/archivers/zip \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
 .if !defined(NATIVE_BOOTSTRAP)
-BUILD_DEPENDS+=	${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk13
-.endif
-.if !defined(WITHOUT_PLUGIN)
-BUILD_DEPENDS+=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	glib12.3:$(PORTSDIR)/devel/glib12 \
-		gtk12.2:$(PORTSDIR)/x11-toolkits/gtk12 \
-		nspr4.1:$(PORTSDIR)/devel/nspr
+BUILD_DEPENDS+=	${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14
 .endif
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
 		${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
 
-.if defined(WITH_JAPANESE_FONTS)
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/TrueType/fonts.dir.kochi:${PORTSDIR}/japanese/kochi-ttfonts
-.endif
-.if defined(WITH_RUSSIAN_FONTS)
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/webfonts/fonts.dir:${PORTSDIR}/x11-fonts/webfonts
-.endif
-.if defined(WITH_CHINESE_FONTS)
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/TrueType/arphic:${PORTSDIR}/chinese/arphicttf
-.endif
-
-WRKSRC=		${WRKDIR}/j2sdk1.3.1/make
+WRKSRC=		${WRKDIR}/control/make
 
-JDK_VERSION=	1.3.1
-JDK_PATCHSET_VERSION=	8
+JDK_VERSION=	1.4.1
+JDK_PATCHSET_VERSION=	3
 
 .if defined(NATIVE_BOOTSTRAP)
-JDK13DIR?=	${LOCALBASE}/jdk${JDK_VERSION}
+JDK14DIR?=	${LOCALBASE}/jdk${JDK_VERSION}
 .else
-JDK13DIR?=	${LOCALBASE}/linux-sun-jdk${JDK_VERSION}
+JDK14DIR?=	${LOCALBASE}/linux-sun-jdk${JDK_VERSION}
 .endif
 
+# workaround to handle both 'zip' and 'tar.gz' distfiles
+USE_ZIP=	YES
+EXTRACT_ONLY=	${SRCFILE}
+
 ONLY_FOR_ARCHS=	i386
-USE_GMAKE=	yes
+USE_GMAKE=	YES
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
-MAKE_ENV=	ALT_BOOTDIR="${JDK13DIR}" \
+MAKE_ENV=	ALT_BOOTDIR="${JDK14DIR}" \
 		ALT_MOTIF_DIR="${X11BASE}" \
-		OPENWINHOME="${X11BASE}" \
 		SYS_CFLAGS="${CFLAGS}" \
+		JAVAWS_OPTIONAL="YES" \
+		NO_DOCS="YES" \
+		LANG="C" \
+		JAVA_HOME="" \
 		CLASSPATH="" \
-		LD_LIBRARY_PATH="" \
-		JAVA_COMPILER=""
-.if !defined(WITHOUT_PLUGIN)
-MAKE_ENV +=	LIBG_HDRS="${LOCALBASE}/include/glib12" \
-		GTK_HDRS="${X11BASE}/include/gtk12" \
-		LIBIDL_HDRS=
-.endif
-.if !defined(WITHOUT_PLUGIN)
-ALL_TARGET=	all plugin images
-.else
-ALL_TARGET=	all images
-.endif
+		LD_LIBRARY_PATH=""
+ALL_TARGET=	all
 PLIST_SUB+=	JDK_VERSION=${JDK_VERSION}
 
-JDKIMAGEDIR=	${WRKSRC}/../build/bsd-i386/jdk-image-i386
-JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-i386/jdk-debug-image-i386
+JDKIMAGEDIR=	${WRKSRC}/../build/bsd-i586/j2sdk-image
+JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-i586/j2sdk-debug-image
 
 SORT?=		/usr/bin/sort
 CPIO?=		/usr/bin/cpio
@@ -91,47 +71,8 @@ PKGNAMESUFFIX=	-nodebug
 PLIST_SUB+=	DEBUG:=""
 .endif
 
-.if defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT)
-PLIST_SUB+=    NATIVE:=""
-MAKE_ARGS+=    HPIS="green native"
-.else
-PLIST_SUB+=    NATIVE:="@comment "
-.endif
-
-.if defined(WITHOUT_PLUGIN)
-PLIST_SUB+=    PLUGIN:="@comment "
-.else
-PLIST_SUB+=    PLUGIN:=""
-.endif
-
-.if defined(WITH_HOTSPOT)
-PLIST_SUB+=    HOTSPOT:=""
-USE_REINPLACE= yes
-.if defined(NODEBUG)
-HOTSPOT_TARGETS=product1 product
-.else
-HOTSPOT_TARGETS=compiler1 compiler2
-.endif
-.else
-PLIST_SUB+=    HOTSPOT:="@comment "
-.endif
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_HOTSPOT) && ${OSVERSION} < 500039
-USE_GCC=	3.2
-BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
-MAKE_ENV+=	ALT_COMPILER_PATH=${LOCALBASE}/bin
-HOTSPOT_BUILD=	../ext/plugin/build/solaris/GNUmakefile \
-	../../hotspot1.3.1/build/linux/makefiles/adlc.make \
-	../../hotspot1.3.1/build/linux/platform_i486
-.endif
-
-.if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500038 )
-BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-TAR=		gtar	# Necessary for proper extraction of sources
-.endif
-
 # Check for JDK sources
 .if !exists(${DISTDIR}/${SRCFILE}) && !defined(PACKAGE_BUILDING)
 ECHO_MSG=/usr/bin/printf
@@ -153,56 +94,24 @@ IGNORE= :\n\
 The source distribution exists on your system, but due to\n\
 licensing restrictions you still need to download the\n\
 patchset, ${PATCHSETFILE}, from\n\
-http://www.eyesbeyond.com/freebsddom/java/jdk13.html.\n\
+http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\
 Please place the patchset in ${DISTDIR}.\n
 .endif
 
-# HotSpot and/or native threads require a recent version of FreeBSD
-.if ( defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT) ) && ( ${OSVERSION} < 470101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500043 ) )
+# JDK 1.4.1 require recent version of FreeBSD due to recent libc_r updates.
+# These checks are not prefect but it's better than nothing.
+.if (${OSVERSION} < 470101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500043 ))
 ECHO_MSG=/usr/bin/printf
 IGNORE= :\n\
 You must have a version of FreeBSD later than 4.7-STABLE February 2003\n\
-or 5-CURRENT February 2003 to use either native threads or HotSpot.\n
-.endif
-
-# Warn user about HotSpot build
-.if defined(WITH_HOTSPOT)
-pre-everything:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You have set WITH_HOTSPOT to enable the build of the HotSpot VM."
-	@${ECHO_MSG} "Please note that HotSpot development is still experimental and is"
-	@${ECHO_MSG} "not suitable for use in a production environment."
-	@${ECHO_MSG} "To use the browser plugin with HotSpot you will need to set the"
-	@${ECHO_MSG} "THREADS_FLAG environment variable when running the browser, e.g."
-	@${ECHO_MSG} "    setenv THREADS_FLAG native"
-	@${ECHO_MSG} "Compiling HotSpot into the JDK will also currently make the"
-	@${ECHO_MSG} "Classic VM unusable."
-	@${ECHO_MSG} ""
+or 5-CURRENT February 2003 to compile and use JDK 1.4.1.\n
 .endif
 
 pre-patch:
 	@cd ${WRKDIR} &&  \
+		${GZIP_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
 		${CHMOD} -R u+w * && \
-		${MKDIR} j2sdk1.3.1/ext/plugin/oji-plugin/include/bsd/jdk12 && \
-		${MKDIR} j2sdk1.3.1/ext/plugin/oji-plugin/include/solaris/navig5/private && \
-		${MKDIR} j2sdk1.3.1/src/bsd/doc/man && \
-		${MKDIR} hotspot1.3.1/build/bsd && \
-		${MKDIR} hotspot1.3.1/build/bsd/makefiles && \
-		${MKDIR} hotspot1.3.1/build/bsd/package && \
-		${MKDIR} hotspot1.3.1/src/os/bsd/launcher && \
-		${MKDIR} hotspot1.3.1/src/os/bsd/vm && \
-		${MKDIR} hotspot1.3.1/src/os_cpu/bsd_i486/vm && \
-			${PATCH} < ${WRKDIR}/jdk131.patches
-
-post-patch:
-.if defined(WITH_HOTSPOT)
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-	@for file in ${HOTSPOT_BUILD}; do \
-        	${REINPLACE_CMD} -e "s:gcc:gcc32:g ; s:g\+\+:g\+\+32:g" ${WRKSRC}/$${file}; \
-	done
-	@${REINPLACE_CMD} -e "s:PATH[)]gcc:PATH)gcc32:g ; s:PATH[)]g\+\+:PATH)g\+\+32:g" ${WRKSRC}/common/Defs-bsd.gmk 
-.endif
-.endif
+		${PATCH} -p0 < ${WRKDIR}/jdk14.patches
 
 .if !defined(NATIVE_BOOTSTRAP)
 pre-build:
@@ -229,35 +138,10 @@ pre-build:
 do-build:
 	# Start of jdk build
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-.if defined(WITH_HOTSPOT)
-	# Start of HotSpot build
-	@(cd ${WRKDIR}/hotspot1.3.1/build/linux ;  \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${HOTSPOT_TARGETS})
-.endif
 
 post-build:
-.if defined(WITH_HOTSPOT)
-	# Copy HotSpot VM to image dir
-	${MKDIR} ${JDKIMAGEDIR}/jre/lib/i386/client
-	${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler1/product/libjvm.so ${JDKIMAGEDIR}/jre/lib/i386/client/
-	${INSTALL_DATA} ${WRKDIR}/hotspot1.3.1/src/share/vm/Xusage.txt ${JDKIMAGEDIR}/jre/lib/i386/client/
-	${MKDIR} ${JDKIMAGEDIR}/jre/lib/i386/server
-	${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler2/product/libjvm.so ${JDKIMAGEDIR}/jre/lib/i386/server/
-	${INSTALL_DATA} ${WRKDIR}/hotspot1.3.1/src/share/vm/Xusage.txt ${JDKIMAGEDIR}/jre/lib/i386/server/
-	@(cd ${JDKIMAGEDIR}/jre/lib/i386; ${LN} -sf client hotspot)
-.if !defined(NODEBUG)
-	# Copy debug version of HotSpot VM to image dir
-	${MKDIR} ${JDKIMAGEDIR_G}/jre/lib/i386/client
-	${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler1/jvmg/libjvm_g.so ${JDKIMAGEDIR_G}/jre/lib/i386/client/
-	${MKDIR} ${JDKIMAGEDIR_G}/jre/lib/i386/server
-	${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler2/jvmg/libjvm_g.so ${JDKIMAGEDIR_G}/jre/lib/i386/server/
-.endif
-.endif
-	# Prune empty dirs
-	${FIND} ${JDKIMAGEDIR} -type d | ${SORT} -r | \
-		${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
-	${FIND} ${JDKIMAGEDIR_G} -type d | ${SORT} -r | \
-		${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
+	@# This file serves no purpose (in case of port)
+	@${RM} -f ${JDKIMAGEDIR}/src.zip
 
 .if !defined(NODEBUG)
 pre-install:
@@ -275,21 +159,8 @@ do-install:
 	cd ${JDKIMAGEDIR_G} && ${FIND} . \
 	  | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .endif
-	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}/jre/lib/ext
 
 post-install:
 	@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
-.if !defined(WITHOUT_PLUGIN)
-	@${ECHO_MSG}
-	@${ECHO_MSG} To use the Java plugin with Mozilla you must create a
-	@${ECHO_MSG} symbolic link from
-	@${ECHO_MSG}
-	@${ECHO_MSG} ${PREFIX}/jdk${JDK_VERSION}/jre/plugin/i386/ns600/libjavaplugin_oji.so
-	@${ECHO_MSG}
-	@${ECHO_MSG} to your Mozilla plugins directory, which is usually found at
-	@${ECHO_MSG}
-	@${ECHO_MSG} ${X11BASE}/lib/mozilla/plugins
-	@${ECHO_MSG}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo
index d9abbb0878ff..a75cd7da49b3 100644
--- a/java/jdk16/distinfo
+++ b/java/jdk16/distinfo
@@ -1,2 +1,2 @@
-MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
-MD5 (bsd-jdk131-patches-8.tar.gz) = 1fd14cea9ce15e9a7e5ee2f60f50dd01
+MD5 (j2sdk-1_4_1-src-scsl.zip) = e6f35d1183660682f4f03965d35b67c5
+MD5 (bsd-jdk14-patches-3.tar.gz) = aca8e42e71a0b7a7b779c7f2bea47f62
diff --git a/java/jdk16/files/patch-InetAddressImpl.c b/java/jdk16/files/patch-InetAddressImpl.c
deleted file mode 100644
index ddb4f8045b81..000000000000
--- a/java/jdk16/files/patch-InetAddressImpl.c
+++ /dev/null
@@ -1,114 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/native/java/net/InetAddressImpl.c	25 Jan 2003 23:22:26 -0000	1.7
-+++ ../src/solaris/native/java/net/InetAddressImpl.c	28 Feb 2003 09:34:18 -0000
-@@ -25,6 +25,7 @@
- 
- #include "java_net_InetAddressImpl.h"
- 
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- /* reentrant BIND includes --billh */
- 
- #include <sys/param.h>
-@@ -33,14 +34,16 @@
- 
- /* forward declarations --billh */
- 
-+static
- HOST_R_RETURN
--gethostbyname_r(const char *name,  struct hostent *hptr,
--		HOST_R_ARGS);
-+__j_gethostbyname_r(const char *name,  struct hostent *hptr,
-+		    HOST_R_ARGS);
- 
-+static
- HOST_R_RETURN
--gethostbyaddr_r(const char *addr, int len, int type,
--		struct hostent *hptr,
--		HOST_R_ARGS);
-+__j_gethostbyaddr_r(const char *addr, int len, int type,
-+		    struct hostent *hptr, HOST_R_ARGS);
-+#endif
- 
- /*
- */
-@@ -99,6 +102,8 @@
- 
- #ifdef __GLIBC__
- 	gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+	hp = __j_gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #else
- 	hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #endif
-@@ -106,6 +111,9 @@
- #ifdef __GLIBC__
- 	    gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
- 			    &res2, buf2, sizeof(buf2), &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+	    hp = __j_gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
-+				     &res2, buf2, sizeof(buf2), &h_error);
- #else
- 	    hp = gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
- 				 &res2, buf2, sizeof(buf2), &h_error);
-@@ -189,6 +197,8 @@
-     /* Try once, with our static buffer. */
- #ifdef __GLIBC__
-     gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+    hp = __j_gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #else    
-     hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #endif
-@@ -203,6 +213,9 @@
- #ifdef __GLIBC__
- 	    gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
- 			    &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+	    hp = __j_gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
-+				     &h_error);
- #else
- 	    hp = gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
- 				 &h_error);
-@@ -283,6 +296,9 @@
- #ifdef __GLIBC__
-     gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
- 		    buf, sizeof(buf), &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+    hp = __j_gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
-+			     buf, sizeof(buf), &h_error);
- #else
-     hp = gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
- 			 buf, sizeof(buf), &h_error);
-@@ -297,6 +313,9 @@
- #ifdef __GLIBC__
- 	    gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
- 			    &hent, tmp, BIG_HENT_BUF_SIZE, &hp, &h_error);
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+	    hp = __j_gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
-+				     &hent, tmp, BIG_HENT_BUF_SIZE, &h_error);
- #else
- 	    hp = gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
- 				 &hent, tmp, BIG_HENT_BUF_SIZE, &h_error);
-@@ -335,8 +354,9 @@
- static HOST_R_RETURN 
- copy_hostent(struct hostent *, struct hostent *, HOST_R_COPY_ARGS);
- 
-+static
- HOST_R_RETURN
--gethostbyname_r(const char *name,  struct hostent *hptr, HOST_R_ARGS) {
-+__j_gethostbyname_r(const char *name,  struct hostent *hptr, HOST_R_ARGS) {
- 	struct hostent *he = gethostbyname(name);
- 
- 	HOST_R_ERRNO;
-@@ -347,8 +367,9 @@
- 	return (copy_hostent(he, hptr, HOST_R_COPY));
- }
- 
-+static
- HOST_R_RETURN
--gethostbyaddr_r(const char *addr, int len, int type,
-+__j_gethostbyaddr_r(const char *addr, int len, int type,
- 		struct hostent *hptr, HOST_R_ARGS) {
- 	struct hostent *he = gethostbyaddr(addr, len, type);
- 
diff --git a/java/jdk16/files/patch-common::Defs-bsd.gmk b/java/jdk16/files/patch-common::Defs-bsd.gmk
index d0c78fad9baf..fbeca94149d8 100644
--- a/java/jdk16/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk16/files/patch-common::Defs-bsd.gmk
@@ -1,27 +1,11 @@
-
-$FreeBSD$
-
---- common/Defs-bsd.gmk.orig	Mon Sep 10 17:02:16 2001
-+++ common/Defs-bsd.gmk	Mon Sep 10 17:02:42 2001
-@@ -128,7 +128,7 @@
- ifeq ($(TRUE_PLATFORM), NetBSD)
- DEVTOOLS_PATH = /usr/pkg/bin/
- else
+--- ../../j2se/make/common/Defs-bsd.gmk.orig	Fri Mar  7 01:38:41 2003
++++ ../../j2se/make/common/Defs-bsd.gmk	Fri Mar  7 01:38:01 2003
+@@ -155,7 +155,7 @@
+ 
+ # DEVTOOLS_PATH is for other tools required for building (such as
+ # zip, etc.)
 -DEVTOOLS_PATH = /usr/local/bin/
-+DEVTOOLS_PATH = $(LOCALBASE)/bin/
- endif
++DEVTOOLS_PATH = ${LOCALBASE}/bin/
  # Allow the user to override the default value...
  ifdef ALT_DEVTOOLS_PATH
-@@ -221,10 +221,10 @@
- else # ARCH
- CFLAGS_COMMON   = $(GCC_WARNINGS)
- endif # ARCH
--CFLAGS_OPT      = $(POPT)
-+CFLAGS_OPT      = $(POPT) $(SYS_CFLAGS)
- CFLAGS_DBG      = -g3
- CXXFLAGS_COMMON = $(GCC_WARNINGS)
--CXXFLAGS_OPT	= $(POPT)
-+CXXFLAGS_OPT	= $(POPT) $(SYS_CFLAGS)
- CXXFLAGS_DBG	= -g3
- 
- CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \
+ DEVTOOLS_PATH = $(subst //,/,$(ALT_DEVTOOLS_PATH)/)
diff --git a/java/jdk16/files/patch-platform_i486 b/java/jdk16/files/patch-platform_i486
deleted file mode 100644
index 176fe9a69716..000000000000
--- a/java/jdk16/files/patch-platform_i486
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/build/linux/platform_i486	Thu Jan 23 00:28:52 2003
-+++ ../../hotspot1.3.1/build/linux/platform_i486	Thu Jan 23 01:14:01 2003
-@@ -6,7 +6,7 @@
- 
- lib_arch = i386
- 
--compiler = gcc32
-+compiler = gcc
- 
- gnu_dis_arch = i386
- 
diff --git a/java/jdk16/files/patch-threads_bsd.c b/java/jdk16/files/patch-threads_bsd.c
deleted file mode 100644
index 0549832f1833..000000000000
--- a/java/jdk16/files/patch-threads_bsd.c
+++ /dev/null
@@ -1,726 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/hpi/native_threads/src/threads_bsd.c	7 Feb 2002 05:19:54 -0000	1.12
-+++ ../src/solaris/hpi/native_threads/src/threads_bsd.c	25 Feb 2003 16:31:54 -0000
-@@ -22,32 +22,23 @@
- #include "np.h"
- 
- #include <pthread.h>
-+#include <pthread_np.h>
- 
- #if defined(__FreeBSD__)
- 
--#include <pthread_np.h>
-+#include <assert.h>
- 
--/* Remove defines from pthread.h so pthread_private.h can be included */
--#undef pthread_condattr_default
--#undef pthread_mutexattr_default
- #undef pthread_attr_default
-+#undef pthread_mutexattr_default
-+#undef pthread_condattr_default
- #include "pthread_private.h"
- 
--#include <assert.h>
--#include <ucontext.h>
--#include <machine/ucontext.h>
--
--#include <sys/exec.h>
--#include <vm/vm.h>
--#include <vm/pmap.h>
--#include <machine/pmap.h>
--#include <machine/vmparam.h>
--
- #endif
- 
- #include <string.h>
- #include <signal.h>
- #include <sys/signal.h>
-+#include <sys/time.h>
- #include <sys/resource.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -63,14 +54,9 @@
- /* Private functions used to implement native threading. --billh */
- 
- #ifdef DEBUG_BSD_NATIVE_THREADS
--void _pthread_suspend_all_np(void);
--void _pthread_resume_all_np(void);
--#endif
--void record_uc(sys_thread_t *, ucontext_t *);
--void record_gc_registers_of(sys_thread_t *);
--
--void dumpThreadStates();
- void dumpThreadLogStates(pthread_t);
-+void dumpThreadStates();
-+#endif
- 
- /*
-  * Suspend a thread.  Used to implement java.lang.Thread.suspend(),
-@@ -108,28 +94,24 @@
- int
- np_stackinfo(void **addr, long *sizep)
- {
--    thread_t self = pthread_self();
--    int base;
--    int size;
--
--    if (!pthread_equal(self, _thread_initial)) {
--        *addr = self->stack;
--	*sizep = (long) PTHREAD_STACK_DEFAULT;
--
--    } else {
--	/* in main()'s thread */
--	struct rlimit r;
--
--	if (getrlimit(RLIMIT_STACK, &r) == -1)
--	    return SYS_ERR;
--
--	/* PS_STRINGS is also from sys/exec.h in FreeBSD, but as macro. --billh */
--
--	*addr  = (void *) (PS_STRINGS +1);
--	*sizep = (long)r.rlim_cur;
--    }
-+    pthread_attr_t attr;
-+    size_t size;
- 
-+    if ((errno = pthread_attr_init(&attr)))
-+	return SYS_ERR;
-+    if ((errno = pthread_attr_get_np(pthread_self(), &attr)))
-+	goto err;
-+    if ((errno = pthread_attr_getstackaddr(&attr, addr)))
-+	goto err;
-+    if ((errno = pthread_attr_getstacksize(&attr, &size)))
-+	goto err;
-+    *sizep = size;
-+    pthread_attr_destroy(&attr);
-     return SYS_OK;
-+
-+err:
-+    pthread_attr_destroy(&attr);
-+    return SYS_ERR;
- }
- 
- /*
-@@ -177,7 +159,7 @@
- 	Do this for the FreeBSD implementation too, since this is a silly
- 	function anyways.  --billh
- */
--	return TRUE;
-+    return TRUE;
- }
- 
- 
-@@ -190,38 +172,54 @@
- static void
- record_thread_regs()
- {
--    sys_thread_t *tid;
-+    struct pthread *self = pthread_self();
-+    sys_thread_t *tid = ThreadQueue;
-     int i;
--    int sp;
- 
--    tid = ThreadQueue;
--    for (i = 0; i < ActiveThreadCount && tid != 0; i++) {
--	int i;
--
--	if (tid->sys_thread != 0) {
--#ifdef __bsdi__
--	    /* if thread has already been initialized */
--	    if (pthread_getstackpointer_np(tid->sys_thread, &sp) == 0)
--		tid->sp = sp;
--	    else
--		tid->sp = 0;
--#elif __FreeBSD__
--#endif
--            tid->sp = tid->sys_thread->stack;
--//#endif	//__FreeBSD__
--/*	Potential race here if the stack isn't setup before GC. --billh */
--	} else {
-+    for (i = 0; i < ActiveThreadCount && tid != NULL; i++, tid = tid->next) {
-+	struct pthread *thread = tid->sys_thread;
-+
-+	if (thread == 0) {
- 	    /*
- 	     * thread is still in the process of being initalized.
- 	     * So GC should not care about this thread. Just
- 	     * set its sp to 0, and this will force GC to ignore it.
- 	     */
- 	    tid->sp = 0;
-+	    continue;
- 	}
- 
--	record_gc_registers_of(tid);
-+        tid->sp = thread->stack;
-+/*	Potential race here if the stack isn't setup before GC. --billh */
- 
--	tid = tid->next;
-+	/*
-+	 * The thread that calls this function will alway be the JVM GC thread,
-+	 * so skip over it in the list of threads.
-+	 */
-+	if (thread != self && (thread->flags & PTHREAD_FLAGS_PRIVATE) == 0) {
-+	    register_t *regbase;
-+
-+#ifdef DEBUG_BSD_NATIVE_THREADS
-+	    /*
-+	     * Got search candidate..
-+	     */
-+	    if (thread->state != PS_SUSPENDED)
-+		dumpThreadLogStates(thread);
-+#endif
-+
-+	    regbase = (register_t*) &thread->ctx.jb[0];
-+	    tid->regs[0] = regbase[6];	/* eax */
-+	    tid->regs[1] = 0;		/* ecx (missing) */
-+	    tid->regs[2] = 0;		/* edx (missing) */
-+	    tid->regs[3] = regbase[1];	/* ebx */
-+	    tid->regs[4] = regbase[3];	/* ebp */
-+	    tid->regs[5] = regbase[4];	/* esi */
-+	    tid->regs[6] = regbase[5];	/* edi */
-+
-+#ifdef DEBUG_BSD_NATIVE_THREADS
-+	    dumpThreadStates();
-+#endif
-+	}
-     }
- 
- #ifdef DEBUG_BSD_NATIVE_THREADS
-@@ -239,14 +237,7 @@
- {
-     sysAssert(SYS_QUEUE_LOCKED(sysThreadSelf()));
- 
--#ifdef DEBUG_BSD_NATIVE_THREADS
--    _pthread_suspend_all_np();
--#else
--    pthread_single_np();
--#endif
--
--//usleep(100000 *3);
--
-+    pthread_suspend_all_np();
-     record_thread_regs();
-     return SYS_OK;
- }
-@@ -259,42 +250,13 @@
- np_multi(void)
- {
-     sysAssert(SYS_QUEUE_LOCKED(sysThreadSelf()));
--#ifdef DEBUG_BSD_NATIVE_THREADS
--    _pthread_resume_all_np();
--#else
--    pthread_multi_np();
--#endif
-+    pthread_resume_all_np();
- }
- 
--
--
--
-+#ifdef DEBUG_BSD_NATIVE_THREADS
- /* pthreads hackery begins --billh */
- 
--#define ANALRETENTIVE (6 + 1)
--
--char SuspendList[ANALRETENTIVE][16] = 
--{
--	"SUSP_NO",		/* Not suspended. */
--	"SUSP_YES",		/* Suspended. */
--	"SUSP_JOIN",		/* Suspended, joining. */  
--	"SUSP_NOWAIT",		/* Suspended, was in a mutex or condition queue. */
--	"SUSP_MUTEX_WAIT",	/* Suspended, still in a mutex queue. */
--	"SUSP_COND_WAIT",	/* Suspended, still in a condition queue. */
--	"susp boundless"
--};
--
--char *getSuspendStateString(enum pthread_susp suspendState)
--{
--	if (suspendState < ANALRETENTIVE)
--		return &SuspendList[suspendState][0];
--	else 
--		return &SuspendList[ANALRETENTIVE-1][0];
--}
--
--#define SATAN (21 + 1) /* for the error string at the end of the list */
--
--char SignalList [SATAN][16]
-+char SignalList [][16]
- =
- {
- 	"PS_RUNNING",
-@@ -316,18 +278,17 @@
- 	"PS_JOIN",
- 	"PS_SUSPENDED",
- 	"PS_DEAD",
--	"PS_DEADLCK",
-+	"PS_DEADLOCK",
- 	"PS_STATE_MAX",
--	"PS_REQUEST_WAITING_SUSPENDED",
- 	"boundless"
- };
- 
- char *getThreadStateString(enum pthread_state threadState)
- {
- 	if (threadState < SATAN)
--		return &SignalList[threadState][0];
--	else 
--		return &SignalList[SATAN-1][0];
-+		return SignalList[threadState];
-+	else
-+		return SignalList[SATAN-1];
- }
- 
- void dumpThreadStates()
-@@ -336,114 +297,29 @@
- 	struct pthread	*thread;
- 	struct pthread	*self = pthread_self();
- 
--#ifdef DEBUG_BSD_NATIVE_THREADS
- 	_thread_kern_sig_defer();
- 	TAILQ_FOREACH(thread, &_thread_list, tle) {
- 		if (thread != self) { /* special case this --billh */
--			printf("\tthread %d\t%s\t%s\n",
-+			printf("\tthread %d\t%s\n",
- 				threadCount,
--				getThreadStateString(thread->state),
--				getSuspendStateString(thread->suspended));
-+				getThreadStateString(thread->state));
- 
- 			if (thread->state != PS_SUSPENDED)
- 				dumpThreadLogStates(thread);
--		}
--		else
--		{
--			printf("\tgc thread %d\t%s\t%s\n",
-+		} else {
-+			printf("\tgc thread %d\t%s\n",
- 				threadCount,
--				getThreadStateString(thread->state),
--				getSuspendStateString(thread->suspended));
-+				getThreadStateString(thread->state))
- 		}
- 		++threadCount;
- 	}
- 	_thread_kern_sig_undefer();
- 	printf("\n");
--#endif
--}
--
--
--#ifdef DEBUG_BSD_NATIVE_THREADS
--extern void _pthread_suspend_np_by_pthread_common(pthread_t);
--extern void _pthread_resume_by_pthread_common(pthread_t, enum pthread_susp);
--
--void
--_pthread_suspend_all_np(void)
--{
--	struct pthread	*thread;
--	struct pthread	*self = pthread_self();
--
--fprintf(stderr, "pthread_suspend_all_np\n");
--	/*
--	 * Defer signals to protect the scheduling queues from
--	 * access by the signal handler:
--	 */
--	_thread_kern_sig_defer();
--
--	/* Suspend all threads other than the current thread: */
--	TAILQ_FOREACH(thread, &_thread_list, tle) {
--		if (thread != self) {
--			_pthread_suspend_np_by_pthread_common(thread);
--		}
--	}
--
--	/*
--	 * Undefer and handle pending signals, yielding if necessary:
--	 */
--	_thread_kern_sig_undefer();
--fprintf(stderr, "pthread_suspend_all_np END\n");
--}
--
--/* Resume a thread: */
--void
--_pthread_resume_all_np(void)
--{
--	enum		pthread_susp old_suspended;
--	struct pthread	*thread;
--	struct pthread	*self = pthread_self();
--
--fprintf(stderr, "pthread_resume_all_np\n");
--	_thread_kern_sig_defer();
--
--	/*
--		Iterate through the thread list and resume suspended threads.
--		this is copied from pthread_resume_np(). --billh
--	*/
--
--	TAILQ_FOREACH(thread, &_thread_list, tle) {
--		if (thread != self) {
--			/* Cancel any pending suspensions: */
--
--			old_suspended = thread->suspended;
--			thread->suspended = SUSP_NO;
--
--			_pthread_resume_by_pthread_common(thread, old_suspended);
--
--		} // if !thread_self
--	} // TAILQ_FOREACH
--
--	/*
--	 * Undefer and handle pending signals, yielding if
--	 * necessary:
--	 */
--	_thread_kern_sig_undefer();
--fprintf(stderr, "pthread_resume_all_np END\n");
- }
--#endif
- 
- /*
- 	[A snippet from Dan Eichen's email on the subject]
- 
--	It uses _longjmp (non-signal-saving/restoring) for the most part.
--	The only exception is when the process (currently running thread) is 
--	interrupted by a signal.  So your context types are a jmp_buf and
--	a ucontext_t (if interrupted by a signal).  If thread->ctxtype is
--	CTX_UC, the context is stored as a ucontext in thread->ctx.uc.
--	Otherwise, the context is stored as a jmp_buf in thread->ctx.jb.
--	We don't currently use CTX_JB and CTX_SJB, so don't even bother
--	with those cases.  Those should go away actually; all we need
--	to know is if it is a ucontext_t or a jmp_buf.
--
- 	You can also look at src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c.
- 	It knows how to iterate through all the threads and pull out
- 	(and even set) thread contexts.
-@@ -462,19 +338,8 @@
- 	--billh
- */
- 
--void clear_gc_registers(sys_thread_t * jthread)
--{
--/* clear out x86 registers for the thread's "self" --billh */
--
--	jthread->regs[0] = 0; jthread->regs[1] = 0;
--	jthread->regs[2] = 0; jthread->regs[3] = 0;
--	jthread->regs[4] = 0; jthread->regs[5] = 0;
--	jthread->regs[6] = 0;
--}
--
- void dumpThreadLogStates(pthread_t thread)
- {
--#ifdef DEBUG_BSD_NATIVE_THREADS
- int i;
- 	for(i=0; i < STATE_LOG_SIZE; ++i)
- 	{
-@@ -494,311 +359,5 @@
- 		}
- 	}
- 	printf("\t\t***XXX\n");
--#endif
--}
--
--void record_gc_registers_of(sys_thread_t *javaThread)
--{
--struct pthread	*self	= pthread_self();
--struct pthread	*thread	= NULL;
--
--	assert( javaThread != NULL );
--	assert( javaThread->sys_thread != NULL );
--
--	thread = javaThread->sys_thread;
--
--	/*
--	 * The thread that calls this function will alway be the JVM GC thread,
--	 * so skip over it in the list of threads.
--	 */
--	if (	(thread == self)
--		|| ((thread->flags & PTHREAD_FLAGS_PRIVATE) != 1)
--	   )
--	{
--		record_uc(javaThread, &thread->ctx.uc);
--#ifdef DEBUG_BSD_NATIVE_THREADS
--		goto Terminate; // And do nothing with this pthread entry. 
--#endif
--	}
--
--	/*
--	 * Got search candiate..
--	 */
--	if (thread->state != PS_SUSPENDED)
--		dumpThreadLogStates(thread);
--
--	switch ((int)thread->ctxtype)
--	{
--		case CTX_JB_NOSIG:	/* 0) jmp_buf context without signal mask for blocking IO, etc... */
--		case CTX_JB:		/* 1) should never be CTX_JB */
--		case CTX_SJB:		/* 2) should never be CTX_SJB */
--			clear_gc_registers(javaThread);
--#ifdef DEBUG_BSD_NATIVE_THREADS
--			goto Terminate;
--#endif
--			break;
--		case CTX_UC:		/* 3) */
--			/* context is a ucontext_t */
--			record_uc(javaThread, &thread->ctx.uc);
--#ifdef DEBUG_BSD_NATIVE_THREADS
--			goto Terminate;
--#endif
--			break;
--		default:
--#ifdef DEBUG_BSD_NATIVE_THREADS
--			fprintf(stderr, "ctxtype failed %d.\n", thread->ctxtype);
--			goto TermFailed;
--#endif
--			break;
--	}
--
--#ifdef DEBUG_BSD_NATIVE_THREADS
--TermFailed:
--	fprintf(stderr, "Failed to find pthread struct.\n"); fflush(stderr);
--	assert(0);
--
--Terminate:
--	dumpThreadStates();
--#endif
- }
--
--void record_uc(sys_thread_t *t, ucontext_t *uc)
--{
--	mcontext_t *mc = &(uc->uc_mcontext);
--
--	t->regs[0] = mc->mc_eax;
--	t->regs[1] = mc->mc_ecx;
--	t->regs[2] = mc->mc_edx;
--	t->regs[3] = mc->mc_ebx;
--	t->regs[4] = mc->mc_ebp;
--	t->regs[5] = mc->mc_esi;
--	t->regs[6] = mc->mc_edi;
--}
--
--/*
--From /usr/src/lib/libc/i386/gen/_setjmp.S:
--ENTRY(_setjmp)
--	movl	4(%esp),%eax
--	movl	0(%esp),%edx
--	movl	%edx, 0(%eax)	/ * rta * /
--	movl	%ebx, 4(%eax)
--	movl	%esp, 8(%eax)
--	movl	%ebp,12(%eax)
--	movl	%esi,16(%eax)
--	movl	%edi,20(%eax)
--	fnstcw	24(%eax)
--	xorl	%eax,%eax
--	ret
--
--typedef JmpBufStruct
--{
--	int	edx, // Accumulator for operands and results data.
--		ebx, // Pointer to data in the DS segment.
--		esp, // Stack pointer (in the SS segment).
--		ebp, // Pointer to data on the stack (in the SS segment).
--		esi, // Pointer to data in the segment pointer to by the DS register; source pointer for string operations.
--		edi; // Pointer to data (or destination) in the segment pointer to by the ES register; destination pointer for string operations.
--
--} JmpBufStruct;
--
--
--void record_jb(sys_thread_t *t, JmpBufStruct *jb)
--{
--	t->regs[0] = jb->eax; // What about these two register ? they seem missing in jmp_buf.
--	t->regs[1] = / *jb->ecx;* / 0;
--	t->regs[2] = jb->edx; // The rest of these registers are defined...
--	t->regs[3] = jb->ebx;
--	t->regs[4] = jb->ebp;
--	t->regs[5] = jb->esi;
--	t->regs[6] = jb->edi;
--}
--*/
--
--#if 0
--static void
--finish_suspension(void *arg)
--{
--	if (_thread_run->suspended != SUSP_NO)
--		_thread_kern_sched_state(PS_SUSPENDED, __FILE__, __LINE__);
--}
--
--void _pthread_suspend_np_by_pthread_common(pthread_t thread)
--{
--struct timeval  tv;
--struct timespec current_ts;
--
--	switch (thread->state) {
--	case PS_RUNNING:
--		/*
--		 * Remove the thread from the priority queue and
--		 * set the state to suspended:
--		 */
--		PTHREAD_PRIOQ_REMOVE(thread);
--		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
--		break;
--
--	case PS_SPINBLOCK:
--	case PS_FDR_WAIT:
--	case PS_FDW_WAIT:
--	case PS_POLL_WAIT:
--	case PS_SELECT_WAIT:
--		/*
--		 * Remove these threads from the work queue
--		 * and mark the operation as interrupted:
--		 */
--		if ((thread->flags & PTHREAD_FLAGS_IN_WORKQ) != 0)
--			PTHREAD_WORKQ_REMOVE(thread);
--		_thread_seterrno(thread,EINTR);
--
--		/* FALLTHROUGH */
--	case PS_SLEEP_WAIT:
--		thread->interrupted = 1;
--
--		/* FALLTHROUGH */
--	case PS_SIGTHREAD:
--	case PS_WAIT_WAIT:
--	case PS_SIGSUSPEND:
--	case PS_SIGWAIT:
--		/*
--		 * Remove these threads from the waiting queue and
--		 * set their state to suspended:
--		 */
--		PTHREAD_WAITQ_REMOVE(thread);
--		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
--		break;
--
--	case PS_MUTEX_WAIT:
--		/* Mark the thread as suspended and still in a queue. */
--		thread->suspended = SUSP_MUTEX_WAIT;
--
--		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
--		break;
--	case PS_COND_WAIT:
--#if 0
--		/* This is for a pthreads_cond_timedwait() --billh */
--		if (thread->wakeup_time.tv_sec != -1) {
--			/* (1) Use to restore the waiting-queue time that's left when the
--			 * thread is resumed. --billh
--			 */
--			_subtract_timespec3(thread, &current_ts, &thread->remaining_wakeup_time);
--
--			/* (2) So that it's inserted at the end of the waiting queue and
--			 * not scanned by the uthreads_kern.c waiting queue logic. It also
--			 * means to make it wait forever.
--			 */
--			thread->wakeup_time.tv_sec  = -1;
--			thread->wakeup_time.tv_nsec = -1;
--
--			/* (3) Remove and reinsert it at the end of waiting-queue
--			 * (automatic on the insertion attempt when (2)).
--			 */
--			PTHREAD_WORKQ_REMOVE(thread);
--			PTHREAD_WORKQ_INSERT(thread);
--		}
--#endif
--
--		/* Mark the thread as suspended and still in a queue. */
--		thread->suspended = SUSP_COND_WAIT;
--
--		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
--		break;
--	case PS_JOIN:
--		/* Mark the thread as suspended and joining: */
--		thread->suspended = SUSP_JOIN;
--
--		PTHREAD_NEW_STATE(thread, PS_SUSPENDED);
--		break;
--	case PS_FDLR_WAIT:
--	case PS_FDLW_WAIT:
--	case PS_FILE_WAIT:
--		/* Mark the thread as suspended: */
--		thread->suspended = SUSP_YES;
--
--		/*
--		 * Threads in these states may be in queues.
--		 * In order to preserve queue integrity, the
--		 * cancelled thread must remove itself from the
--		 * queue.  Mark the thread as interrupted and
--		 * set the state to running.  When the thread
--		 * resumes, it will remove itself from the queue
--		 * and call the suspension completion routine.
--		 */
--		thread->interrupted = 1;
--		_thread_seterrno(thread, EINTR);
--		PTHREAD_NEW_STATE(thread, PS_RUNNING);
--		thread->continuation = finish_suspension;
--		break;
--
--	case PS_DEAD:
--	case PS_DEADLOCK:
--	case PS_STATE_MAX:
--	case PS_SUSPENDED:
--		/* Nothing needs to be done: */
--		break;
--	}
--}
--
--void _pthread_resume_by_pthread_common(pthread_t thread, enum pthread_susp old_suspended)
--{
--struct timeval  tv;
--struct timespec current_ts,
--		remaining_spec;
--
--	/* Is it currently suspended? */
--	if (thread->state == PS_SUSPENDED) {
--		/*
--		 * Defer signals to protect the scheduling queues
--		 * from access by the signal handler:
--		 */
--		_thread_kern_sig_defer();
--
--		switch (old_suspended) {
--		case SUSP_MUTEX_WAIT:
--			/* Set the thread's state back. */
--			PTHREAD_SET_STATE(thread,PS_MUTEX_WAIT);
--			break;
--		case SUSP_COND_WAIT:
--			/* For cases where it was doing a pthread_cond_timedwait()
--			 * Mark the remaining suspend time.
--			 * --billh
--			 */
--#if 0
--			if (thread->remaining_wakeup_time.tv_sec != -1) {
--				GET_CURRENT_TOD(tv);
--				TIMEVAL_TO_TIMESPEC(&tv, &current_ts);
--
--				_subtract_timespec3(remaining_spec, &thread->wakeup_time, &current_ts);
--				_thread_kern_set_timeout_by_pthread_timespec(thread, &remaining_spec);
--			}
--#endif
--
--			/* Set the thread's state back. */
--			PTHREAD_SET_STATE(thread,PS_COND_WAIT);
--			break;
--		case SUSP_JOIN:
--			/* Set the thread's state back. */
--			PTHREAD_SET_STATE(thread,PS_JOIN);
--			break;
--		case SUSP_NOWAIT:
--			/* Allow the thread to run. */
--			PTHREAD_SET_STATE(thread,PS_RUNNING);
--			PTHREAD_WAITQ_REMOVE(thread);
--			PTHREAD_PRIOQ_INSERT_TAIL(thread);
--			break;
--		case SUSP_NO:
--		case SUSP_YES:
--			/* Allow the thread to run. */
--			PTHREAD_SET_STATE(thread,PS_RUNNING);
--			PTHREAD_PRIOQ_INSERT_TAIL(thread);
--			break;
--		}
--
--		/*
--		 * Undefer and handle pending signals, yielding if
--		 * necessary:
--		 */
--		_thread_kern_sig_undefer();
--	}
--}
--
- #endif
diff --git a/java/jdk16/files/patch-threads_md.c b/java/jdk16/files/patch-threads_md.c
deleted file mode 100644
index d29f1c864ecb..000000000000
--- a/java/jdk16/files/patch-threads_md.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/hpi/native_threads/src/threads_md.c	21 Nov 2001 04:02:04 -0000	1.4
-+++ ../src/solaris/hpi/native_threads/src/threads_md.c	24 Feb 2003 03:17:30 -0000
-@@ -23,6 +23,7 @@
- #include <setjmp.h>

- #include <signal.h>

- #include <sys/types.h>

-+#include <sys/time.h>

- #include <sys/signal.h>

- #include <sys/resource.h>

- #ifdef __FreeBSD__

diff --git a/java/jdk16/pkg-descr b/java/jdk16/pkg-descr
index f923cbfd2320..e3405a6f9a1a 100644
--- a/java/jdk16/pkg-descr
+++ b/java/jdk16/pkg-descr
@@ -1,5 +1,5 @@
 This is the latest patchset from the Java 2 FreeBSD porting project.  This 
-port allows you to easily build a native JDK1.3.1 for FreeBSD.
+port allows you to easily build a native JDK1.4.1 for FreeBSD.
 
 Please note that due to the current Sun licensing policy the resulting binaries
 can't be distributed and you are only permitted to use/hack it personally.
diff --git a/java/jdk16/pkg-message b/java/jdk16/pkg-message
index 1078eecc4824..ce79ffc57690 100644
--- a/java/jdk16/pkg-message
+++ b/java/jdk16/pkg-message
@@ -1,587 +1,705 @@
-SUN COMMUNITY SOURCE LICENSE
-Version 2.3
-(Rev. Date February 22, 1999)
- 
+SUN COMMUNITY SOURCE LICENSE Version 2.3 (Rev.  Date Feb. 
+23, 1999)
+        
 RECITALS
-
-Original Contributor has developed Specifications and Source Code 
-implementations of certain Technology; and
-
-Original Contributor desires to license the Technology to a large community to 
-facilitate research, innovation and product development while maintaining 
-compatibility of such products with the Technology as delivered by Original 
+        
+Original Contributor has developed Specifications and Source
+Code implementations of certain Technology; and
+        
+Original Contributor desires to license the Technology to a
+large community to facilitate research, innovation and
+product development while maintaining compatibility of such
+products with the Technology as delivered by Original
 Contributor; and
+        
+Original Contributor desires to license certain Sun
+Trademarks for the purpose of branding products that are
+compatible with the relevant Technology delivered by
+Original Contributor; and
+               
+You desire to license the Technology and possibly certain
+Sun Trademarks from Original Contributor on the terms and
+conditions specified in this License.
+                 
+In consideration for the mutual covenants contained herein,
+You and Original Contributor agree as follows:
+        
+AGREEMENT
+1.  Introduction.  The Sun Community Source License and
+effective attachments ("License") may include five distinct
+licenses:  Research Use, TCK, Internal Deployment Use,
+Commercial Use and Trademark License.  The Research Use
+license is effective when You click and accept this License.
+The TCK and Internal Deployment Use licenses are effective
+when You click and accept this License, unless otherwise
+specified in the TCK and Internal Deployment Use
+attachments.  The Commercial Use and Trademark licenses must
+be signed by You and Original Contributor in order to become
+effective.  Once effective, these licenses and the
+associated requirements and responsibilities are cumulative.
+Capitalized terms used in this License are defined in the
+Glossary.
+
+2.  License Grants.
+
+2.1 Original Contributor Grant.  Subject to Your compliance
+with Sections 3, 8.10 and Attachment A of this License,
+Original Contributor grants to You a worldwide,
+royalty-free, non-exclusive license, to the extent of
+Original Contributor's Intellectual Property Rights covering
+the Original Code, Upgraded Code and Specifications, to do
+the following:
+
+a) Research Use License:
+
+(i) use, reproduce and modify the Original Code, Upgraded
+Code and Specifications to create Modifications and
+Reformatted Specifications for Research Use by You,
+
+(ii) publish and display Original Code, Upgraded Code and
+Specifications with, or as part of Modifications, as
+permitted under Section 3.1 b) below,
+
+(iii) reproduce and distribute copies of Original Code and
+Upgraded Code to Licensees and students for Research Use by
+You,
+
+(iv) compile, reproduce and distribute Original Code and
+Upgraded Code in Executable form, and Reformatted
+Specifications to anyone for Research Use by You.
+
+b) Other than the licenses expressly granted in this
+License, Original Contributor retains all right, title, and
+interest in Original Code and Upgraded Code and
+Specifications.
 
-Original Contributor desires to license certain Sun Trademarks for the purpose 
-of branding products that are compatible with the relevant Technology delivered 
-by Original Contributor; and
-
-You desire to license the Technology and possibly certain Sun Trademarks from 
-Original Contributor on the terms and conditions specified in this License.
-
-In consideration for the mutual covenants contained herein, You and Original 
-Contributor agree as follows:
-
-AGREEMENT 
-
-1.	Introduction. The Sun Community Source License and effective attachments 
-("License") may include five distinct licenses: Research Use, TCK, Internal 
-Deployment Use, Commercial Use and Trademark License. The Research Use license 
-is effective when You click and accept this License. The TCK and Internal 
-Deployment Use licenses are effective when You click and accept this License, 
-unless otherwise specified in the TCK and Internal Deployment Use attachments. 
-The Commercial Use and Trademark licenses must be signed by You and Original 
-Contributor in order to become effective. Once effective, these licenses and the 
-associated requirements and responsibilities are cumulative. Capitalized terms 
-used in this License are defined in the Glossary.
- 
-2.	License Grants.
-
-2.1	Original Contributor Grant. Subject to Your compliance with Sections 3, 
-8.10 and Attachment A of this License, Original Contributor grants to You a 
-worldwide, royalty-free, non- exclusive license, to the extent of Original 
-Contributor's Intellectual Property Rights covering the Original Code, Upgraded 
-Code and Specifications, to do the following:
- 
-a)	Research Use License: 
-	(i)	use, reproduce and modify the Original Code, Upgraded Code and 
-Specifications to create Modifications and Reformatted Specifications for 
-Research Use by You, 
-	(ii)	publish and display Original Code, Upgraded Code and 
-Specifications with, or as part of Modifications, as permitted under Section 3.1 
-b) below, 
-	(iii)	reproduce and distribute copies of Original Code and Upgraded 
-Code to Licensees and students for Research Use by You,
-	(iv) 	compile, reproduce and distribute Original Code and Upgraded 
-Code in Executable form, and Reformatted Specifications to anyone for Research 
-Use by You.
- 
-b)	Other than the licenses expressly granted in this License, Original 
-Contributor retains all right, title, and interest in Original Code and Upgraded 
-Code and Specifications. 
-           
-2.2	Your Grants. 
-
-a)	To Other Licensees. You hereby grant to each Licensee a license to Your 
-Error Corrections and Shared Modifications, of the same scope and extent as 
-Original Contributor's licenses under Section 2.1 a) above relative to Research 
-Use, Attachment C relative to Internal Deployment Use, and Attachment D relative 
-to Commercial Use.
- 
-b)	To Original Contributor. You hereby grant to Original Contributor a 
-worldwide, royalty-free, non-exclusive, perpetual and irrevocable license, to 
-the extent of Your Intellectual Property Rights covering Your Error Corrections, 
-Shared Modifications and Reformatted Specifications, to use, reproduce, modify, 
-display and distribute Your Error Corrections, Shared Modifications and 
-Reformatted Specifications, in any form, including the right to sublicense such 
-rights through multiple tiers of distribution.
- 
-c)	Other than the licenses expressly granted in Sections 2.2 a) and b) 
-above, and the restriction set forth in Section 3.1 d)(iv) below, You retain all 
-right, title, and interest in Your Error Corrections, Shared Modifications and 
+2.2 Your Grants.
+
+a) To Other Licensees.  You hereby grant to each Licensee a
+license to Your Error Corrections and Shared Modifications,
+of the same scope and extent as Original Contributor's
+licenses under Section 2.1 a) above relative to Research
+Use, Attachment C relative to Internal Deployment Use, and
+Attachment D relative to Commercial Use.
+
+b) To Original Contributor.  You hereby grant to Original
+Contributor a worldwide, royalty-free, non-exclusive,
+perpetual and irrevocable license, to the extent of Your
+Intellectual Property Rights covering Your Error
+Corrections, Shared Modifications and Reformatted
+Specifications, to use, reproduce, modify, display and
+distribute Your Error Corrections, Shared Modifications and
+Reformatted Specifications, in any form, including the right
+to sublicense such rights through multiple tiers of
+distribution.
+
+c) Other than the licenses expressly granted in Sections 2.2
+a) and b) above, and the restriction set forth in Section
+3.1 d)(iv) below, You retain all right, title, and interest
+in Your Error Corrections, Shared Modifications and
 Reformatted Specifications.
- 
-2.3	Contributor Modifications. You may use, reproduce, modify, display and 
-distribute Contributor Error Corrections, Shared Modifications and Reformatted 
-Specifications, obtained by You under this License, to the same scope and extent 
-as with Original Code, Upgraded Code and Specifications. 
- 
-2.4	Subcontracting. You may deliver the Source Code of Covered Code to other 
-Licensees having at least a Research Use license, for the sole purpose of 
-furnishing development services to You in connection with Your rights granted in 
-this License. All such Licensees must execute appropriate documents with respect 
-to such work consistent with the terms of this License, and acknowledging their 
-work-made-for-hire status or assigning exclusive right to the work product and 
-associated Intellectual Property Rights to You.
- 
-3.	Requirements and Responsibilities.
-3.1	Research Use License. As a condition of exercising the rights granted 
-under Section 2.1 a) above, You agree to comply with the following:
-
-a)	Your Contribution to the Community. All Error Corrections and Shared 
-Modifications which You create or contribute to are automatically subject to the 
-licenses granted under Section 2.2 above. You are encouraged to license all of 
-Your other Modifications under Section 2.2 as Shared Modifications, but are not 
-required to do so. You agree to notify Original Contributor of any errors in the 
+
+2.3 Contributor Modifications.  You may use, reproduce,
+modify, display and distribute Contributor Error
+Corrections, Shared Modifications and Reformatted
+Specifications, obtained by You under this License, to the
+same scope and extent as with Original Code, Upgraded Code
+and Specifications.
+
+2.4 Subcontracting.  You may deliver the Source Code of
+Covered Code to other Licensees having at least a Research
+Use license, for the sole purpose of furnishing development
+services to You in connection with Your rights granted in
+this License.  All such Licensees must execute appropriate
+documents with respect to such work consistent with the
+terms of this License, and acknowledging their
+work-made-for-hire status or assigning exclusive right to
+the work product and associated Intellectual Property Rights
+to You.
+
+3.Requirements and Responsibilities.
+
+3.1 Research Use License.  As a condition of exercising the rights 
+granted under Section 2.1 a) above, You agree to comply with the following:
+
+a) Your Contribution to the Community.  All Error
+Corrections and Shared Modifications which You create or
+contribute to are automatically subject to the licenses
+granted under Section 2.2 above.  You are encouraged to
+license all of Your other Modifications under Section 2.2 as
+Shared Modifications, but are not required to do so.  You
+agree to notify Original Contributor of any errors in the
 Specification.
 
-b)	Source Code Availability. You agree to provide all Your Error 
-Corrections to Original Contributor as soon as reasonably practicable and, in 
-any event, prior to Internal Deployment Use or Commercial Use, if applicable.   
-Original Contributor may, at its discretion, post Source Code for Your Error 
-Corrections and Shared Modifications on the Community Webserver. You may also 
-post Error Corrections and Shared Modifications on a web-server of Your choice; 
-provided, that You must take reasonable precautions to ensure that only 
-Licensees have access to such Error Corrections and Shared Modifications. Such 
-precautions shall include, without limitation, a password protection scheme 
-limited to Licensees and a click-on, download certification of Licensee status 
-required of those attempting to download from the server. An example of an 
+b) Source Code Availability.  You agree to provide all Your
+Error Corrections to Original Contributor as soon as
+reasonably practicable and, in any event, prior to Internal
+Deployment Use or Commercial Use, if applicable.  Original
+Contributor may, at its discretion, post Source Code for
+Your Error Corrections and Shared Modifications on the
+Community Webserver.  You may also post Error Corrections
+and Shared Modifications on a web-server of Your choice;
+provided, that You must take reasonable precautions to
+ensure that only Licensees have access to such Error
+Corrections and Shared Modifications.  Such precautions
+shall include, without limitation, a password protection
+scheme limited to Licensees and a click-on, download
+certification of Licensee status required of those
+attempting to download from the server.  An example of an
 acceptable certification is attached as Attachment A-2.
 
-c)	Notices. All Error Corrections and Shared Modifications You create or 
-contribute to must include a file documenting the additions and changes You made 
-and the date of such additions and changes. You must also include the notice set 
-forth in Attachment A-1 in the file header. If it is not possible to put the 
-notice in a particular Source Code file due to its structure, then You must 
-include the notice in a location (such as a relevant directory file), where a 
+c) Notices.  All Error Corrections and Shared Modifications
+You create or contribute to must include a file documenting
+the additions and changes You made and the date of such
+additions and changes.  You must also include the notice set
+forth in Attachment A-1 in the file header.  If it is not
+possible to put the notice in a particular Source Code file
+due to its structure, then You must include the notice in a
+location (such as a relevant directory file), where a
 recipient would be most likely to look for such a notice.
 
-d)	Redistribution.
-
-	(i)	Source. Covered Code may be distributed in Source Code form only 
-to another Licensee (except for students as provided below). You may not offer 
-or impose any terms on any Covered Code that alter the rights, requirements, or 
-responsibilities of such Licensee. You may distribute Covered Code to students 
-for use in connection with their course work and research projects undertaken at 
-accredited educational institutions. Such students need not be Licensees, but 
-must be given a copy of the notice set forth in Attachment A-3 and such notice 
-must also be included in a file header or prominent location in the Source Code 
-made available to such students.
-
-	(ii)	Executable. You may distribute Executable version(s) of Covered 
-Code to Licensees and other third parties only for the purpose of evaluation and 
-comment in connection with Research Use by You and under a license of Your 
-choice, but which limits use of such Executable version(s) of Covered Code only 
-to that purpose. 
-
-	(iii)	 Modified Class, Interface and Package Naming. In connection 
-with Research Use by You only, You may use Original
-Contributor’s class, interface and package names only to accurately reference or 
-invoke the Source Code files You modify.
-Original Contributor grants to You a limited license to the extent necessary for 
-such purposes.
-
-	(iv)	You expressly agree that any distribution, in whole or in part, 
-of Modifications developed by You shall only be done pursuant to the term and 
-conditions of this License.
-
-e)	Extensions.
-
-	(i)	Covered Code. You may not include any Source Code of Community 
-Code in any Extensions;
-
-	(ii) 	Publication. No later than the date on which You first 
-distribute such Extension for Commercial Use, You must publish to the industry, 
-on a non-confidential basis and free of all copyright restrictions with respect 
-to reproduction and use, an accurate and current specification for any 
-Extension. In addition, You must make available an appropriate test suite, 
-pursuant to the same rights as the specification, sufficiently detailed to allow 
-any third party reasonably skilled in the technology to produce implementations 
-of the Extension compatible with the specification. Such test suites must be 
-made available as soon as reasonably practicable but, in no event, later than 
-ninety (90) days after Your first Commercial Use of the Extension. You must use 
-reasonable efforts to promptly clarify and correct the specification and the 
-test suite upon written request by Original Contributor.
-
-	(iii)	Open. You agree to refrain from enforcing any Intellectual 
-Property Rights You may have covering any interface(s) of Your Extension, which 
-would prevent the implementation of such interface(s) by Original Contributor or 
-any Licensee. This obligation does not prevent You from enforcing any 
-Intellectual Property Right You have that would otherwise be infringed by an 
-implementation of Your Extension. 
-
-	(iv)	Class, Interface and Package Naming. You may not add any 
-packages, or any public or protected classes or interfaces with names that 
-originate or might appear to originate from Original Contributor including, 
-without limitation, package or class names which begin with "sun", "java", 
-"javax", "jini", "net.jini", "com.sun" or their equivalents in any subsequent 
-class, interface and/ or package naming convention adopted by Original 
-Contributor. It is specifically suggested that You name any new packages using 
-the "Unique Package Naming Convention" as described in "The Java Language 
-Specification" by James Gosling, Bill Joy, and Guy Steele, ISBN 0-201-63451-1, 
-August 1996. Section 7.7 "Unique Package Names", on page 125 of this 
+d) Redistribution.
+
+(i) Source.  Covered Code may be distributed in Source Code
+form only to another Licensee (except for students as
+provided below).  You may not offer or impose any terms on
+any Covered Code that alter the rights, requirements, or
+responsibilities of such Licensee.  You may distribute
+Covered Code to students for use in connection with their
+course work and research projects undertaken at accredited
+educational institutions.  Such students need not be
+Licensees, but must be given a copy of the notice set forth
+in Attachment A-3 and such notice must also be included in a
+file header or prominent location in the Source Code made
+available to such students.
+
+(ii) Executable.  You may distribute Executable version(s)
+of Covered Code to Licensees and other third parties only
+for the purpose of evaluation and comment in connection with
+Research Use by You and under a license of Your choice, but
+which limits use of such Executable version(s) of Covered
+Code only to that purpose.
+
+(iii) Modified Class,Interface and Package Naming.  In
+connection with Research Use by You only, You may use
+Original Contributor's class, interface and package names
+only to accurately reference or invoke the Source Code files
+You modify.  Original Contributor grants to You a limited
+license to the extent necessary for such purposes.
+
+(iv) You expressly agree that any distribution, in whole or
+in part, of Modifications developed by You shall only be
+done pursuant to the term and conditions of this License.
+
+e) Extensions.
+
+(i) Covered Code.  You may not include any Source Code of
+Community Code in any Extensions;
+
+(ii) Publication.  No later than the date on which You first
+distribute such Extension for Commercial Use, You must
+publish to the industry, on a non-confidential basis and
+free of all copyright restrictions with respect to
+reproduction and use, an accurate and current specification
+for any Extension.  In addition, You must make available an
+appropriate test suite, pursuant to the same rights as the
+specification, sufficiently detailed to allow any third
+party reasonably skilled in the technology to produce
+implementations of the Extension compatible with the
+specification.  Such test suites must be made available as
+soon as reasonably practicable but, in no event, later than
+ninety (90) days after Your first Commercial Use of the
+Extension.  You must use reasonable efforts to promptly
+clarify and correct the specification and the test suite
+upon written request by Original Contributor.
+
+(iii) Open.  You agree to refrain from enforcing any
+Intellectual Property Rights You may have covering any
+interface(s) of Your Extension, which would prevent the
+implementation of such interface(s) by Original Contributor
+or any Licensee.  This obligation does not prevent You from
+enforcing any Intellectual Property Right You have that
+would otherwise be infringed by an implementation of Your
+Extension.
+
+(iv) Class, Interface and Package Naming.  You may not add
+any packages, or any public or protected classes or
+interfaces with names that originate or might appear to
+originate from Original Contributor including, without
+limitation, package or class names which begin with "sun",
+"java", "javax", "jini", "net.jini", "com.sun" or their
+equivalents in any subsequent class, interface and/ or
+package naming convention adopted by Original Contributor.
+It is specifically suggested that You name any new packages
+using the "Unique Package Naming Convention" as described in
+"The Java Language Specification" by James Gosling, Bill
+Joy, and Guy Steele, ISBN 0-201-63451-1, August 1996.
+Section 7.7 "Unique Package Names", on page 125 of this
 specification which states, in part:
 
-"You form a unique package name by first having (or belonging to an organization 
-that has) an Internet domain name, such as "sun.com". You then reverse the name, 
-component by component, to obtain, in this example, "Com.sun", and use this as a 
-prefix for Your package names, using a convention developed within Your 
-organization to further administer package names."
-
-3.2	Additional Requirements and Responsibilities. Any additional 
-requirements and responsibilities relating to the Technology are listed in 
-Attachment F (Additional Requirements and Responsibilities), if applicable, and 
-are hereby incorporated into this Section 3.
- 
-4.	Versions of the License.
- 
-4.1	License Versions. Original Contributor may publish revised versions of 
-the License from time to time. Each version will be given a distinguishing 
-version number.
- 
-4.2	Effect. Once a particular version of Covered Code has been provided 
-under a version of the License, You may always continue to use such Covered Code 
-under the terms of that version of the License. You may also choose to use such 
-Covered Code under the terms of any subsequent version of the License. No one 
-other than Original Contributor has the right to promulgate License versions.
- 
-5.	Disclaimer of Warranty.
- 
-5.1	COVERED CODE IS PROVIDED UNDER THIS LICENSE "AS IS", WITHOUT WARRANTY OF 
-ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES 
-THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR 
-PURPOSE OR NON-INFRINGING. YOU AGREE TO BEAR THE ENTIRE RISK IN CONNECTION WITH 
-YOUR USE AND DISTRIBUTION OF COVERED CODE UNDER THIS LICENSE. THIS DISCLAIMER OF 
-WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED 
-CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO THIS DISCLAIMER.
- 
-5.2	You acknowledge that Original Code, Upgraded Code and Specifications are 
-not designed or intended for use in (i) on-line control of aircraft, air 
-traffic, aircraft navigation or aircraft communications; or (ii) in the design, 
-construction, operation or maintenance of any nuclear facility. Original 
-Contributor disclaims any express or implied warranty of fitness for such uses.
- 
-6.	Termination.
- 
-6.1	By You. You may terminate this Research Use license at anytime by 
-providing written notice to Original Contributor.
-
-6.2	By Original Contributor. This License and the rights granted hereunder 
-will terminate:
-
-	(i)	 automatically if You fail to comply with the terms of this 
-License and fail to cure such breach within 30 days of receipt of written notice 
-of the breach; 
-
-	(ii)	immediately in the event of circumstances specified in Sections 
-7.1 and 8.4; or 
-
-	(iii)	at Original Contributor's discretion upon any action initiated 
-in the first instance by You alleging that use or distribution by Original 
-Contributor or any Licensee, of Original Code, Upgraded Code, Error Corrections 
-or Shared Modifications contributed by You, or Specifications, infringe a patent 
-owned or controlled by You. 
-
-6.3	Effective of Termination. Upon termination, You agree to discontinue use 
-and return or destroy all copies of Covered Code in Your possession. All 
-sublicenses to the Covered Code which You have properly granted shall survive 
-any termination of this License. Provisions which, by their nature, should 
-remain in effect beyond the termination of this License shall survive including, 
-without limitation, Sections 2.2, 3, 5, 7 and 8.
- 
-6.4	Each party waives and releases the other from any claim to compensation 
-or indemnity for permitted or lawful termination of the business relationship 
-established by this License. 
- 
-7.	Liability.
- 
-7.1	Infringement. Should any of the Original Code, Upgraded Code, TCK or 
-Specifications ("Materials") become the subject of a claim of infringement, 
-Original Contributor may, at its sole option, (i) attempt to procure the rights 
-necessary for You to continue using the Materials, (ii) modify the Materials so 
-that they are no longer infringing, or (iii) terminate Your right to use the 
-Materials, immediately upon written notice, and refund to You the amount, if 
-any, having then actually been paid by You to Original Contributor for the 
-Original Code, Upgraded Code and TCK, depreciated on a straight line, five year 
-basis.
- 
-7.2	LIMITATION OF LIABILITY. TO THE FULL EXTENT ALLOWED BY APPLICABLE LAW, 
-ORIGINAL CONTRIBUTOR's LIABILITY TO YOU FOR CLAIMS RELATING TO THIS LICENSE, 
-WHETHER FOR BREACH OR IN TORT, SHALL BE LIMITED TO ONE HUNDRED PERCENT (100%) OF 
-THE AMOUNT HAVING THEN ACTUALLY BEEN PAID BY YOU TO ORIGINAL CONTRIBUTOR FOR ALL 
-COPIES LICENSED HEREUNDER OF THE PARTICULAR ITEMS GIVING RISE TO SUCH CLAIM, IF 
-ANY. IN NO EVENT WILL YOU (RELATIVE TO YOUR SHARED MODIFICATIONS OR ERROR 
-CORRECTIONS) OR SUN BE LIABLE FOR ANY INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL OR 
-CONSEQUENTIAL DAMAGES IN CONNECTION WITH OR ARISING OUT OF THIS LICENSE 
-(INCLUDING, WITHOUT LIMITATION, LOSS OF PROFITS, USE, DATA, OR OTHER ECONOMIC 
-ADVANTAGE), HOWEVER IT ARISES AND ON ANY THEORY OF LIABILITY, WHETHER IN AN 
-ACTION FOR CONTRACT, STRICT LIABILITY OR TORT (INCLUDING NEGLIGENCE) OR 
-OTHERWISE, WHETHER OR NOT YOU OR ORIGINAL CONTRIBUTOR HAS BEEN ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE AND NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE 
-OF ANY REMEDY.
- 
-8.	Miscellaneous.
- 
-8.1	Trademark. You agree to comply with the then current Sun Trademark & 
-Logo Usage Requirements accessible through the SCSL Webpage. Except as expressly 
-provided in the License, You are granted no right, title or license to, or 
-interest in, any Sun Trademarks. You agree not to (i) challenge Original 
-Contributor's ownership or use of Sun Trademarks; (ii) attempt to register any 
-Sun Trademarks, or any mark or logo substantially similar thereto; or (iii) 
-incorporate any Sun Trademarks into Your own trademarks, product names, service 
-marks, company names, or domain names.
- 
-8.2	Integration. This License represents the complete agreement concerning 
-the subject matter hereof. 
-
-8.3	Assignment. Original Contributor may assign this License, and its rights 
-and obligations hereunder, in its sole discretion. You may assign the Research 
-Use portions of this License to a third party upon prior written notice to 
-Original Contributor (which may be provided via the Community Web-Server). You 
-may not assign the Commercial Use license or TCK license, including by way of 
-merger (regardless of whether You are the surviving entity) or acquisition, 
-without Original Contributor's prior written consent. 
- 
-8.4	Severability. If any provision of this License is held to be 
-unenforceable, such provision shall be reformed only to the extent necessary to 
-make it enforceable. Notwithstanding the foregoing, if You are prohibited by law 
-from fully and specifically complying with Sections 2.2 or 3, this License will 
-immediately terminate and You must immediately discontinue any use of Covered 
-Code. 
- 
-8.5	Governing Law. This License shall be governed by the laws of the United 
-States and the State of California, as applied to contracts entered into and to 
-be performed in California between California residents. The application of the 
-United Nations Convention on Contracts for the International Sale of Goods is 
-expressly excluded. 
- 
-8.6	Dispute Resolution. 
-
-a)	Any dispute arising out of or relating to this License shall be finally 
-settled by arbitration as set out herein, except that either party may bring any 
-action, in a court of competent jurisdiction (which jurisdiction shall be 
-exclusive), with respect to any dispute relating to such party's Intellectual 
-Property Rights or with respect to Your compliance with the TCK license. 
-Arbitration shall be administered: (i) by the American Arbitration Association 
-(AAA), (ii) in accordance with the rules of the United Nations Commission on 
-International Trade Law (UNCITRAL) (the "Rules") in effect at the time of 
-arbitration as modified herein; and (iii) the arbitrator will apply the 
-substantive laws of California and United States. Judgement upon the award 
-rendered by the arbitrator may be entered in any court having jurisdiction to 
-enforce such award. 
-
-b)	All arbitration proceedings shall be conducted in English by a single 
-arbitrator selected in accordance with the Rules, who must be fluent in English 
-and be either a retired judge or practicing attorney having at least ten (10) 
-years litigation experience and be reasonably familiar with the technology 
-matters relative to the dispute. Unless otherwise agreed, arbitration venue 
-shall be in London, Tokyo, or San Francisco, whichever is closest to defendant's 
-principal business office.   The arbitrator may award monetary damages only and 
-nothing shall preclude either party from seeking provisional or emergency relief 
-from a court of competent jurisdiction. The arbitrator shall have no authority 
-to award damages in excess of those permitted in this License and any such award 
-in excess is void. All awards will be payable in U.S. dollars and may include, 
-for the prevailing party (i) pre-judgment award interest, (ii) reasonable 
-attorneys' fees incurred in connection with the arbitration, and (iii) 
-reasonable costs and expenses incurred in enforcing the award. The arbitrator 
-will order each party to produce identified documents and respond to no more 
-than twenty-five single question interrogatories.
-
-8.7	Construction. Any law or regulation which provides that the language of 
-a contract shall be construed against the drafter shall not apply to this 
-License. 
- 
-8.8	U.S. Government End Users. The Covered Code is a "commercial item", as 
-that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial 
-computer software" and "commercial computer software documentation", as such 
-terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 
-12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. 
-Government End Users acquire Covered Code with only those rights set forth 
-herein. You agree to pass this notice to Your licensees.
- 
-8.9	Press Announcements. All press announcements relative to the execution 
-of this License must be reviewed and approved by Original Contributor and You 
-prior to release.      
- 
-8.10	International Use.
- 
-a)	Export/Import laws. Covered Code is subject to U.S. export control laws 
-and may be subject to export or import regulations in other countries. Each 
-party agrees to comply strictly with all such laws and regulations and 
-acknowledges their responsibility to obtain such licenses to export, re- export, 
-or import as may be required. You agree to pass these obligations to Your 
-licensees.
- 
-b)	Intellectual Property Protection. Due to limited intellectual property 
-protection and enforcement in certain countries, You agree not to redistribute 
-the Original Code, Upgraded Code, TCK and Specifications to any country other 
+"You form a unique package name by first having (or
+belonging to an organization that has) an Internet domain
+name, such as "sun.com".  You then reverse the name,
+component by component, to obtain, in this example,
+"Com.sun", and use this as a prefix for Your package names,
+using a convention developed within Your organization to
+further administer package names."
+
+3.2 Additional Requirements and Responsibilities.  Any
+additional requirements and responsibilities relating to the
+Technology are listed in Attachment F (Additional
+Requirements and Responsibilities), if applicable, and are
+hereby incorporated into this Section 3.
+
+4.  Versions of the License.
+
+4.1 License Versions.  Original Contributor may publish
+revised versions of the License from time to time.  Each
+version will be given a distinguishing version number.
+
+4.2 Effect.  Once a particular version of Covered Code has
+been provided under a version of the License, You may always
+continue to use such Covered Code under the terms of that
+version of the License.  You may also choose to use such
+Covered Code under the terms of any subsequent version of
+the License.  No one other than Original Contributor has the
+right to promulgate License versions.
+
+5.  Disclaimer of Warranty.
+
+5.1 COVERED CODE IS PROVIDED UNDER THIS LICENSE "AS IS,"
+WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+PURPOSE OR NON-INFRINGING.  YOU AGREE TO BEAR THE ENTIRE
+RISK IN CONNECTION WITH YOUR USE AND DISTRIBUTION OF COVERED
+CODE UNDER THIS LICENSE.  THIS DISCLAIMER OF WARRANTY
+CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.  NO USE OF
+ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO
+THIS DISCLAIMER.
+
+5.2 You acknowledge that Original Code, Upgraded Code and
+Specifications are not designed or intended for use in (i)
+on-line control of aircraft, air traffic, aircraft
+navigation or aircraft communications; or (ii) in the
+design, construction, operation or maintenance of any
+nuclear facility.  Original Contributor disclaims any
+express or implied warranty of fitness for such uses.
+
+6.  Termination.
+
+6.1 By You.  You may terminate this Research Use license at
+anytime by providing written notice to Original Contributor.
+
+6.2 By Original Contributor.  This License and the rights
+granted hereunder will terminate:
+
+(i) automatically if You fail to comply with the terms of
+this License and fail to cure such breach within 30 days of
+receipt of written notice of the breach;
+
+(ii) immediately in the event of circumstances specified in
+Sections 7.1 and 8.4; or
+
+(iii) at Original Contributor's discretion upon any action
+initiated in the first instance by You alleging that use or
+distribution by Original Contributor or any Licensee, of
+Original Code, Upgraded Code, Error Corrections or Shared
+Modifications contributed by You, or Specifications,
+infringe a patent owned or controlled by You.
+
+6.3 Effective of Termination.  Upon termination, You agree
+to discontinue use and return or destroy all copies of
+Covered Code in your possession.  All sublicenses to the
+Covered Code which you have properly granted shall survive
+any termination of this License.  Provisions which, by their
+nature, should remain in effect beyond the termination of
+this License shall survive including, without limitation,
+Sections 2.2, 3, 5, 7 and 8.
+
+6.4 Each party waives and releases the other from any claim
+to compensation or indemnity for permitted or lawful
+termination of the business relationship established by this
+License.
+
+7.  Liability.
+
+7.1 Infringement.  Should any of the Original Code, Upgraded
+Code, TCK or Specifications ("Materials") become the subject
+of a claim of infringement, Original Contributor may, at its
+sole option, (i) attempt to procure the rights necessary for
+You to continue using the Materials, (ii) modify the
+Materials so that they are no longer infringing, or (iii)
+terminate Your right to use the Materials, immediately upon
+written notice, and refund to You the amount, if any, having
+then actually been paid by You to Original Contributor for
+the Original Code, Upgraded Code and TCK, depreciated on a
+straight line, five year basis.
+
+7.2 LIMITATION OF LIABILITY.  TO THE FULL EXTENT ALLOWED BY
+APPLICABLE LAW, ORIGINAL CONTRIBUTOR's LIABILITY TO YOU FOR
+CLAIMS RELATING TO THIS LICENSE, WHETHER FOR BREACH OR IN
+TORT, SHALL BE LIMITED TO ONE HUNDRED PERCENT (100%) OF THE
+AMOUNT HAVING THEN ACTUALLY BEEN PAID BY YOU TO ORIGINAL
+CONTRIBUTOR FOR ALL COPIES LICENSED HEREUNDER OF THE
+PARTICULAR ITEMS GIVING RISE TO SUCH CLAIM, IF ANY.  IN NO
+EVENT WILL YOU (RELATIVE TO YOUR SHARED MODIFICATIONS OR
+ERROR CORRECTIONS) OR SUN BE LIABLE FOR ANY INDIRECT,
+PUNITIVE, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES IN
+CONNECTION WITH OR ARISING OUT OF THIS LICENSE (INCLUDING,
+WITHOUT LIMITATION, LOSS OF PROFITS, USE, DATA, OR OTHER
+ECONOMIC ADVANTAGE), HOWEVER IT ARISES AND ON ANY THEORY OF
+LIABILITY, WHETHER IN AN ACTION FOR CONTRACT, STRICT
+LIABILITY OR TORT (INCLUDING NEGLIGENCE) OR OTHERWISE,
+WHETHER OR NOT YOU OR ORIGINAL CONTRIBUTOR HAS BEEN ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE AND NOTWITHSTANDING THE
+FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY.
+
+8.  Miscellaneous.
+
+8.1 Trademark.  You agree to comply with the then current
+Sun Trademark & Logo Usage Requirements accessible through
+the SCSL Webpage.  Except as expressly provided in the
+License, You are granted no right, title or license to, or
+interest in, any Sun Trademarks.  You agree not to (i)
+challenge Original Contributor's ownership or use of Sun
+Trademarks; (ii) attempt to register any Sun Trademarks, or
+any mark or logo substantially similar thereto; or (iii)
+incorporate any Sun Trademarks into your own trademarks,
+product names, service marks, company names, or domain
+names.
+
+8.2 Integration.  This License represents the complete
+agreement concerning the subject matter hereof.
+
+8.3 Assignment.  Original Contributor may assign this
+License, and its rights and obligations hereunder, in its
+sole discretion.  You may assign the Research Use portions
+of this License to a third party upon prior written notice
+to Original Contributor (which may be provided via the
+Community Web-Server).  You may not assign the Commercial
+Use license or TCK license, including by way of merger
+(regardless of whether You are the surviving entity) or
+acquisition, without Original Contributor's prior written
+consent.
+
+8.4 Severability.  If any provision of this License is held
+to be unenforceable, such provision shall be reformed only
+to the extent necessary to make it enforceable.
+Notwithstanding the foregoing, if You are prohibited by law
+from fully and specifically complying with Sections 2.2 or
+3, this License will immediately terminate and You must
+immediately discontinue any use of Covered Code.
+
+8.5 Governing Law.  This License shall be governed by the
+laws of the United States and the State of California, as
+applied to contracts entered into and to be performed in
+California between California residents.  The application of
+the United Nations Convention on Contracts for the
+International Sale of Goods is expressly excluded.
+
+8.6 Dispute Resolution.
+
+a) Any dispute arising out of or relating to this License
+shall be finally settled by arbitration as set out herein,
+except that either party may bring any action, in a court of
+competent jurisdiction (which jurisdiction shall be
+exclusive), with respect to any dispute relating to such
+party's Intellectual Property Rights or with respect to Your
+compliance with the TCK license.  Arbitration shall be
+administered:  (i) by the American Arbitration Association
+(AAA), (ii) in accordance with the rules of the United
+Nations Commission on International Trade Law (UNCITRAL)
+(the "Rules") in effect at the time of arbitration as
+modified herein; and (iii) the arbitrator will apply the
+substantive laws of California and United States.  Judgment
+upon the award rendered by the arbitrator may be entered in
+any court having jurisdiction to enforce such award.
+
+b) All arbitration proceedings shall be conducted in English
+ by a single arbitrator selected in accordance with the
+ Rules, who must be fluent in English and be either a
+ retired judge or practicing attorney having at least ten
+ (10) years litigation experience and be reasonably familiar
+ with the technology matters relative to the dispute.
+ Unless otherwise agreed, arbitration venue shall be in
+ London, Tokyo, or San Francisco, whichever is closest to
+ defendant's principal business office.  The arbitrator may
+ award monetary damages only and nothing shall preclude
+ either party from seeking provisional or emergency relief
+ from a court of competent jurisdiction.  The arbitrator
+ shall have no authority to award damages in excess of those
+ permitted in this License and any such award in excess is
+ void.  All awards will be payable in U.S.  dollars and may
+ include, for the prevailing party (i) pre-judgment award
+ interest, (ii) reasonable attorneys' fees incurred in
+ connection with the arbitration, and (iii) reasonable costs
+ and expenses incurred in enforcing the award.  The
+ arbitrator will order each party to produce identified
+ documents and respond to no more than twenty-five single
+ question interrogatories.
+
+8.7 Construction.  Any law or regulation which provides that
+the language of a contract shall be construed against the
+drafter shall not apply to this License.
+
+8.8 U.S.  Government End Users.  The Covered Code is a
+"commercial item," as that term is defined in 48 C.F.R.
+2.101 (Oct.  1995), consisting of "commercial computer
+software" and "commercial computer software documentation,"
+as such terms are used in 48 C.F.R.  12.212 (Sept.  1995).
+Consistent with 48 C.F.R.  12.212 and 48 C.F.R.  227.7202-1
+through 227.7202-4 (June 1995), all U.S.  Government End
+Users acquire Covered Code with only those rights set forth
+herein.  You agree to pass this notice to Your licensees.
+
+8.9 Press Announcements.  All press announcements relative
+to the execution of this License must be reviewed and
+approved by Original Contributor and You prior to release.
+
+8.10 International Use.
+
+a) Export/Import laws.  Covered Code is subject to U.S.
+export control laws and may be subject to export or import
+regulations in other countries.  Each party agrees to comply
+strictly with all such laws and regulations and acknowledges
+their responsibility to obtain such licenses to export,
+re-export, or import as may be required.  You agree to pass
+these obligations to Your licensees.
+
+b) Intellectual Property Protection.  Due to limited
+intellectual property protection and enforcement in certain
+countries, You agree not to redistribute the Original Code,
+Upgraded Code, TCK and Specifications to any country other
 than the list of restricted countries on the SCSL Webpage.
- 
-8.11	Language. This License is in the English language only, which language 
-shall be controlling in all respects, and all versions of this License in any 
-other language shall be for accommodation only and shall not be binding on the 
-parties to this License. All communications and notices made or given pursuant 
-to this License, and all documentation and support to be provided, unless 
-otherwise noted, shall be in the English language.
-
-PLEASE READ THE TERMS OF THIS LICENSE CAREFULLY. BY CLICKING ON THE "ACCEPT" 
-BUTTON BELOW YOU ARE ACCEPTING AND AGREEING TO THE TERMS AND CONDITIONS OF THIS 
-LICENSE WITH SUN MICROSYSTEMS, INC. IF YOU ARE AGREEING TO THIS LICENSE ON 
-BEHALF OF A COMPANY, YOU REPRESENT THAT YOU ARE AUTHORIZED TO BIND THE COMPANY 
-TO SUCH A LICENSE. WHETHER YOU ARE ACTING ON YOUR OWN BEHALF, OR REPRESENTING A 
-COMPANY, YOU MUST BE OF MAJORITY AGE AND BE OTHERWISE COMPETENT TO ENTER INTO 
-CONTRACTS. IF YOU DO NOT MEET THIS CRITERIA OR YOU DO NOT AGREE TO ANY OF THE 
-TERMS AND CONDITIONS OF THIS LICENSE, CLICK ON THE REJECT BUTTON TO EXIT.
- 
-ACCEPT              REJECT
+
+8.11 Language.  This License is in the English language
+only, which language shall be controlling in all respects,
+and all versions of this License in any other language shall
+be for accommodation only and shall not be binding on the
+parties to this License.  All communications and notices
+made or given pursuant to this License, and all
+documentation and support to be provided, unless otherwise
+noted, shall be in the English language.
+
+PLEASE READ THE TERMS OF THIS LICENSE CAREFULLY.  BY
+CLICKING ON THE "ACCEPT" BUTTON BELOW YOU ARE ACCEPTING AND
+AGREEING TO THE TERMS AND CONDITIONS OF THIS LICENSE WITH
+SUN MICROSYSTEMS, INC.  IF YOU ARE AGREEING TO THIS LICENSE
+ON BEHALF OF A COMPANY, YOU REPRESENT THAT YOU ARE
+AUTHORIZED TO BIND THE COMPANY TO SUCH A LICENSE.  WHETHER
+YOU ARE ACTING ON YOUR OWN BEHALF, OR REPRESENTING A
+COMPANY, YOU MUST BE OF MAJORITY AGE AND BE OTHERWISE
+COMPETENT TO ENTER INTO CONTRACTS.  IF YOU DO NOT MEET THIS
+CRITERIA OR YOU DO NOT AGREE TO ANY OF THE TERMS AND
+CONDITIONS OF THIS LICENSE, CLICK ON THE REJECT BUTTON TO
+EXIT.
+
+ACCEPT REJECT
 
 GLOSSARY
 
-1.	 "Commercial Use" means any use (excluding Internal Deployment Use) or 
-distribution, directly or indirectly of Compliant Covered Code by You to any 
-third party, alone or bundled with any other software or hardware, for direct or 
-indirect commercial or strategic gain or advantage, subject to execution of 
-Attachment D by You and Original Contributor. 
-
-2.	"Community Code" means the Original Code, Upgraded Code, Error 
-Corrections, Shared Modifications, or any combination thereof.
-
-3.	"Community Webserver(s)" means the webservers designated by Original 
-Contributor for posting Error Corrections and Shared Modifications.
- 
-4.	"Compliant Covered Code" means Covered Code that complies with the 
-requirements of the TCK.
- 
-5.	"Contributor" means each Licensee that creates or contributes to the 
-creation of any Error Correction or Shared Modification.
-
-6.	"Covered Code" means the Original Code, Upgraded Code, Modifications, or 
-any combination thereof.
-
-7.	"Error Correction" means any change made to Community Code which 
-conforms to the Specification and corrects the adverse effect of a failure of 
-Community Code to perform any function set forth in or required by the 
-Specifications.
+1.  "Commercial Use" means any use (excluding Internal
+Deployment Use) or distribution, directly or indirectly of
+Compliant Covered Code by You to any third party, alone or
+bundled with any other software or hardware, for direct or
+indirect commercial or strategic gain or advantage, subject
+to execution of Attachment D by You and Original
+Contributor.
+
+2.  "Community Code" means the Original Code, Upgraded Code,
+Error Corrections, Shared Modifications, or any combination
+thereof.
+
+3.  "Community Webserver(s)" means the webservers designated
+by Original Contributor for posting Error Corrections and
+Shared Modifications.
+
+4.  "Compliant Covered Code" means Covered Code that
+complies with the requirements of the TCK.
+
+5.  "Contributor" means each Licensee that creates or
+contributes to the creation of any Error Correction or
+Shared Modification.
+
+6.  "Covered Code" means the Original Code, Upgraded Code,
+Modifications, or any combination thereof.
+
+7.  "Error Correction" means any change made to Community
+Code which conforms to the Specification and corrects the
+adverse effect of a failure of Community Code to perform any
+function set forth in or required by the Specifications.
+
+7.  "Executable" means Covered Code that has been converted
+to a form other than Source Code.
+
+9.  "Extension(s)" means any additional classes or other
+programming code and/or interfaces developed by or for You
+which:  (i) are designed for use with the Technology; (ii)
+constitute an API for a library of computing functions or
+services; and (iii) are disclosed to third party software
+developers for the purpose of developing software which
+invokes such additional classes or other programming code
+and/or interfaces.  The foregoing shall not apply to
+software development by Your subcontractors to be
+exclusively used by You.
+
+10.  "Intellectual Property Rights" means worldwide
+statutory and common law rights associated solely with (i)
+patents and patent applications; (ii) works of authorship
+including copyrights, copyright applications, copyright
+registrations and "moral rights"; (iii) the protection of
+trade and industrial secrets and confidential information;
+and (iv) divisions, continuations, renewals, and
+re-issuances of the foregoing now existing or acquired in
+the future.
+
+11.  "Internal Deployment Use" means use of Compliant
+Covered Code (excluding Research Use) within Your business
+or organization only by Your employees and/or agents,
+subject to execution of Attachment C by You and Original
+Contributor, if required.
+
+12.  "Licensee" means any party that has entered into and
+has in effect a version of this License with Original
+Contributor.
+
+13.  "Modification(s)" means (i) any change to Covered Code;
+(ii) any new file or other representation of computer
+program statements that contains any portion of Covered
+Code; and/or (iii) any new Source Code implementing any
+portion of the Specifications.
+
+14.  "Original Code" means the initial Source Code for the
+Technology as described on the Technology Download Site.
+
+15.  "Original Contributor" means Sun Microsystems, Inc.,
+its affiliates and its successors and assigns.
+
+16.  "Reformatted Specifications" means any revision to the
+Specifications which translates or reformats the
+Specifications (as for example in connection with Your
+documentation) but which does not alter, subset or superset
+the functional or operational aspects of the Specifications.
+
+17.  "Research Use" means use and distribution of Covered
+Code only for Your research, development, educational or
+personal and individual use, and expressly excludes Internal
+Deployment Use and Commercial Use.
+
+18.  "SCSL Webpage" means the Sun Community Source license
+webpage located at http://sun.com/software/communitysource,
+or such other url that Sun may designate from time to time.
+
+19.  "Shared Modifications" means Modifications provided by
+You, at Your option, pursuant to Section 2.2, or received by
+You from a Contributor pursuant to Section 2.3.
+
+20.  "Source Code" means computer program statements written
+in any high-level, readable form suitable for modification
+and development.
+
+21.  "Specifications" means the specifications for the
+Technology and other documentation, as designated on the
+Technology Download Site, as may be revised by Original
+Contributor from time to time.
+
+22.  "Sun Trademarks" means Original Contributor's SUN,
+JAVA, and JINI trademarks and logos, whether now used or
+adopted in the future.  
+
+23.  "Technology" means the 
+technology described in Attachment B, and Upgrades.
+
+24.  "Technology Compatibility Kit" or "TCK" means the test
+programs, procedures and/or other requirements, designated
+by Original Contributor for use in verifying compliance of
+Covered Code with the Specifications, in conjunction with
+the Original Code and Upgraded Code.  Original Contributor
+may, in its sole discretion and from time to time, revise a
+TCK to correct errors and/or omissions and in connection
+with Upgrades.
+
+25.  "Technology Download Site" means the site(s) designated
+by Original Contributor for access to the Original Code,
+Upgraded Code, TCK and Specifications.
+
+26.  "Upgrade(s)" means new versions of Technology
+designated exclusively by Original Contributor as an
+"Upgrade" and released by Original Contributor from time to
+time.
+
+27.  "Upgraded Code" means the Source Code for Upgrades,
+possibly including Modifications made by Contributors.
+
+28.  "You(r)" means an individual, or a legal entity acting
+by and through an individual or individuals, exercising
+rights either under this License or under a future version
+of this License issued pursuant to Section 4.1.  For legal
+entities, "You(r)" includes any entity that by majority
+voting interest controls, is controlled by, or is under
+common control with You.
 
-7.	"Executable" means Covered Code that has been converted to a form other 
-than Source Code.
-
-9.	"Extension(s)" means any additional classes or other programming code 
-and/or interfaces developed by or for You which: (i) are designed for use with 
-the Technology; (ii) constitute an API for a library of computing functions or 
-services; and (iii) are disclosed to third party software developers for the 
-purpose of developing software which invokes such additional classes or other 
-programming code and/or interfaces. The foregoing shall not apply to software 
-development by Your subcontractors to be exclusively used by You. 
-
-10.	"Intellectual Property Rights" means worldwide statutory and common law 
-rights associated solely with (i) patents and patent applications; (ii) works of 
-authorship including copyrights, copyright applications, copyright registrations 
-and "moral rights"; (iii) the protection of trade and industrial secrets and 
-confidential information; and (iv) divisions, continuations, renewals, and re- 
-issuances of the foregoing now existing or acquired in the future.
-
-11.	"Internal Deployment Use" means use of Compliant Covered Code (excluding 
-Research Use) within Your business or organization only by Your employees and/or 
-agents, subject to execution of Attachment C by You and Original Contributor, if 
-required. 
-
-12.	"Licensee" means any party that has entered into and has in effect a 
-version of this License with Original Contributor.
-
-13.	"Modification(s)" means (i) any change to Covered Code; (ii) any new 
-file or other representation of computer program statements that contains any 
-portion of Covered Code; and/or (iii) any new Source Code implementing any 
-portion of the Specifications. 
- 
-14.	"Original Code" means the initial Source Code for the Technology as 
-described on the Technology Download Site.
-
-15.	"Original Contributor" means Sun Microsystems, Inc., its affiliates and 
-its successors and assigns.
- 
-16.	"Reformatted Specifications" means any revision to the Specifications 
-which translates or reformats the Specifications (as for example in connection 
-with Your documentation) but which does not alter, subset or superset the 
-functional or operational aspects of the Specifications.
- 
-17.	"Research Use" means use and distribution of Covered Code only for Your 
-research, development, educational or personal and individual use, and expressly 
-excludes Internal Deployment Use and Commercial Use.
- 
-18.	"SCSL Webpage" means the Sun Community Source license webpage located at 
-http://sun.com/software/communitysource, or such other url that Sun may 
-designate from time to time.
- 
-19.	"Shared Modifications" means Modifications provided by You, at Your 
-option, pursuant to Section 2.2, or received by You from a Contributor pursuant 
-to Section 2.3.
- 
-20.	"Source Code" means computer program statements written in any 
-high-level, readable form suitable for modification and development.
- 
-21.	"Specifications" means the specifications for the Technology and other 
-documentation, as designated on the Technology Download Site, as may be revised 
-by Original Contributor from time to time.
- 
-22.	"Sun Trademarks" means Original Contributor's SUN, JAVA, and JINI 
-trademarks and logos, whether now used or adopted in the future.
-
-23.	"Technology" means the technology described in Attachment B, and 
-Upgrades.
- 
-24.	"Technology Compatibility Kit" or "TCK" means the test programs, 
-procedures and/or other requirements, designated by Original Contributor for use 
-in verifying compliance of Covered Code with the Specifications, in conjunction 
-with the Original Code and Upgraded Code. Original Contributor may, in its sole 
-discretion and from time to time, revise a TCK to correct errors and/or 
-omissions and in connection with Upgrades.
- 
-25.	"Technology Download Site" means the site(s) designated by Original 
-Contributor for access to the Original Code, Upgraded Code, TCK and 
-Specifications.
- 
-26.	"Upgrade(s)" means new versions of Technology designated exclusively by 
-Original Contributor as an "Upgrade" and released by Original Contributor from 
-time to time.
- 
-27.	"Upgraded Code" means the Source Code for Upgrades, possibly including 
-Modifications made by Contributors.
- 
-28.	"You(r)" means an individual, or a legal entity acting by and through an 
-individual or individuals, exercising rights either under this License or under 
-a future version of this License issued pursuant to Section 4.1.   For legal 
-entities, "You(r)" includes any entity that by majority voting interest 
-controls, is controlled by, or is under common control with You.
- 
 ATTACHMENT A
- 
+
 REQUIRED NOTICES
- 
- 
+
 ATTACHMENT A-1
- 
-REQUIRED IN ALL CASES
- 
-"The contents of this file, or the files included with this file, are subject to 
-the current version of Sun Community Source License for [fill in name of 
-applicable Technology] (the "License"); You may not use this file except in 
-compliance with the License. You may obtain a copy of the License at 
-http://sun.com/software/communitysource. See the License for the rights, 
-obligations and limitations governing use of the contents of the file. 
- 
- 
-The Original and Upgraded Code is [fill in name and version of applicable 
-Technology]. The developer of the Original and Upgraded Code is Sun 
-Microsystems, Inc. Sun Microsystems, Inc. owns the copyrights in the portions it 
-created. All Rights Reserved.
 
+REQUIRED IN ALL CASES
 
- Contributor(s): _______________________________________________
+"The contents of this file, or the files included with this
+file, are subject to the current version of Sun Community
+Source License for [fill in name of applicable Technology]
+(the "License"); You may not use this file except in
+compliance with the License.  You may obtain a copy of the
+License at http://sun.com/software/communitysource.  See the
+License for the rights, obligations and limitations
+governing use of the contents of the file.
 
-Associated Test Suite(s) Location: ________________________________"
+The Original and Upgraded Code is [fill in name and version
+of applicable Technology].  The developer of the Original
+and Upgraded Code is Sun Microsystems, Inc.  Sun
+Microsystems, Inc.  owns the copyrights in the portions it
+created.  All Rights Reserved.
 
+Contributor(s):
+_______________________________________________
 
+Associated Test Suite(s) Location:
+________________________________
 
 ATTACHMENT A-2
- 
-SAMPLE LICENSEE CERTIFICATION 
- 
-"By clicking the 'Agree' button below, You certify that You are a Licensee in 
-good standing under the Sun Community Source License, [fill in applicable 
-Technology and Version] ("License") and that Your access, use and distribution 
-of code and information You may obtain at this site is subject to the License."”
 
+SAMPLE LICENSEE CERTIFICATION
 
+"By clicking the `Agree' button below, You certify that You
+are a Licensee in good standing under the Sun Community
+Source License, [fill in applicable Technology and Version]
+("License") and that Your access, use and distribution of
+code and information You may obtain at this site is subject
+to the License."
 
 ATTACHMENT A-3
- 
+
 REQUIRED STUDENT NOTIFICATION
- 
-"This software and related documentation has been obtained by your educational 
-institution subject to the Sun Community Source License, [fill in applicable 
-Technology]. You have been provided access to the software and related 
-documentation for use only in connection with your course work and research 
-activities as a matriculated student of your educational institution. Any other 
-use is expressly prohibited. 
- 
-THIS SOFTWARE AND RELATED DOCUMENTATION CONTAINS PROPRIETARY MATERIAL OF SUN 
-MICROSYSTEMS, INC, WHICH ARE PROTECTED BY VARIOUS INTELLECTUAL PROPERTY RIGHTS.
- 
-You may not use this file except in compliance with the License. You may obtain 
-a copy of the License on the web at http://sun.com/software/communitysource."”
 
+"This software and related documentation has been obtained
+by your educational institution subject to the Sun Community
+Source License, [fill in applicable Technology].  You have
+been provided access to the software and related
+documentation for use only in connection with your course
+work and research activities as a matriculated student of
+your educational institution.  Any other use is expressly
+prohibited.
 
+THIS SOFTWARE AND RELATED DOCUMENTATION CONTAINS PROPRIETARY
+MATERIAL OF SUN MICROSYSTEMS, INC, WHICH ARE PROTECTED BY
+VARIOUS INTELLECTUAL PROPERTY RIGHTS.
+
+You may not use this file except in compliance with the
+License.  You may obtain a copy of the License on the web at
+http://sun.com/software/communitysource."
 
 ATTACHMENT B
 
@@ -589,378 +707,446 @@ Java(tm) 2 SDK Technology
 
 Description of "Technology"
 
-Java(tm) 2 SDK Technology v.1.3.1 as described on the Technology Download Site.
-
-
+Java(tm) 2 SDK Technology v.1.4.1 as described on the
+Technology Download Site.
 
 ATTACHMENT C
 
 INTERNAL DEPLOYMENT USE
 
-This Attachment C is only effective for the Technology specified in Attachment 
-B, upon execution of Attachment D (Commercial Use License) including the 
-requirement to pay royalties. In the event of a conflict between the terms of 
-this Attachment C and Attachment D, the terms of Attachment D shall govern.
-
-1.	Internal Deployment License Grant. Subject to Your compliance with 
-Section 2 below, and Section 8.10 of the Research Use license; in addition to 
-the Research Use license and the TCK license, Original Contributor grants to You 
-a worldwide, non-exclusive license, to the extent of Original Contributor's 
-Intellectual Property Rights covering the Original Code, Upgraded Code and 
+This Attachment C is only effective for the Technology
+specified in Attachment B, upon execution of Attachment D
+(Commercial Use License) including the requirement to pay
+royalties.  In the event of a conflict between the terms of
+this Attachment C and Attachment D, the terms of Attachment
+D shall govern.
+
+1.  Internal Deployment License Grant.  Subject to Your
+compliance with Section 2 below, and Section 8.10 of the
+Research Use license; in addition to the Research Use
+license and the TCK license, Original Contributor grants to
+You a worldwide, non-exclusive license, to the extent of
+Original Contributor's Intellectual Property Rights covering
+the Original Code, Upgraded Code and Specifications, to do
+the following:
+
+a) reproduce and distribute internally, Original Code and
+Upgraded Code as part of Compliant Covered Code, and
+Specifications, for Internal Deployment Use,
+
+b) compile such Original Code and Upgraded Code, as part of
+Compliant Covered Code, and reproduce and distribute
+internally the same in Executable form for Internal
+Deployment Use, and
+
+c) reproduce and distribute internally, Reformatted
+Specifications for use in connection with Internal
+Deployment Use.
+
+2.  Additional Requirements and Responsibilities.  In
+addition to the requirements and responsibilities described
+under Section 3.1 of the Research Use license, and as a
+condition to exercising the rights granted under Section 3
+above, You agree to the following additional requirements
+and responsibilities:
+
+2.1 Compatibility.  All Covered Code must be Compliant
+Covered Code prior to any Internal Deployment Use or
+Commercial Use, whether originating with You or acquired
+from a third party.  Successful compatibility testing must
+be completed in accordance with the TCK License.  If You
+make any further Modifications to any Covered Code
+previously determined to be Compliant Covered Code, you must
+ensure that it continues to be Compliant Covered Code.
+
+ATTACHMENT D COMMERCIAL USE LICENSE
+
+1.  Effect.  This Attachment D is effective only if signed
+below by You and Original Contributor, and applies to Your
+Commercial Use of Original Code and Upgraded Code.
+
+2.  Term.  Upon execution of this Attachment D by You and
+Original Contributor, this Commercial Use license shall have
+an initial term of 3 years and shall automatically renew for
+additional one year terms unless either party provides
+notice to the other no less than 60 days prior to an
+anniversary date.
+
+3.  Commercial Use License Grant.  Subject to Your
+compliance with Section 4 below, Section 8.10 of the
+Research Use license, and the TCK license; in addition to
+the Research Use license, the TCK license, and the Internal
+Deployment Use license, Original Contributor grants to You a
+worldwide, non-exclusive, non-transferable license, to the
+extent of Original Contributor's Intellectual Property
+Rights covering the Original Code, Upgraded Code and
 Specifications, to do the following:
 
-a)	reproduce and distribute internally, Original Code and Upgraded Code as 
-part of Compliant Covered Code, and Specifications, for Internal Deployment Use,
- 
-b)	compile such Original Code and Upgraded Code, as part of Compliant 
-Covered Code, and reproduce and distribute internally the same in Executable 
-form for Internal Deployment Use, and
-
-c)	reproduce and distribute internally, Reformatted Specifications for use 
-in connection with Internal Deployment Use.
- 
- 2.	Additional Requirements and Responsibilities. In addition to the 
-requirements and responsibilities described under Section 3.1 of the Research 
-Use license, and as a condition to exercising the rights granted under Section 3 
-above, You agree to the following additional requirements and responsibilities:
- 
-2.1	Compatibility. All Covered Code must be Compliant Covered Code prior to 
-any Internal Deployment Use or Commercial Use, whether originating with You or 
-acquired from a third party. Successful compatibility testing must be completed 
-in accordance with the TCK License. If You make any further Modifications to any 
-Covered Code previously determined to be Compliant Covered Code, You must ensure 
-that it continues to be Compliant Covered Code.
-
-
-
-ATTACHMENT D
-COMMERCIAL USE LICENSE
- 
-1.	Effect. This Attachment D is effective only if signed below by You and 
-Original Contributor, and applies to Your Commercial Use of Original Code and 
-Upgraded Code.
- 
-2.	Term. Upon execution of this Attachment D by You and Original 
-Contributor, this Commercial Use license shall have an initial term of 3 years 
-and shall automatically renew for additional one year terms unless either party 
-provides notice to the other no less than 60 days prior to an anniversary date.
- 
-3.	Commercial Use License Grant. Subject to Your compliance with Section 4 
-below, Section 8.10 of the Research Use license, and the TCK license; in 
-addition to the Research Use license, the TCK license, and the Internal 
-Deployment Use license, Original Contributor grants to You a worldwide, 
-non-exclusive, non-transferable license, to the extent of Original Contributor's 
-Intellectual Property Rights covering the Original Code, Upgraded Code and 
-Specifications, to do the following:
-
-a)	reproduce and distribute Compliant Covered Code;
-
-b)	compile Compliant Covered Code and reproduce and distribute the same in 
-Executable form through multiple tiers of distribution; and
-
-c)	reproduce and distribute Reformatted Specifications in association with 
-Compliant Covered Code.				
-
-4.	Additional Requirements and Responsibilities. In addition to the 
-requirements and responsibilities specified in the Research Use license, the TCK 
-license and the Internal Deployment license, and as a condition to exercising 
-the rights granted in Section 3 above, You agree to the following additional 
-requirements and responsibilities:
-
-a)	Distribution of Source Code. Source Code of Compliant Covered Code may 
-be distributed     only to another Licensee of the same Technology.
-
-b)	Distribution of Executable Code. You may distribute the Executable 
-version(s) of Compliant Covered Code under a license of Your choice, which may 
-contain terms different from this License, provided (i) that You are in 
-compliance with the terms of this License, and (ii) You must make it absolutely 
-clear that any terms which differ from this License are offered by You alone, 
-not by Original Contributor or any other Contributor. 
-
-c)	Branding. Products integrating Compliant Covered Code used for 
-Commercial Use must be branded with the Technology compliance logo under a 
-separate trademark license required to be executed by You and Original 
-Contributor concurrent with execution of this Attachment D.
- 
-5.	Indemnity/Limitation of Liability. The provisions of Section 7.1 of the 
-Research Use license are superseded by the following:
-
-a)	Your Indemnity Obligation. You hereby agree to defend, at Your expense, 
-any legal proceeding brought against Original Contributor or any Licensee to the 
-extent it is based on a claim: (i) that the use, reproduction or distribution of 
-any of Your Error Corrections or Shared Modifications is an infringement of a 
-third party trade secret or a copyright in a country that is a signatory to the 
-Berne Convention; (ii) arising in connection with any representation, warranty, 
-support, indemnity, liability or other license terms You may offer in connection 
-with any Covered Code; or (iii) arising from Your Commercial Use of Covered 
-Code, other than a claim covered by Section 5.b) below, or a patent claim based 
-solely on Covered Code not provided by You. You will pay all damages costs and 
-fees awarded by a court of competent jurisdiction, or such settlement amount 
-negotiated by You, attributable to such claim.
-
-b)	Original Contributor's Indemnity Obligation. Original Contributor will 
-defend, at its expense, any legal proceeding brought against You, to the extent 
-it is based on a claim that Your authorized Commercial Use of Original Code and 
-Upgraded Code is an infringement of a third party trade secret or a copyright in 
-a country that is a signatory to the Berne Convention, and will pay all damages 
-costs and fees awarded by a court of competent jurisdiction, or such settlement 
-amount negotiated by Original Contributor, attributable to such claim. The 
-foregoing shall not apply to any claims of intellectual property infringement 
-based upon the combination of code or documentation supplied by Original 
-Contributor with code, technology or documentation from other sources.
-
-c)	Right of Intervention. Original Contributor will have the right, but not 
-the obligation, to defend You, at Original Contributor's expense, in connection 
-with a claim that Your Commercial Use of Original Code and Upgraded Code is an 
-infringement of a third party patent and will, if Original Contributor chooses 
-to defend You, pay all damages costs and fees awarded by a court of competent 
-jurisdiction, or such settlement amount negotiated by Original Contributor, 
-attributable to such claim.
-
-d)	Prerequisites. Under Sections 5.b) and c) above, You must, and under 
-Section 5.a) above, Original Contributor or any Licensee must: (i) provide 
-notice of the claim promptly to the party providing an indemnity; (ii) give the 
-indemnifying party sole control of the defense and settlement of the claim; 
-(iii) provide the indemnifying party, at indemnifying party's expense, all 
-available information, assistance and authority to defend; and (iv) not have 
-compromised or settled such claim or proceeding without the indemnifying party's 
-prior written consent. 
-
-e)	Additional Remedies. Should any Original Code, Upgraded Code, TCK, 
-Specifications, or Modifications become, or in the indemnifying party's opinion 
-be likely to become, the subject of a claim of infringement for which indemnity 
-is provided above, the indemnifying party may, at its sole option, attempt to 
-procure on reasonable terms the rights necessary for the indemnified party to 
-exercise its license rights under this License with respect to the infringing 
-items, or to modify the infringing items so that they are no longer infringing 
-without substantially impairing their function or performance. If the 
-indemnifying party is unable to do the foregoing after reasonable efforts, then 
-the indemnifying party may send a notice of such inability to the indemnified 
-party together with a refund of any license fees received by the indemnifying 
-party from the indemnified party for the infringing items applicable to the 
-indemnified party's future use or distribution of such infringing items, in 
-which case the indemnifying party will not be liable for any damages resulting 
-from infringing activity with respect to the infringing items occurring after 
-such notice and refund.
-
-6.	Support Programs.
-
-Support to You. Technical support is not provided to You by Original Contributor 
-under this License. You may contract for one or more support programs from 
-Original Contributor relating to the Technology which are described on the SCSL 
+a) reproduce and distribute Compliant Covered Code;
+
+b) compile Compliant Covered Code and reproduce and
+distribute the same in Executable form through multiple
+tiers of distribution; and
+
+c) reproduce and distribute Reformatted Specifications in
+association with Compliant Covered Code.
+
+4.  Additional Requirements and Responsibilities.  In
+addition to the requirements and responsibilities specified
+in the Research Use license, the TCK license and the
+Internal Deployment license, and as a condition to
+exercising the rights granted in Section 3 above, You agree
+to the following additional requirements and
+responsibilities:
+
+a) Distribution of Source Code.  Source Code of Compliant
+Covered Code may be distributed only to another Licensee of
+the same Technology.
+
+b) Distribution of Executable Code.  You may distribute the
+Executable version(s) of Compliant Covered Code under a
+license of Your choice, which may contain terms different
+from this License, provided (i) that You are in compliance
+with the terms of this License, and (ii) You must make it
+absolutely clear that any terms which differ from this
+License are offered by You alone, not by Original
+Contributor or any other Contributor.
+
+c) Branding.  Products integrating Compliant Covered Code
+used for Commercial Use must be branded with the Technology
+compliance logo under a separate trademark license required
+to be executed by You and Original Contributor concurrent
+with execution of this Attachment D.
+
+5.  Indemnity/Limitation of Liability.  The provisions of
+Section 7.1 of the Research Use license are superseded by
+the following:
+
+a) Your Indemnity Obligation.  You hereby agree to defend,
+at Your expense, any legal proceeding brought against
+Original Contributor or any Licensee to the extent it is
+based on a claim:  (i) that the use, reproduction or
+distribution of any of Your Error Corrections or Shared
+Modifications is an infringement of a third party trade
+secret or a copyright in a country that is a signatory to
+the Berne Convention; (ii) arising in connection with any
+representation, warranty, support, indemnity, liability or
+other license terms You may offer in connection with any
+Covered Code; or (iii) arising from Your Commercial Use of
+Covered Code, other than a claim covered by Section 5.b)
+below, or a patent claim based solely on Covered Code not
+provided by You.  You will pay all damages costs and fees
+awarded by a court of competent jurisdiction, or such
+settlement amount negotiated by You, attributable to such
+claim.
+
+b) Original Contributor's Indemnity Obligation.  Original
+Contributor will defend, at its expense, any legal
+proceeding brought against You, to the extent it is based on
+a claim that Your authorized Commercial Use of Original Code
+and Upgraded Code is an infringement of a third party trade
+secret or a copyright in a country that is a signatory to
+the Berne Convention, and will pay all damages costs and
+fees awarded by a court of competent jurisdiction, or such
+settlement amount negotiated by Original Contributor,
+attributable to such claim.  The foregoing shall not apply
+to any claims of intellectual property infringement based
+upon the combination of code or documentation supplied by
+Original Contributor with code, technology or documentation
+from other sources.
+
+c) Right of Intervention.  Original Contributor will have
+the right, but not the obligation, to defend You, at
+Original Contributor's expense, in connection with a claim
+that Your Commercial Use of Original Code and Upgraded Code
+is an infringement of a third party patent and will, if
+Original Contributor chooses to defend You, pay all damages
+costs and fees awarded by a court of competent jurisdiction,
+or such settlement amount negotiated by Original
+Contributor, attributable to such claim.
+
+d) Prerequisites.  Under Sections 5.b) and c) above, You
+must, and under Section 5.a) above, Original Contributor or
+any Licensee must:  (i) provide notice of the claim promptly
+to the party providing an indemnity; (ii) give the
+indemnifying party sole control of the defense and
+settlement of the claim; (iii) provide the indemnifying
+party, at indemnifying party's expense, all available
+information, assistance and authority to defend; and (iv)
+not have compromised or settled such claim or proceeding
+without the indemnifying party's prior written consent.
+
+e) Additional Remedies.  Should any Original Code, Upgraded
+Code, TCK, Specifications, or Modifications become, or in
+the indemnifying party's opinion be likely to become, the
+subject of a claim of infringement for which indemnity is
+provided above, the indemnifying party may, at its sole
+option, attempt to procure on reasonable terms the rights
+necessary for the indemnified party to exercise its license
+rights under this License with respect to the infringing
+items, or to modify the infringing items so that they are no
+longer infringing without substantially impairing their
+function or performance.  If the indemnifying party is
+unable to do the foregoing after reasonable efforts, then
+the indemnifying party may send a notice of such inability
+to the indemnified party together with a refund of any
+license fees received by the indemnifying party from the
+indemnified party for the infringing items applicable to the
+indemnified party's future use or distribution of such
+infringing items, in which case the indemnifying party will
+not be liable for any damages resulting from infringing
+activity with respect to the infringing items occurring
+after such notice and refund.
+
+6.  Support Programs.
+
+Support to You.  Technical support is not provided to You by
+Original Contributor under this License.  You may contract
+for one or more support programs from Original Contributor
+relating to the Technology which are described on the SCSL
 Webpage.
 
-Customer Support. You are responsible for providing technical and maintenance 
-support services to Your customers for Your products and services incorporating 
-the Compliant Covered code. 
- 
-7.	Royalties and Payments.
+Customer Support.  You are responsible for providing
+technical and maintenance support services to Your customers
+for Your products and services incorporating the Compliant
+Covered code.
+
+7.  Royalties and Payments.
 
 Technology specified in Attachment B.
- 
-
-Field of Use:____________________			
-
-Royalty per Unit $_______________
-
-
-b)	Royalty Payments. Payment of royalties shall be made quarterly, shall be 
-due thirty (30) days following the end of the calendar quarter to which they 
-relate and shall be submitted with a written statement documenting the basis for 
-the royalty calculation. 
-
-c)	Taxes. All payments required by this License shall be made in United 
-States dollars, are exclusive of taxes, and Licensee agrees to bear and be 
-responsible for the payment of all such taxes, including, but not limited to, 
-all sales, use, rental receipt, personal property or other taxes and their 
-equivalents which may be levied or assessed in connection with this License 
-(excluding only taxes based on Original Contributor's net income). To the extent 
-Licensee is required to withhold taxes based upon Original Contributor's income 
-in any country, You agree to provide Original Contributor with written evidence 
-of such withholding, suitable for Original Contributor to obtain a tax credit in 
-the United States.
-
-d)	Records. You agree to maintain account books and records consistent with 
-Generally Accepted Accounting Principles appropriate to Your domicile, as may be 
-in effect from time to time, sufficient to allow the correctness of the 
-royalties required to be paid pursuant to this License to be determined.				
-
-e)	Audit Rights. Original Contributor shall have the right to audit such 
-accounts upon reasonable prior notice using an independent auditor of Original 
-Contributor's choice (the "Auditor"). The Auditor shall be bound to keep 
-confidential the details of Your business affairs and to limit disclosure of the 
-results of any audit to the sufficiency of the accounts and the amount, if any, 
-of a payment adjustment that should be made. Such audits shall not occur more 
-than once each year (unless discrepancies are discovered in excess of the five 
-percent (5%) threshold set forth in Section 7.f) below, in which case two 
-consecutive quarters per year may be audited). Except as set forth in Section 
-7.f) below, Original Contributor shall bear all costs and expenses associated 
-with the exercise of its rights to audit.
- 
-f)	Payment Errors. In the event that any errors in payments shall be 
-determined, such errors shall be corrected by appropriate adjustment in payment 
-for the quarterly period during which the error is discovered. In the event of 
-an underpayment of more than five percent (5%) of the proper amount owed, upon 
-such underpayment being properly determined by the Auditor, You agree to 
-reimburse Original Contributor the amount of the underpayment and all reasonable 
-costs and expenses associated with the exercise of its rights to audit, and 
-interest on the overdue amount at the maximum allowable interest rate from the 
-date of accrual of such obligation. 
-
-8.	Notice of Breach or Infringement. Each party shall notify the other 
-immediately in writing when it becomes aware of any breach or violation of the 
-terms of this License, or when You become aware of any potential or actual 
-infringement by a third party of the Technology or Sun's Intellectual Property 
-Rights therein. 
- 
-9.	Proprietary Rights Notices. You may not remove any copyright notices, 
-trademark notices or other proprietary legends of Original Contributor or its 
-suppliers contained on or in the Original Code, Upgraded Code and 
+
+Field of Use:____________________
+
+Royalty per Unit $_____________
+
+b) Royalty Payments.  Payment of royalties shall be made
+quarterly, shall be due thirty (30) days following the end
+of the calendar quarter to which they relate and shall be
+submitted with a written statement documenting the basis for
+the royalty calculation.
+
+c) Taxes.  All payments required by this License shall be
+made in United States dollars, are exclusive of taxes, and
+Licensee agrees to bear and be responsible for the payment
+of all such taxes, including, but not limited to, all sales,
+use, rental receipt, personal property or other taxes and
+their equivalents which may be levied or assessed in
+connection with this License (excluding only taxes based on
+Original Contributor's net income).  To the extent Licensee
+is required to withhold taxes based upon Original
+Contributor's income in any country, You agree to provide
+Original Contributor with written evidence of such
+withholding, suitable for Original Contributor to obtain a
+tax credit in the United States.
+
+d) Records.  You agree to maintain account books and records
+consistent with Generally Accepted Accounting Principles
+appropriate to Your domicile, as may be in effect from time
+to time, sufficient to allow the correctness of the
+royalties required to be paid pursuant to this License to be
+determined.
+
+e) Audit Rights.  Original Contributor shall have the right
+to audit such accounts upon reasonable prior notice using an
+independent auditor of Original Contributor's choice (the
+"Auditor").  The Auditor shall be bound to keep confidential
+the details of Your business affairs and to limit disclosure
+of the results of any audit to the sufficiency of the
+accounts and the amount, if any, of a payment adjustment
+that should be made.  Such audits shall not occur more than
+once each year (unless discrepancies are discovered in
+excess of the five percent (5%) threshold set forth in
+Section 7.f) below, in which case two consecutive quarters
+per year may be audited).  Except as set forth in Section
+7.f) below, Original Contributor shall bear all costs and
+expenses associated with the exercise of its rights to
+audit.
+
+f) Payment Errors.  In the event that any errors in payments
+shall be determined, such errors shall be corrected by
+appropriate adjustment in payment for the quarterly period
+during which the error is discovered.  In the event of an
+underpayment of more than five percent (5%) of the proper
+amount owed, upon such underpayment being properly
+determined by the Auditor, You agree to reimburse Original
+Contributor the amount of the underpayment and all
+reasonable costs and expenses associated with the exercise
+of its rights to audit, and interest on the overdue amount
+at the maximum allowable interest rate from the date of
+accrual of such obligation.
+
+8.  Notice of Breach or Infringement.  Each party shall
+notify the other immediately in writing when it becomes
+aware of any breach or violation of the terms of this
+License, or when You become aware of any potential or actual
+infringement by a third party of the Technology or Sun's
+Intellectual Property Rights therein.
+
+9.  Proprietary Rights Notices.  You may not remove any
+copyright notices, trademark notices or other proprietary
+legends of Original Contributor or its suppliers contained
+on or in the Original Code, Upgraded Code and
 Specifications.
- 
-10.	Notices. All written notices required by this License must be delivered 
-in person or by means evidenced by a delivery receipt and will be effective upon 
-receipt by the persons at the addresses specified below.
-
-
-Original Contributor:				You:
-
-Sun Microsystems, Inc.				_____________________________
- 
-901 San Antonio Road				______________________________
-
-Palo Alto, California 94303			______________________________
- 
-Attn.: VP, Sun Software and 
-Technology Sales				______________________________
- 
-cc: Sun Software and Technology, 
-General Counsel
- 
-11.	Disclaimer of Agency. The relationship created hereby is that of 
-licensor and licensee and the parties hereby acknowledge and agree that nothing 
-herein shall be deemed to constitute You as a franchisee of Original 
-Contributor. You hereby waive the benefit of any state or federal statutes 
-dealing with the establishment and regulation of franchises.												
- 
- Agreed:
-
-You:						Original Contributor:
-
-_____________________________			Sun Microsystems, Inc.
-(Your Name)						 
-
-By:__________________________			By:________________________
-
-Name:________________________			Name:______________________
- 
-Title_________________________			Title:_____________________
- 
-Date:_________________________			Date:______________________
-
-
-
-
-ATTACHMENT E 
-TECHNOLOGY COMPATIBILITY KIT
- 
-The following license is effective for the Java(tm)2 SDK Version 1.3.1 
-Technology Compatibility Kit only upon execution of a separate support agreement 
-between You and Original Contributor (subject to an annual fee) as described on 
-the SCSL Webpage. The Technology Compatibility Kit for the Technology specified 
-in Attachment B may be accessed at the Technology Download Site only upon 
-execution of the support agreement.
- 
-1.	TCK License.
-
-a)	Subject to the restrictions set forth in Section 1.b below and Section 
-8.10 of the Research Use license, in addition to the Research Use license, 
-Original Contributor grants to You a worldwide, non-exclusive, non-transferable 
-license, to the extent of Original Contributor's Intellectual Property Rights in 
-the TCK (without the right to sublicense), to use the TCK to develop and test 
-Covered Code.
- 
-b)	TCK Use Restrictions. You are not authorized to create derivative works 
-of the TCK or use the TCK to test any implementation of the Specification that 
-is not Covered Code. You may not publish Your test results or make claims of 
-comparative compatibility with respect to other implementations of the 
-Specification. In consideration for the license grant in Section 1.a above You 
-agree not to develop Your own tests which are intended to validate conformation 
-with the Specification.
-
-2.	Requirements for Determining Compliance.
- 
-2.1	Definitions.
-
-a)	"Added Value" means code which:
-
-	(i)	has a principal purpose which is substantially different from 
-that of the stand-alone Technology; 
-
-	(ii)	represents a significant functional and value enhancement to the 
-Technology;
-
-	(iii) 	operates in conjunction with the Technology; and
-
-	(iv)	is not marketed as a technology which replaces or substitutes 
-for the Technology.
-
-b)	“"Java Classes" means the specific class libraries associated with each 
-Technology defined in Attachment B.
-
-c)	“"Java Runtime Interpreter" means the program(s) which implement the 
-Java virtual machine for the Technology as defined in the Specification.
-
-d)	“"Platform Dependent Part" means those Original Code and Upgraded Code 
-files of the Technology which are not in a "share" directory or subdirectory 
-thereof.
 
-e)	“"Shared Part" means those Original Code and Upgraded Code files of the 
-Technology which are identified as "shared" (or words of similar meaning) or 
-which are in any "share" directory or subdirectory thereof, except those files 
-specifically designated by Original Contributor as modifiable.
+10.  Notices.  All written notices required by this License
+must be delivered in person or by means evidenced by a
+delivery receipt and will be effective upon receipt by the
+persons at the addresses specified below.
+
+Original Contributor:  		You:
 
-f)	 "User's Guide" means the users guide for the TCK which Sun makes 
-available to You to provide direction in how to run the TCK and properly 
-interpret the results, as may be revised by Sun from time to time.
+Sun Microsystems, Inc.  	_____________________________
 
-2.2	Development Restrictions. Compliant Covered Code:
+4150 Network Circle 		______________________________
 
-a)	must include Added Value;
+Santa Clara, California 95054 	______________________________
 
-b)	must fully comply with the Specifications for the Technology specified 
-in Attachment B;
+Attn.:  VP, Sun Software and 
+Technology Sales		______________________________
+cc:  Legal (Software Sales) 
 
-c)	must include the Shared Part, complete and unmodified;
+11.  Disclaimer of Agency.  The relationship created hereby
+is that of licensor and licensee and the parties hereby
+acknowledge and agree that nothing herein shall be deemed to
+constitute You as a franchisee of Original Contributor.  You
+hereby waive the benefit of any state or federal statutes
+dealing with the establishment and regulation of franchises.
 
-d)	may not modify the functional behavior of the Java Runtime Interpreter 
-or the Java Classes;
+Agreed:
 
-e)	may not modify, subset or superset the interfaces of the Java Runtime 
-Interpreter or the Java Classes;
+You: 				Original Contributor:
 
-f)	may not subset or superset the Java Classes; and
+_____________________________ 	Sun Microsystems, Inc.
+(Your Name) 
 
-g)	may not modify or extend the required public class or public interface 
-declarations whose names begin with "java", "javax", "jini", "net.jini", 
-"sun.hotjava", "COM.sun" or their equivalents in any subsequent naming 
-convention.
+By:_________________________	By:_____________________
 
-2.3	Compatibility Testing. Successful compatibility testing must be 
-completed by You, or at Original Contributor's option, a third party designated 
-by Original Contributor, to conduct such tests, in accordance with the User's 
-Guide, and using the most current version of the applicable TCK available from 
-Original Contributor one hundred twenty (120) days (two hundred forty [240] days 
-in the case of silicon implementations) prior to: (i) Your Internal Deployment 
-Use; and (ii) each release of Compliant Covered Code by You for Commercial Use. 
-In the event that You elect to use a version of Upgraded Code that is newer than 
-that which is required under this Section 2.3, then You agree to pass the 
-version of the TCK that corresponds to such newer version of Upgraded Code.
+Title:_______________________	Title:____________________
 
-2.4	Test Results. You agree to provide to Original Contributor or the third 
-party test facility if applicable, Your test results that demonstrate that 
-Covered Code is Compliant Covered Code and that Original Contributor may publish 
-or otherwise distribute such test results.
+Date:______________________ 	Date:____________________
 
+ATTACHMENT E TECHNOLOGY COMPATIBILITY KIT
+
+The following license is effective for the Java(tm)2 SDK
+Technology Compatibility Kit only upon execution
+of a separate support agreement between You and Original
+Contributor (subject to an annual fee) as described on the
+SCSL Webpage.  The Technology Compatibility Kit for the
+Technology specified in Attachment B may be accessed at the
+Technology Download Site only upon execution of the support
+agreement.
+
+1.  TCK License.
+
+a) Subject to the restrictions set forth in Section 1.b
+below and Section 8.10 of the Research Use license, in
+addition to the Research Use license, Original Contributor
+grants to You a worldwide, non-exclusive, non-transferable
+license, to the extent of Original Contributor's
+Intellectual Property Rights in the TCK (without the right
+to sublicense), to use the TCK to develop and test Covered
+Code.
+
+b) TCK Use Restrictions.  You are not authorized to create
+derivative works of the TCK or use the TCK to test any
+implementation of the Specification that is not Covered
+Code.  You may not publish your test results or make claims
+of comparative compatibility with respect to other
+implementations of the Specification.  In consideration for
+the license grant in Section 1.a above you agree not to
+develop your own tests which are intended to validate
+conformation with the Specification.
+
+2.  Requirements for Determining Compliance.
+
+2.1 Definitions.
+
+a) "Added Value" means code which:
+
+(i) has a principal purpose which is substantially different
+from that of the stand-alone Technology;
+
+(ii) represents a significant functional and value
+enhancement to the Technology;
+
+(iii) operates in conjunction with the Technology; and
+
+(iv) is not marketed as a technology which replaces or
+substitutes for the Technology.
+
+b) "Java Classes" means the specific class libraries
+associated with each Technology defined in Attachment B.
+
+c) "Java Runtime Interpreter" means the program(s) which
+implement the Java virtual machine for the Technology as
+defined in the Specification.
+
+d) "Platform Dependent Part" means those Original Code and
+Upgraded Code files of the Technology which are not in a
+"share" directory or subdirectory thereof.
+
+e) "Shared Part" means those Original Code and Upgraded Code
+files of the Technology which are identified as "shared" (or
+words of similar meaning) or which are in any "share"
+directory or subdirectory thereof, except those files
+specifically designated by Original Contributor as
+modifiable.
+
+f) "User's Guide" means the users guide for the TCK which
+Sun makes available to You to provide direction in how to
+run the TCK and properly interpret the results, as may be
+revised by Sun from time to time.
+
+2.2 Development Restrictions.  Compliant Covered Code:
+
+a) must include Added Value;
+
+b) must fully comply with the Specifications for the
+Technology specified in Attachment B;
+
+c) must include the Shared Part, complete and unmodified;
+
+d) may not modify the functional behavior of the Java
+Runtime Interpreter or the Java Classes;
+
+e) may not modify, subset or superset the interfaces of the
+Java Runtime Interpreter or the Java Classes;
+
+f) may not subset or superset the Java Classes; and
+
+g) may not modify or extend the required public class or
+public interface declarations whose names begin with "java",
+"javax", "jini", "net.jini", "sun.hotjava", "COM.sun" or
+their equivalents in any subsequent naming convention.
+
+2.3 Compatibility Testing.  Successful compatibility testing
+must be completed by You, or at Original Contributor's
+option, a third party designated by Original Contributor, to
+conduct such tests, in accordance with the User's Guide, and
+using the most current version of the applicable TCK
+available from Original Contributor one hundred twenty (120)
+days (two hundred forty [240] days in the case of silicon
+implementations) prior to:  (i) Your Internal Deployment
+Use; and (ii) each release of Compliant Covered Code by You
+for Commercial Use.  In the event that You elect to use a
+version of Upgraded Code that is newer than that which is
+required under this Section 2.3, then You agree to pass the
+version of the TCK that corresponds to such newer version of
+Upgraded Code.
 
+2.4 Test Results.  You agree to provide to Original
+Contributor or the third party test facility if applicable,
+Your test results that demonstrate that Covered Code is
+Compliant Covered Code and that Original Contributor may
+publish or otherwise distribute such test results.
+
+ATTACHMENT F ADDITIONAL REQUIREMENTS AND RESPONSIBILITIES
+
+Original Contributor and/or its licensors grant You a non-exclusive and
+non-transferable license for the internal use only of any fonts
+accompanying the Technology.  Title to fonts and all associated
+intellectual property rights are retained by Original Contributor
+and/or its licensors. Unless enforcement is prohibited by applicable law, 
+You may not modify, decompile, or reverse engineer the fonts. 
+You may not redistribute the fonts in any form.
 
diff --git a/java/jdk16/pkg-plist b/java/jdk16/pkg-plist
index 1563ab802105..9cd59d47ecc3 100644
--- a/java/jdk16/pkg-plist
+++ b/java/jdk16/pkg-plist
@@ -1,150 +1,32 @@
 jdk%%JDK_VERSION%%/COPYRIGHT
 jdk%%JDK_VERSION%%/LICENSE
-jdk%%JDK_VERSION%%/LICENSE.fr
 jdk%%JDK_VERSION%%/README
 jdk%%JDK_VERSION%%/README.html
-jdk%%JDK_VERSION%%/bin/.java_wrapper
-%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/ControlPanel
-%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/HtmlConverter
 jdk%%JDK_VERSION%%/bin/appletviewer
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/appletviewer_g
-jdk%%JDK_VERSION%%/bin/awt_robot
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/awt_robot_g
 jdk%%JDK_VERSION%%/bin/extcheck
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/extcheck_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/appletviewer
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/appletviewer_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/extcheck
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/extcheck_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/idlj
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/idlj_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/jar
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jar_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/jarsigner
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jarsigner_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/java
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_g
-%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_vm
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_vm_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/javac
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javac_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/javadoc
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javadoc_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/javah
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javah_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/javap
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javap_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/jdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jdb_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/keytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/keytool_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/native2ascii
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/native2ascii_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjava
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjava_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjavac
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjavac_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjdb_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/policytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/policytool_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/rmic
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/rmic_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/rmid
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/rmid_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/rmiregistry
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/rmiregistry_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/serialver
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/serialver_g
-jdk%%JDK_VERSION%%/bin/i386/green_threads/tnameserv
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/tnameserv_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/appletviewer
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/appletviewer_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/extcheck
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/extcheck_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/idlj
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/idlj_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jar
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jar_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jarsigner
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jarsigner_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_g
-%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javac
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javac_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javadoc
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javadoc_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javah
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javah_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javap
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javap_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jdb
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jdb_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/keytool
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/keytool_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/native2ascii
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/native2ascii_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjava
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjava_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjavac
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjavac_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjdb
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjdb_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/policytool
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/policytool_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmic
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmic_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmid
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmid_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmiregistry
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmiregistry_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/serialver
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/serialver_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/tnameserv
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/tnameserv_g
 jdk%%JDK_VERSION%%/bin/idlj
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/idlj_g
 jdk%%JDK_VERSION%%/bin/jar
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jar_g
 jdk%%JDK_VERSION%%/bin/jarsigner
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jarsigner_g
 jdk%%JDK_VERSION%%/bin/java
 jdk%%JDK_VERSION%%/bin/java-rmi.cgi
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/java_g
 jdk%%JDK_VERSION%%/bin/javac
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javac_g
 jdk%%JDK_VERSION%%/bin/javadoc
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javadoc_g
 jdk%%JDK_VERSION%%/bin/javah
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javah_g
 jdk%%JDK_VERSION%%/bin/javap
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javap_g
 jdk%%JDK_VERSION%%/bin/jdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jdb_g
 jdk%%JDK_VERSION%%/bin/keytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/keytool_g
+jdk%%JDK_VERSION%%/bin/kinit
+jdk%%JDK_VERSION%%/bin/klist
+jdk%%JDK_VERSION%%/bin/ktab
 jdk%%JDK_VERSION%%/bin/native2ascii
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/native2ascii_g
-jdk%%JDK_VERSION%%/bin/oldjava
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/oldjava_g
-jdk%%JDK_VERSION%%/bin/oldjavac
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/oldjavac_g
-jdk%%JDK_VERSION%%/bin/oldjdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/oldjdb_g
+jdk%%JDK_VERSION%%/bin/orbd
 jdk%%JDK_VERSION%%/bin/policytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/policytool_g
 jdk%%JDK_VERSION%%/bin/rmic
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmic_g
 jdk%%JDK_VERSION%%/bin/rmid
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmid_g
 jdk%%JDK_VERSION%%/bin/rmiregistry
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmiregistry_g
 jdk%%JDK_VERSION%%/bin/serialver
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/serialver_g
+jdk%%JDK_VERSION%%/bin/servertool
 jdk%%JDK_VERSION%%/bin/tnameserv
-%%DEBUG:%%jdk%%JDK_VERSION%%/bin/tnameserv_g
 jdk%%JDK_VERSION%%/demo/applets/Animator/Animation.class
 jdk%%JDK_VERSION%%/demo/applets/Animator/AnimationFrame.class
 jdk%%JDK_VERSION%%/demo/applets/Animator/Animator.class
@@ -184,8 +66,8 @@ jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcControls.class
 jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcTest.class
 jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcTest.java
 jdk%%JDK_VERSION%%/demo/applets/ArcTest/example1.html
-jdk%%JDK_VERSION%%/demo/applets/BarChart/Chart.class
-jdk%%JDK_VERSION%%/demo/applets/BarChart/Chart.java
+jdk%%JDK_VERSION%%/demo/applets/BarChart/BarChart.class
+jdk%%JDK_VERSION%%/demo/applets/BarChart/BarChart.java
 jdk%%JDK_VERSION%%/demo/applets/BarChart/example1.html
 jdk%%JDK_VERSION%%/demo/applets/Blink/Blink$1.class
 jdk%%JDK_VERSION%%/demo/applets/Blink/Blink.class
@@ -195,8 +77,8 @@ jdk%%JDK_VERSION%%/demo/applets/CardTest/CardPanel.class
 jdk%%JDK_VERSION%%/demo/applets/CardTest/CardTest.class
 jdk%%JDK_VERSION%%/demo/applets/CardTest/CardTest.java
 jdk%%JDK_VERSION%%/demo/applets/CardTest/example1.html
-jdk%%JDK_VERSION%%/demo/applets/Clock/Clock2.class
-jdk%%JDK_VERSION%%/demo/applets/Clock/Clock2.java
+jdk%%JDK_VERSION%%/demo/applets/Clock/Clock.class
+jdk%%JDK_VERSION%%/demo/applets/Clock/Clock.java
 jdk%%JDK_VERSION%%/demo/applets/Clock/example1.html
 jdk%%JDK_VERSION%%/demo/applets/DitherTest/DitherCanvas.class
 jdk%%JDK_VERSION%%/demo/applets/DitherTest/DitherControls.class
@@ -279,8 +161,8 @@ jdk%%JDK_VERSION%%/demo/applets/ImageMap/example1.html
 jdk%%JDK_VERSION%%/demo/applets/ImageMap/imagemapcheat.html
 jdk%%JDK_VERSION%%/demo/applets/ImageMap/images/jim.graham.gif
 jdk%%JDK_VERSION%%/demo/applets/ImageMap/sources.html
-jdk%%JDK_VERSION%%/demo/applets/JumpingBox/MouseTrack.class
-jdk%%JDK_VERSION%%/demo/applets/JumpingBox/MouseTrack.java
+jdk%%JDK_VERSION%%/demo/applets/JumpingBox/JumpingBox.class
+jdk%%JDK_VERSION%%/demo/applets/JumpingBox/JumpingBox.java
 jdk%%JDK_VERSION%%/demo/applets/JumpingBox/example1.html
 jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/adapt-or-die.au
 jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/cannot.be.completed.au
@@ -357,34 +239,6 @@ jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/cube.obj
 jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/dinasaur.obj
 jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/hughes_500.obj
 jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/knoxS.obj
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess/CreateCoffees.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess/CreateCoffees.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase/CreateCoffees.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase/CreateCoffees.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess/CreateSuppliers.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess/CreateSuppliers.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase/CreateSuppliers.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase/CreateSuppliers.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr/InsertCoffees.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr/InsertCoffees.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase/InsertCoffees.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase/InsertCoffees.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess/InsertSuppliers.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess/InsertSuppliers.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase/InsertSuppliers.class
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase/InsertSuppliers.java
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase/runnit.bat
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/JavaDB/CAFEJAVA.MDB
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/JavaDB/CAFEJAVA.ldb
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/DBDemos/private.fls
 jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/FileChooserDemo.jar
 jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/README.txt
 jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images/gifIcon.gif
@@ -395,78 +249,75 @@ jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src/FileChooserDemo.java
 jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/Font2DTest.html
 jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/Font2DTest.jar
 jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_de.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_en.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_en_GB.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_ko.properties
-jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/resource.data
 jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/Font2DTest.java
+jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/Font2DTestApplet.java
+jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/FontPanel.java
+jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/RangeMenu.java
 jdk%%JDK_VERSION%%/demo/jfc/Java2D/Java2Demo.html
 jdk%%JDK_VERSION%%/demo/jfc/Java2D/Java2Demo.jar
 jdk%%JDK_VERSION%%/demo/jfc/Java2D/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/AnimatingControlsSurface.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/AnimatingSurface.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/CloningFeature.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/ControlsSurface.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/CustomControls.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/CustomControlsContext.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoFonts.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoGroup.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoImages.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/GlobalControls.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/GlobalPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Intro.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Java2Demo.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Java2DemoApplet.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/MemoryMonitor.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/PerformanceMonitor.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/RunWindow.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Surface.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/TextureChooser.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Tools.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/Arcs.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/BezierAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/Curves.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/Ellipses.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/Areas.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/ClipAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/Intersection.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/Text.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors/BullsEye.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors/ColorConvert.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors/Rotator3D.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite/ACimages.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite/ACrules.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite/FadeAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/AllFonts.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/AttributedStr.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/Highlighting.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/Outline.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/Tree.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/DukeAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/ImageOps.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/JPEGFlip.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/WarpImage.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/Caps.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/Dash.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/Joins.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/LineAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix/Balls.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix/BezierScroller.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix/Stars3D.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/GradAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/Gradient.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/Texture.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/TextureAnim.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/Append.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/CurveQuadTo.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/FillStroke.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/WindingRule.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms/Rotate.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms/SelectTx.java
-jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms/TransformAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/AnimatingControlsSurface.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/AnimatingSurface.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/CloningFeature.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/ControlsSurface.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/CustomControls.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/CustomControlsContext.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/DemoFonts.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/DemoGroup.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/DemoImages.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/DemoPanel.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/GlobalControls.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/GlobalPanel.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Intro.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Java2Demo.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Java2DemoApplet.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/MemoryMonitor.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/PerformanceMonitor.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/RunWindow.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Surface.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/TextureChooser.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/Tools.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Arcs.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/BezierAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Curves.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Ellipses.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping/Areas.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping/ClipAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping/Intersection.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping/Text.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Colors/BullsEye.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Colors/ColorConvert.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Colors/Rotator3D.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Composite/ACimages.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Composite/ACrules.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Composite/FadeAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/AllFonts.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/AttributedStr.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/Highlighting.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/Outline.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts/Tree.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images/DukeAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images/ImageOps.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images/JPEGFlip.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images/WarpImage.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines/Caps.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines/Dash.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines/Joins.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines/LineAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Mix/Balls.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Mix/BezierScroller.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Mix/Stars3D.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint/GradAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint/Gradient.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint/Texture.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint/TextureAnim.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths/Append.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths/CurveQuadTo.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths/FillStroke.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths/WindingRule.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Transforms/Rotate.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Transforms/SelectTx.java
+jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Transforms/TransformAnim.java
 jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/back.gif
 jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/credits.html
 jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/duke.gif
@@ -522,9 +373,6 @@ jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleData.java
 jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleTree.java
 jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleTreeCellRenderer.java
 jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleTreeModel.java
-jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/SimpleExample.jar
-jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/src/SimpleExample.java
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/README.txt
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/Stylepad.jar
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Notepad.properties
@@ -565,7 +413,193 @@ jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/src/SwingApplet.java
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/README.txt
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2.html
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2.jar
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2Plugin.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/ant.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/bug.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/About.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/COPYRIGHT
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/apple.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/asparagus.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/banana.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/broccoli.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/cantaloupe.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/carrot.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/corn.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/grapefruit.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/grapes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/kiwi.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/onion.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/peach.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/pear.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/pepper.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/pickle.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/pineapple.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/raspberry.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/strawberry.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/tomato.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food/watermelon.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/cab.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/cab_small.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/fish.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/fish_small.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/moon.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/moon_small.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/sun.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc/sun_small.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/COPYRIGHT
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/ant.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/book.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/bug.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/bug2.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/crest.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/king.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/micro.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo/seaweed.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Splash.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b1.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b1d.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b1p.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b1r.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b2.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b2d.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b2p.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b2r.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b3.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b3d.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b3p.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/b3r.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/bl.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/bldn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/bm.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/bmdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/br.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/brdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/c.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cb.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cbr.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cbrs.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cbs.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/cdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/ml.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/mldn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/mr.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/mrdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rb.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rbp.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rbr.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rbrs.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/rbs.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tl.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tldn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tm.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tmdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/toggle.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/toggledn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/tr.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons/trdn.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/brenteyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/brenthair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/brentmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/georgeseyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/georgeshair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/georgesmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/hanseyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/hanshair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/hansmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/howardeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/howardhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/howardmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jameseyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jameshair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jamesmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jeffeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jeffhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jeffmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/joneyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jonhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/jonmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/laraeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/larahair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/laramouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/larryeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/larryhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/larrymouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/lisaeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/lisahair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/lisamouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/michaeleyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/michaelhair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/michaelmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/philipeyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/philiphair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/philipmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/scotteyes.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/scotthair.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox/scottmouth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser/find.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser/gifIcon.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser/help.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser/jpgIcon.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/htmldemo/back.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/htmldemo/forward.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/htmldemo/header.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/blue.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/cyan.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/gray.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/green.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/magenta.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/red.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list/yellow.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/optionpane/bottle.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/optionpane/ibd.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/optionpane/ibu.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/COPYRIGHT
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/colheader.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/crayons.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/lowerleft.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/rowheader.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/upperleft.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane/upperright.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/splitpane/README
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/splitpane/earth.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/splitpane/moon.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/blake.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/brooke.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/david.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/ewan.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/ewan.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/hania.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/laine.jpg
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/matthew.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane/stephen.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JButton.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JColorChooser.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JComboBox.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JDesktop.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JDialog.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JEditorPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JFileChooser.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JList.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JMenu.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JOptionPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JProgressBar.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JRadioButton.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JScrollBar.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JScrollPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JSlider.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JSplitPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JTabbedPane.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JTable.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/JTree.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar/ToolTip.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tooltip/cow.gif
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/index.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/king.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/preface.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/seaweed.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/swingset.properties
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/swingset_zh_CN.properties
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/title.html
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/tree.txt
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/AquaTheme.java
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/BezierAnimationPanel.java
 jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ButtonDemo.java
@@ -608,260 +642,86 @@ jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableExample4.java
 jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableMap.java
 jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableSorter.java
 jdk%%JDK_VERSION%%/demo/jpda/examples.jar
-jdk%%JDK_VERSION%%/demo/sound/JavaSound.html
-jdk%%JDK_VERSION%%/demo/sound/JavaSound.jar
-jdk%%JDK_VERSION%%/demo/sound/README.txt
-jdk%%JDK_VERSION%%/demo/sound/media/ambient.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/bark.aiff
-jdk%%JDK_VERSION%%/demo/sound/media/bong.wav
-jdk%%JDK_VERSION%%/demo/sound/media/classical.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/modern-rock.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/sfx-medley.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/spacemusic.au
-jdk%%JDK_VERSION%%/demo/sound/media/trance.rmf
-jdk%%JDK_VERSION%%/demo/sound/media/trippygaia1.mid
-jdk%%JDK_VERSION%%/demo/sound/src/CapturePlayback.java
-jdk%%JDK_VERSION%%/demo/sound/src/ControlContext.java
-jdk%%JDK_VERSION%%/demo/sound/src/Groove.java
-jdk%%JDK_VERSION%%/demo/sound/src/JavaSound.java
-jdk%%JDK_VERSION%%/demo/sound/src/JavaSoundApplet.java
-jdk%%JDK_VERSION%%/demo/sound/src/Juke.java
-jdk%%JDK_VERSION%%/demo/sound/src/MidiSynth.java
-jdk%%JDK_VERSION%%/demo/sound/src/TempoDial.java
-jdk%%JDK_VERSION%%/include-old/StubPreamble.h
-jdk%%JDK_VERSION%%/include-old/alloc_cache.h
-jdk%%JDK_VERSION%%/include-old/bag.h
-jdk%%JDK_VERSION%%/include-old/bool.h
-jdk%%JDK_VERSION%%/include-old/breakpoints.h
-jdk%%JDK_VERSION%%/include-old/byteorder.h
-jdk%%JDK_VERSION%%/include-old/common_exceptions.h
-jdk%%JDK_VERSION%%/include-old/debug.h
-jdk%%JDK_VERSION%%/include-old/dll.h
-jdk%%JDK_VERSION%%/include-old/exceptions.h
-jdk%%JDK_VERSION%%/include-old/freebsd/byteorder_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/gc_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/hpi_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/io_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/jawt_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/jmath_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/jvm_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/miscdefs_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/path_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/sysmacros_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/timeval_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/typedefs_md.h
-jdk%%JDK_VERSION%%/include-old/gc.h
-jdk%%JDK_VERSION%%/include-old/hpi.h
-jdk%%JDK_VERSION%%/include-old/interpreter.h
-jdk%%JDK_VERSION%%/include-old/javaString.h
-jdk%%JDK_VERSION%%/include-old/java_lang_ClassLoader.h
-jdk%%JDK_VERSION%%/include-old/java_lang_String.h
-jdk%%JDK_VERSION%%/include-old/java_lang_Thread.h
-jdk%%JDK_VERSION%%/include-old/java_lang_ThreadGroup.h
-jdk%%JDK_VERSION%%/include-old/jawt.h
-jdk%%JDK_VERSION%%/include-old/jit.h
-jdk%%JDK_VERSION%%/include-old/jmath.h
-jdk%%JDK_VERSION%%/include-old/jvm.h
-jdk%%JDK_VERSION%%/include-old/jvmdi.h
-jdk%%JDK_VERSION%%/include-old/jvmpi.h
-jdk%%JDK_VERSION%%/include-old/log.h
-jdk%%JDK_VERSION%%/include-old/monitor.h
-jdk%%JDK_VERSION%%/include-old/monitor_cache.h
-jdk%%JDK_VERSION%%/include-old/native.h
-jdk%%JDK_VERSION%%/include-old/oldnmi.h
-jdk%%JDK_VERSION%%/include-old/oobj.h
-jdk%%JDK_VERSION%%/include-old/opcodes.h
-jdk%%JDK_VERSION%%/include-old/path.h
-jdk%%JDK_VERSION%%/include-old/reflect.h
-jdk%%JDK_VERSION%%/include-old/signature.h
-jdk%%JDK_VERSION%%/include-old/sys_api.h
-jdk%%JDK_VERSION%%/include-old/threads.h
-jdk%%JDK_VERSION%%/include-old/tree.h
-jdk%%JDK_VERSION%%/include-old/typecodes.h
-jdk%%JDK_VERSION%%/include-old/typedefs.h
-jdk%%JDK_VERSION%%/include-old/utf.h
-jdk%%JDK_VERSION%%/include-old/util.h
-jdk%%JDK_VERSION%%/include-old/vmprofiler.h
-jdk%%JDK_VERSION%%/include-old/wrap.h
-jdk%%JDK_VERSION%%/include/freebsd/jawt_md.h
-jdk%%JDK_VERSION%%/include/freebsd/jni_md.h
+jdk%%JDK_VERSION%%/include/bsd/jawt_md.h
+jdk%%JDK_VERSION%%/include/bsd/jni_md.h
 jdk%%JDK_VERSION%%/include/jawt.h
 jdk%%JDK_VERSION%%/include/jni.h
 jdk%%JDK_VERSION%%/include/jvmdi.h
 jdk%%JDK_VERSION%%/include/jvmpi.h
 jdk%%JDK_VERSION%%/jre/CHANGES
 jdk%%JDK_VERSION%%/jre/COPYRIGHT
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/ControlPanel.html
 jdk%%JDK_VERSION%%/jre/LICENSE
-jdk%%JDK_VERSION%%/jre/LICENSE.fr
 jdk%%JDK_VERSION%%/jre/README
 jdk%%JDK_VERSION%%/jre/Welcome.html
-jdk%%JDK_VERSION%%/jre/bin/.java_wrapper
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/ControlPanel
-jdk%%JDK_VERSION%%/jre/bin/awt_robot
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/appletviewer
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/appletviewer_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/extcheck
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/extcheck_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/idlj
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/idlj_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jar
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jar_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jarsigner
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jarsigner_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_g
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_vm
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_vm_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javac
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javac_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javadoc
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javadoc_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javah
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javah_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javap
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javap_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jdb_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/keytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/keytool_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/native2ascii
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/native2ascii_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjava
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjava_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjavac
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjavac_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjdb
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjdb_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/policytool
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/policytool_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmic
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmic_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmid
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmid_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmiregistry
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmiregistry_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/serialver
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/serialver_g
-jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/tnameserv
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/tnameserv_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/appletviewer_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/extcheck_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/idlj_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jar_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jarsigner_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_g
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javac_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javadoc_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javah_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javap_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jdb_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/keytool
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/keytool_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/native2ascii_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjava_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjavac_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjdb_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/policytool
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/policytool_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmic_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmid
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmid_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmiregistry
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmiregistry_g
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/serialver_g
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/tnameserv
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/tnameserv_g
 jdk%%JDK_VERSION%%/jre/bin/java
 jdk%%JDK_VERSION%%/jre/bin/keytool
+jdk%%JDK_VERSION%%/jre/bin/kinit
+jdk%%JDK_VERSION%%/jre/bin/klist
+jdk%%JDK_VERSION%%/jre/bin/ktab
+jdk%%JDK_VERSION%%/jre/bin/orbd
 jdk%%JDK_VERSION%%/jre/bin/policytool
 jdk%%JDK_VERSION%%/jre/bin/rmid
 jdk%%JDK_VERSION%%/jre/bin/rmiregistry
+jdk%%JDK_VERSION%%/jre/bin/servertool
 jdk%%JDK_VERSION%%/jre/bin/tnameserv
 jdk%%JDK_VERSION%%/jre/lib/audio/soundbank.gm
+jdk%%JDK_VERSION%%/jre/lib/charsets.jar
 jdk%%JDK_VERSION%%/jre/lib/cmm/CIEXYZ.pf
 jdk%%JDK_VERSION%%/jre/lib/cmm/GRAY.pf
 jdk%%JDK_VERSION%%/jre/lib/cmm/LINEAR_RGB.pf
 jdk%%JDK_VERSION%%/jre/lib/cmm/PYCC.pf
 jdk%%JDK_VERSION%%/jre/lib/cmm/sRGB.pf
 jdk%%JDK_VERSION%%/jre/lib/content-types.properties
+jdk%%JDK_VERSION%%/jre/lib/ext/dnsns.jar
+jdk%%JDK_VERSION%%/jre/lib/ext/ldapsec.jar
+jdk%%JDK_VERSION%%/jre/lib/ext/localedata.jar
+jdk%%JDK_VERSION%%/jre/lib/ext/sunjce_provider.jar
 jdk%%JDK_VERSION%%/jre/lib/flavormap.properties
 jdk%%JDK_VERSION%%/jre/lib/font.properties
 jdk%%JDK_VERSION%%/jre/lib/font.properties.ja
-jdk%%JDK_VERSION%%/jre/lib/font.properties.ru
-jdk%%JDK_VERSION%%/jre/lib/font.properties.uk
 jdk%%JDK_VERSION%%/jre/lib/font.properties.zh
-jdk%%JDK_VERSION%%/jre/lib/font.properties.zh_CN
 jdk%%JDK_VERSION%%/jre/lib/font.properties.zh_TW
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiBold.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiItalic.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightItalic.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightRegular.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiBold.ttf
-jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiOblique.ttf
-jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansOblique.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansRegular.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBold.ttf
-jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBoldOblique.ttf
-jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterOblique.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir
-jdk%%JDK_VERSION%%/jre/lib/i18n.jar
-jdk%%JDK_VERSION%%/jre/lib/i386/classic/Xusage.txt
-jdk%%JDK_VERSION%%/jre/lib/i386/classic/libjvm.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/classic/libjvm_g.so
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/Xusage.txt
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm.so
-%%HOTSPOT:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm_g.so
-jdk%%JDK_VERSION%%/jre/lib/i386/green_threads/libhpi.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/green_threads/libhpi_g.so
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/hotspot
+jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot
+jdk%%JDK_VERSION%%/jre/lib/i386/client/Xusage.txt
+jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig.so
+jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm.so
+jdk%%JDK_VERSION%%/jre/lib/i386/jvm.cfg
 jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc_g.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libagent.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libagent_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libawt.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libawt_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libcmm.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libcmm_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr_g.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libhprof.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libhprof_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libioser12.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libioser12_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libjaas_unix.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjava.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni.so
-%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjawt.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjawt_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjcov.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjcov_g.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libjsig.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjsound.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjsound_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libnet.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libnet_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/libnio.so
+jdk%%JDK_VERSION%%/jre/lib/i386/librmi.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libverify.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libverify_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libzip.so
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libzip_g.so
-%%NATIVE:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi.so
-%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi_g.so
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/Xusage.txt
-%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm.so
-%%HOTSPOT:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm_g.so
+jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi.so
+jdk%%JDK_VERSION%%/jre/lib/i386/server/Xusage.txt
+jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig.so
+jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm.so
+jdk%%JDK_VERSION%%/jre/lib/im/indicim.jar
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/cursors.properties
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/invalid32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_CopyDrop32x32.gif
@@ -870,43 +730,428 @@ jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkDrop32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveDrop32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/javaplugin.jar
-jdk%%JDK_VERSION%%/jre/lib/jvm.cfg
+jdk%%JDK_VERSION%%/jre/lib/jce.jar
+jdk%%JDK_VERSION%%/jre/lib/jsse.jar
 jdk%%JDK_VERSION%%/jre/lib/jvm.hprof.txt
 jdk%%JDK_VERSION%%/jre/lib/jvm.jcov.txt
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
+jdk%%JDK_VERSION%%/jre/lib/logging.properties
 jdk%%JDK_VERSION%%/jre/lib/psfont.properties.ja
 jdk%%JDK_VERSION%%/jre/lib/psfontj2d.properties
 jdk%%JDK_VERSION%%/jre/lib/rt.jar
+jdk%%JDK_VERSION%%/jre/lib/security/US_export_policy.jar
 jdk%%JDK_VERSION%%/jre/lib/security/cacerts
 jdk%%JDK_VERSION%%/jre/lib/security/java.policy
 jdk%%JDK_VERSION%%/jre/lib/security/java.security
+jdk%%JDK_VERSION%%/jre/lib/security/local_policy.jar
 jdk%%JDK_VERSION%%/jre/lib/sunrsasign.jar
-jdk%%JDK_VERSION%%/jre/lib/tzmappings
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin.so
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin_g.so
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji.so
-%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji_g.so
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Abidjan
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Accra
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Addis_Ababa
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Algiers
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Asmera
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bamako
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bangui
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Banjul
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bissau
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Blantyre
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Brazzaville
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bujumbura
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Cairo
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Casablanca
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ceuta
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Conakry
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Dakar
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Dar_es_Salaam
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Djibouti
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Douala
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/El_Aaiun
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Freetown
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Gaborone
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Harare
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Johannesburg
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kampala
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Khartoum
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kigali
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kinshasa
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lagos
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Libreville
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lome
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Luanda
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lubumbashi
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lusaka
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Malabo
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Maputo
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Maseru
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Mbabane
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Mogadishu
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Monrovia
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Nairobi
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ndjamena
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Niamey
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Nouakchott
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ouagadougou
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Porto-Novo
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Sao_Tome
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Timbuktu
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Tripoli
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Tunis
+jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Windhoek
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Adak
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Anchorage
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Anguilla
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Antigua
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Araguaina
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Aruba
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Asuncion
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Barbados
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Belem
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Belize
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Boa_Vista
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Bogota
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Boise
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Buenos_Aires
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cambridge_Bay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cancun
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Caracas
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Catamarca
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayenne
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayman
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Chicago
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Chihuahua
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cordoba
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Costa_Rica
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Cuiaba
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Curacao
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Danmarkshavn
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Dawson
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Dawson_Creek
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Denver
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Detroit
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Dominica
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Edmonton
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Eirunepe
+jdk%%JDK_VERSION%%/jre/lib/zi/America/El_Salvador
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Fortaleza
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Glace_Bay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Godthab
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Goose_Bay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Grand_Turk
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Grenada
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Guadeloupe
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Guatemala
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Guayaquil
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Guyana
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Halifax
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Havana
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Hermosillo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Knox
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Marengo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vevay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Indianapolis
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Inuvik
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Iqaluit
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Jamaica
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Jujuy
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Juneau
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Kentucky/Monticello
+jdk%%JDK_VERSION%%/jre/lib/zi/America/La_Paz
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Lima
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Los_Angeles
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Louisville
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Maceio
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Managua
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Manaus
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Martinique
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Mazatlan
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Mendoza
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Menominee
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Merida
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Mexico_City
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Miquelon
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Monterrey
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Montevideo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Montreal
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Montserrat
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Nassau
+jdk%%JDK_VERSION%%/jre/lib/zi/America/New_York
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Nipigon
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Nome
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Noronha
+jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota/Center
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Panama
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Pangnirtung
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Paramaribo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Phoenix
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Port-au-Prince
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Port_of_Spain
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Porto_Velho
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Puerto_Rico
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Rainy_River
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Rankin_Inlet
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Recife
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Regina
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Rio_Branco
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Santiago
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Santo_Domingo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Sao_Paulo
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Scoresbysund
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Johns
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Kitts
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Lucia
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Thomas
+jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Vincent
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Swift_Current
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Tegucigalpa
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Thule
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Thunder_Bay
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Tijuana
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Tortola
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Vancouver
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Whitehorse
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Winnipeg
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Yakutat
+jdk%%JDK_VERSION%%/jre/lib/zi/America/Yellowknife
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Casey
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Davis
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/DumontDUrville
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Mawson
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/McMurdo
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Palmer
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Syowa
+jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Vostok
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aden
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Almaty
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Amman
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Anadyr
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aqtau
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aqtobe
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ashgabat
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Baghdad
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bahrain
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Baku
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bangkok
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Beirut
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bishkek
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Brunei
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Calcutta
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Choibalsan
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Chongqing
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Colombo
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Damascus
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dhaka
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dili
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dubai
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dushanbe
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Gaza
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Harbin
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hong_Kong
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hovd
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Irkutsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jakarta
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jayapura
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jerusalem
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kabul
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kamchatka
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Karachi
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kashgar
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Katmandu
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Krasnoyarsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuala_Lumpur
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuching
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuwait
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Macau
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Magadan
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Makassar
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Manila
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Muscat
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Nicosia
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Novosibirsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Omsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Oral
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Phnom_Penh
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Pontianak
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Pyongyang
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Qatar
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Qyzylorda
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Rangoon
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh87
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh88
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh89
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Saigon
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Sakhalin
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Samarkand
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Seoul
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Shanghai
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Singapore
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Taipei
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tashkent
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tbilisi
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tehran
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Thimphu
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tokyo
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ulaanbaatar
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Urumqi
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Vientiane
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Vladivostok
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yakutsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yekaterinburg
+jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yerevan
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Azores
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Bermuda
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Canary
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Cape_Verde
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Faeroe
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Madeira
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Reykjavik
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/South_Georgia
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/St_Helena
+jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Stanley
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Adelaide
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Brisbane
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Broken_Hill
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Darwin
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Hobart
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lindeman
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lord_Howe
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Melbourne
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Perth
+jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Sydney
+jdk%%JDK_VERSION%%/jre/lib/zi/CET
+jdk%%JDK_VERSION%%/jre/lib/zi/EET
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+1
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+10
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+11
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+12
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+2
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+3
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+4
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+5
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+6
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+7
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+8
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+9
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-1
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-10
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-11
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-12
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-13
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-14
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-2
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-3
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-4
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-5
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-6
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-7
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-8
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-9
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/UCT
+jdk%%JDK_VERSION%%/jre/lib/zi/Etc/UTC
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Amsterdam
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Andorra
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Athens
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Belfast
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Belgrade
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Berlin
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Brussels
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Bucharest
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Budapest
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Chisinau
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Copenhagen
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Dublin
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Gibraltar
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Helsinki
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Istanbul
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Kaliningrad
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Kiev
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Lisbon
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/London
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Luxembourg
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Madrid
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Malta
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Minsk
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Monaco
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Moscow
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Oslo
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Paris
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Prague
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Riga
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Rome
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Samara
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Simferopol
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Sofia
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Stockholm
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Tallinn
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Tirane
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Uzhgorod
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vaduz
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vienna
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vilnius
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Warsaw
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zaporozhye
+jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zurich
+jdk%%JDK_VERSION%%/jre/lib/zi/GMT
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Antananarivo
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Chagos
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Christmas
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Cocos
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Comoro
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Kerguelen
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mahe
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Maldives
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mauritius
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mayotte
+jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Reunion
+jdk%%JDK_VERSION%%/jre/lib/zi/MET
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Apia
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Auckland
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Chatham
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Easter
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Efate
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Enderbury
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Fakaofo
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Fiji
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Funafuti
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Galapagos
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Gambier
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Guadalcanal
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Guam
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Honolulu
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Johnston
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kiritimati
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kosrae
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kwajalein
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Majuro
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Marquesas
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Midway
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Nauru
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Niue
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Norfolk
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Noumea
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Pago_Pago
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Palau
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Pitcairn
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Ponape
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Port_Moresby
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Rarotonga
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Saipan
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tahiti
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tarawa
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tongatapu
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Truk
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wake
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wallis
+jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Yap
+jdk%%JDK_VERSION%%/jre/lib/zi/WET
+jdk%%JDK_VERSION%%/jre/lib/zi/ZoneInfoMappings
 jdk%%JDK_VERSION%%/lib/dt.jar
-%%PLUGIN:%%jdk%%JDK_VERSION%%/lib/htmlconverter.jar
-jdk%%JDK_VERSION%%/lib/i386/libdt_socket.so
-jdk%%JDK_VERSION%%/lib/i386/libjdwp.so
 jdk%%JDK_VERSION%%/lib/ir.idl
 jdk%%JDK_VERSION%%/lib/orb.idl
 jdk%%JDK_VERSION%%/lib/tools.jar
 jdk%%JDK_VERSION%%/man/man1/appletviewer.1
 jdk%%JDK_VERSION%%/man/man1/extcheck.1
+jdk%%JDK_VERSION%%/man/man1/idlj.1
 jdk%%JDK_VERSION%%/man/man1/jar.1
 jdk%%JDK_VERSION%%/man/man1/jarsigner.1
 jdk%%JDK_VERSION%%/man/man1/java.1
@@ -917,169 +1162,207 @@ jdk%%JDK_VERSION%%/man/man1/javap.1
 jdk%%JDK_VERSION%%/man/man1/jdb.1
 jdk%%JDK_VERSION%%/man/man1/keytool.1
 jdk%%JDK_VERSION%%/man/man1/native2ascii.1
+jdk%%JDK_VERSION%%/man/man1/orbd.1
+jdk%%JDK_VERSION%%/man/man1/policytool.1
 jdk%%JDK_VERSION%%/man/man1/rmic.1
 jdk%%JDK_VERSION%%/man/man1/rmid.1
 jdk%%JDK_VERSION%%/man/man1/rmiregistry.1
 jdk%%JDK_VERSION%%/man/man1/serialver.1
+jdk%%JDK_VERSION%%/man/man1/servertool.1
 jdk%%JDK_VERSION%%/man/man1/tnameserv.1
-jdk%%JDK_VERSION%%/src.jar
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/appletviewer_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/extcheck_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/idlj_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jar_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jarsigner_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/java_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javac_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javadoc_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javah_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javap_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jdb_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/keytool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/kinit_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/klist_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/ktab_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/native2ascii_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/orbd_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/policytool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmic_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmid_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmiregistry_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/serialver_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/servertool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/bin/tnameserv_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/java_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/keytool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/kinit_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/klist_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/ktab_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/orbd_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/policytool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/rmid_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/rmiregistry_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/servertool_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/tnameserv_g
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libawt_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libcmm_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libhprof_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libioser12_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjaas_unix_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjawt_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjcov_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjsig_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjsound_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libnet_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libnio_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/librmi_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libverify_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libzip_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig_g.so
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm_g.so
 @exec   mkdir -p %D/share/doc/java
 @unexec rmdir %D/share/doc/java 2>/dev/null || true
 @exec   %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%"
 @unexec %D/bin/unregistervm FREEBSD-JDK%%JDK_VERSION%%
-@dirrm jdk%%JDK_VERSION%%/man/man1
-@dirrm jdk%%JDK_VERSION%%/man
-@dirrm jdk%%JDK_VERSION%%/lib/i386
-@dirrm jdk%%JDK_VERSION%%/lib
-%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns600
-%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns4
-%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386
-@dirrm jdk%%JDK_VERSION%%/jre/plugin
-@dirrm jdk%%JDK_VERSION%%/jre/lib/security
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale
-@dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors
-@dirrm jdk%%JDK_VERSION%%/jre/lib/images
-%%HOTSPOT:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/server
-%%NATIVE:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/native_threads
-@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/green_threads
-%%HOTSPOT:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/client
-@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/classic
-@dirrm jdk%%JDK_VERSION%%/jre/lib/i386
-@dirrm jdk%%JDK_VERSION%%/jre/lib/fonts
-@dirrm jdk%%JDK_VERSION%%/jre/lib/ext
-@dirrm jdk%%JDK_VERSION%%/jre/lib/cmm
-@dirrm jdk%%JDK_VERSION%%/jre/lib/audio
-@dirrm jdk%%JDK_VERSION%%/jre/lib
-@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/native_threads
-@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/green_threads
-@dirrm jdk%%JDK_VERSION%%/jre/bin/i386
-@dirrm jdk%%JDK_VERSION%%/jre/bin
-@dirrm jdk%%JDK_VERSION%%/jre
-@dirrm jdk%%JDK_VERSION%%/include/freebsd
-@dirrm jdk%%JDK_VERSION%%/include-old/freebsd
-@dirrm jdk%%JDK_VERSION%%/include-old
-@dirrm jdk%%JDK_VERSION%%/include
-@dirrm jdk%%JDK_VERSION%%/demo/sound/src
-@dirrm jdk%%JDK_VERSION%%/demo/sound/media
-@dirrm jdk%%JDK_VERSION%%/demo/sound
-@dirrm jdk%%JDK_VERSION%%/demo/jpda
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SimpleExample
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/JavaDB
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos
-@dirrm jdk%%JDK_VERSION%%/demo/jfc
-@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame/models
-@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame
-@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/images
-@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio
-@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe
-@dirrm jdk%%JDK_VERSION%%/demo/applets/SymbolTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/SpreadSheet
-@dirrm jdk%%JDK_VERSION%%/demo/applets/SortDemo
-@dirrm jdk%%JDK_VERSION%%/demo/applets/SimpleGraph
-@dirrm jdk%%JDK_VERSION%%/demo/applets/NervousText
-@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models
-@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer
-@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds
-@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox
-@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/images
-@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/audio
-@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap
-@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphicsTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout/audio
-@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Fractal
-@dirrm jdk%%JDK_VERSION%%/demo/applets/DrawTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/DitherTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Clock
-@dirrm jdk%%JDK_VERSION%%/demo/applets/CardTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Blink
-@dirrm jdk%%JDK_VERSION%%/demo/applets/BarChart
-@dirrm jdk%%JDK_VERSION%%/demo/applets/ArcTest
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/SimpleAnimation
+@dirrm jdk%%JDK_VERSION%%/bin
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/audio
 @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/SimpleAnimation
 @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images
-@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/audio
 @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator
+@dirrm jdk%%JDK_VERSION%%/demo/applets/ArcTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/BarChart
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Blink
+@dirrm jdk%%JDK_VERSION%%/demo/applets/CardTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Clock
+@dirrm jdk%%JDK_VERSION%%/demo/applets/DitherTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/DrawTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/Fractal
+@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout/audio
+@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout
+@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphicsTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/audio
+@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/images
+@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap
+@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds
+@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox
+@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models
+@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer
+@dirrm jdk%%JDK_VERSION%%/demo/applets/NervousText
+@dirrm jdk%%JDK_VERSION%%/demo/applets/SimpleGraph
+@dirrm jdk%%JDK_VERSION%%/demo/applets/SortDemo
+@dirrm jdk%%JDK_VERSION%%/demo/applets/SpreadSheet
+@dirrm jdk%%JDK_VERSION%%/demo/applets/SymbolTest
+@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio
+@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/images
+@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe
+@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame/models
+@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame
 @dirrm jdk%%JDK_VERSION%%/demo/applets
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Clipping
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Colors
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Composite
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Fonts
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Lines
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Mix
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paint
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Paths
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos/Transforms
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d/demos
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/java2d
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/food
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub/misc
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/ImageClub
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/Octavo
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/buttons
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/combobox
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/filechooser
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/htmldemo
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/list
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/optionpane
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/scrollpane
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/splitpane
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tabbedpane
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/toolbar
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images/tooltip
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/images
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample/src
+@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample
+@dirrm jdk%%JDK_VERSION%%/demo/jfc
+@dirrm jdk%%JDK_VERSION%%/demo/jpda
 @dirrm jdk%%JDK_VERSION%%/demo
-@dirrm jdk%%JDK_VERSION%%/bin/i386/native_threads
-@dirrm jdk%%JDK_VERSION%%/bin/i386/green_threads
-@dirrm jdk%%JDK_VERSION%%/bin/i386
-@dirrm jdk%%JDK_VERSION%%/bin
+@dirrm jdk%%JDK_VERSION%%/include/bsd
+@dirrm jdk%%JDK_VERSION%%/include
+@dirrm jdk%%JDK_VERSION%%/jre/bin
+@dirrm jdk%%JDK_VERSION%%/jre/lib/audio
+@dirrm jdk%%JDK_VERSION%%/jre/lib/applet
+@dirrm jdk%%JDK_VERSION%%/jre/lib/cmm
+@dirrm jdk%%JDK_VERSION%%/jre/lib/ext
+@dirrm jdk%%JDK_VERSION%%/jre/lib/fonts
+@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/client
+@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/native_threads
+@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/server
+@dirrm jdk%%JDK_VERSION%%/jre/lib/i386
+@dirrm jdk%%JDK_VERSION%%/jre/lib/im
+@dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors
+@dirrm jdk%%JDK_VERSION%%/jre/lib/images
+@dirrm jdk%%JDK_VERSION%%/jre/lib/security
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Africa
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/America/Kentucky
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/America
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Asia
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Australia
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Etc
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Europe
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Indian
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Pacific
+@dirrm jdk%%JDK_VERSION%%/jre/lib/zi
+@dirrm jdk%%JDK_VERSION%%/jre/lib
+@dirrm jdk%%JDK_VERSION%%/jre
+@dirrm jdk%%JDK_VERSION%%/lib
+@dirrm jdk%%JDK_VERSION%%/man/man1
+@dirrm jdk%%JDK_VERSION%%/man
 @dirrm jdk%%JDK_VERSION%%