9 files changed, 1564 insertions, 480 deletions

diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 43a88e2bee31..4a79c0e58838 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	jdk12
+# New ports collection makefile for:	jdk13
 # Date created:				10 October 2000
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
@@ -6,54 +6,46 @@
 #
 
 PORTNAME=	jdk
-PORTVERSION=	${JDK_VERSION}b${JDK_BETALEVEL}
+PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
-#		 http://www.eyesbeyond.com/freebsddom/java/jdk.html
-DISTFILES=	${PORTNAME}${JDK_VERSION:S/./_/g}-src${EXTRACT_SUFX} \
-		freebsd-jdk122-patches-${JDK_BETALEVEL}.tar.gz
+#		 http://www.eyesbeyond.com/freebsddom/java/jdk13.html
+DISTFILES=	j2sdk-${JDK_VERSION:S/./_/g}-src${EXTRACT_SUFX} \
+		bsd-jdk131-patches-${JDK_PATCHSET_VERSION}.tar.gz
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		zip:${PORTSDIR}/archivers/zip \
-		${JDK11DIR}/bin/javac:${PORTSDIR}/java/jdk \
-		${JDK12DIR}/bin/javac:${PORTSDIR}/java/linux-jdk \
-		${X11BASE}/lib/libMrm.a:${PORTSDIR}/x11-toolkits/open-motif-devel \
-		${NONEXISTENT}:${PORTSDIR}/java/jfc:extract
-LIB_DEPENDS=	odbc.1:${PORTSDIR}/databases/unixODBC
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts \
-		javavm:${PORTSDIR}/java/javavmwrapper
+		gtar:${PORTSDIR}/archivers/gtar \
+		${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-jdk13 \
+		${X11BASE}/lib/libMrm.a:${PORTSDIR}/x11-toolkits/open-motif-devel
+RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
-WRKSRC=		${WRKDIR}/build/freebsd
+WRKSRC=		${WRKDIR}/j2sdk1.3.1/make
 
-JDK_VERSION=	1.2.2
-JDK_BETALEVEL=	10
+JDK_VERSION=	1.3.1
+JDK_PATCHSET_VERSION=	3
 
-JDK11DIR?=	${LOCALBASE}/jdk1.1.8
-JFC11DIR?=	${WRKDIRPREFIX}${.CURDIR}/../../java/jfc/work/swing-1.1.1fcs
-JDK12DIR?=	${LOCALBASE}/linux-jdk${JDK_VERSION}
+JDK13DIR?=	${LOCALBASE}/linux-jdk${JDK_VERSION}
 
 ONLY_FOR_ARCHS=	i386
 USE_GMAKE=	yes
 RESTRICTED=	"Redistribution of pre-compiled binaries isn't permitted"
-MAKEFILE=	GNUmakefile
-MAKE_ENV=	HAVE_DPS="no" \
-		ALT_BOOTDIR="${JDK12DIR}" \
-		ALT_ODBCDIR="${LOCALBASE}" \
+MAKE_ENV=	ALT_BOOTDIR="${JDK13DIR}" \
 		ALT_MOTIF_DIR="${X11BASE}" \
 		OPENWINHOME="${X11BASE}" \
-		_JDK11DIR="${JDK11DIR}" \
 		SYS_CFLAGS="${CFLAGS}" \
 		CLASSPATH="" \
+		LD_LIBRARY_PATH="" \
 		JAVA_COMPILER=""
-ALL_TARGET=	release-images
-PATCH_CMD=	${PATCH} -p1 -s <
+ALL_TARGET=	all images
+TAR=		gtar
+BSD_TAR=	/usr/bin/tar
 PLIST_SUB+=	JDK_VERSION=${JDK_VERSION}
 
-JDKIMAGEDIR=	${WRKSRC}/jdk-image-i386
-JDKIMAGEDIR_G=	${WRKSRC}/jdk-debug-image-i386
-JREIMAGEDIR=	${WRKSRC}/jre-image-i386
+JDKIMAGEDIR=	${WRKSRC}/../build/bsd-i386/jdk-image-i386
+JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-i386/jdk-debug-image-i386
 
 .if defined(NODEBUG)
 PLIST_SUB+=	DEBUG:="@comment "
@@ -70,36 +62,12 @@ IGNORE=		"You can not legally distribute pre-compiled binaries"
 
 .for file in ${DISTFILES}
 .if !exists(${DISTDIR}/${file})
-IGNORE=You must manually fetch the source distribution and FreeBSD patches (${DISTFILES}) from http://www.sun.com/software/java2/download.html and http://www.eyesbeyond.com/freebsddom/java/jdk.html, place it in ${DISTDIR} and then run make again
+IGNORE=You must manually fetch the source distribution and FreeBSD patches (${DISTFILES}) from http://www.sun.com/software/java2/download.html and http://www.eyesbeyond.com/freebsddom/java/jdk13.html, place it in ${DISTDIR} and then run make again
 .endif
 .endfor
 
 pre-patch:
-	@${MKDIR} ${WRKSRC}
-.for dir in build src ext/i18n/build ext/i18n/src ext/iiimp/build 
-	@cd ${WRKDIR}/${dir} && ${RM} -rf freebsd && ${CP} -R solaris freebsd
-.endfor
-	@cd ${WRKSRC}		&& ${PATCH_CMD} ${WRKDIR}/build.patches && \
-	 cd ../share		&& ${PATCH_CMD} ${WRKDIR}/buildshare.patches && \
-	 cd ../../src/freebsd	&& ${PATCH_CMD} ${WRKDIR}/src.patches && \
-	 cd ../share		&& ${PATCH_CMD} ${WRKDIR}/srcshare.patches && \
-	 cd ../../ext		&& ${PATCH_CMD} ${WRKDIR}/ext.patches
-	@${MKDIR} ${WRKSRC}/1.1_libs
-	@${CP} ${JFC11DIR}/*.jar ${WRKSRC}/1.1_libs
-
-post-build:
-	for dir in ${JDKIMAGEDIR} ${JDKIMAGEDIR_G} ${JREIMAGEDIR}; do \
-		for file in `find $${dir} -type  f -name "*.so"`; do \
-			if [ -f $${file}.${JDK_VERSION} ]; then \
-				${RM} $${file}.${JDK_VERSION}; \
-				${LN} -sf `${BASENAME} $${file}` $${file}.${JDK_VERSION}; \
-			fi; \
-		done; \
-	done
-	for dir in ${JDKIMAGEDIR} ${JREIMAGEDIR}; do \
-		find $${dir} -type  f | xargs file | ${GREP} 'not stripped$$' | \
-			${SED} 's|:.*$$||' | xargs strip; \
-	done
+	@cd ${WRKDIR} && ${PATCH} < ${WRKDIR}/jdk131.patches
 
 .if !defined(NODEBUG)
 pre-install:
@@ -111,11 +79,11 @@ pre-install:
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
-	(cd ${JDKIMAGEDIR} && ${TAR} -c -f - .) \
-		| (cd ${PREFIX}/jdk${JDK_VERSION} && ${TAR} --unlink -x -f -)
+	(cd ${JDKIMAGEDIR} && ${BSD_TAR} -c -f - .) \
+		| (cd ${PREFIX}/jdk${JDK_VERSION} && ${BSD_TAR} --unlink -x -f -)
 .if !defined(NODEBUG)
-	(cd ${JDKIMAGEDIR_G} && ${TAR} -c -f - .) \
-		| (cd ${PREFIX}/jdk${JDK_VERSION} && ${TAR} --unlink -x -f -)
+	(cd ${JDKIMAGEDIR_G} && ${BSD_TAR} -c -f - .) \
+		| (cd ${PREFIX}/jdk${JDK_VERSION} && ${BSD_TAR} --unlink -x -f -)
 .endif
 
 post-install:
diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo
index 17199dffaa9d..1cb48e435610 100644
--- a/java/jdk16/distinfo
+++ b/java/jdk16/distinfo
@@ -1,2 +1,2 @@
-MD5 (jdk1_2_2-src.tar.gz) = 84a81b3e5f56f73bd4cbee57f895dba7
-MD5 (freebsd-jdk122-patches-10.tar.gz) = 7c01d281b3ac9d5f5f3036749f79492e
+MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
+MD5 (bsd-jdk131-patches-3.tar.gz) = c3798cbb4f2a69cbb87e699511144f27
diff --git a/java/jdk16/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd b/java/jdk16/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd
new file mode 100644
index 000000000000..3b4178837cf7
--- /dev/null
+++ b/java/jdk16/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd
@@ -0,0 +1,270 @@
+
+$FreeBSD$
+
+--- ../src/solaris/classes/sun/awt/motif/font.properties.bsd.orig	Mon Aug 27 21:05:08 2001
++++ ../src/solaris/classes/sun/awt/motif/font.properties.bsd	Mon Aug 27 21:06:33 2001
+@@ -1,7 +1,7 @@
+ #
+-# @(#)font.properties.linux	1.3 00/03/23
++# @(#)font.properties.linux	1.7 01/04/21
+ #
+-# Copyright 1997 by Sun Microsystems, Inc.,
++#  Copyright 1997-2001 by Sun Microsystems, Inc.,
+ # 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
+ # All rights reserved.
+ #
+@@ -13,139 +13,80 @@
+ #
+ 
+ #
+-# Linux version derived from the version for SunOS 5.5.1 Notice that
++# FreeBSD version derived from the Linux version derived from the
++# version for SunOS 5.5.1 Notice that
+ # we use the .ttf files shipped in the JDK distribution.
+ #
+ 
+ # Serif font definition
+ #
+ serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
+-serif.1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#serif.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-serif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#serif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+-serif.italic.1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#serif.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-serif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#serif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
+-serif.bold.1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#serif.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-serif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#serif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
+-serif.bolditalic.1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#serif.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-serif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#serif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ # SansSerif font definition
+ #
+ sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+-sansserif.1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#sansserif.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-sansserif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#sansserif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+-sansserif.italic.1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#sansserif.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-sansserif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#sansserif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+-sansserif.bold.1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#sansserif.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-sansserif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#sansserif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+-sansserif.bolditalic.1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#sansserif.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-sansserif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#sansserif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ # Monospaced font definition
+ #
+ monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-monospaced.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#monospaced.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-monospaced.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#monospaced.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+-monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-monospaced.italic.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#monospaced.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-monospaced.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++monospaced.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
++#monospaced.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-monospaced.bold.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#monospaced.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-monospaced.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#monospaced.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+-monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-monospaced.bolditalic.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#monospaced.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-monospaced.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
++#monospaced.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ # Dialog font definition
+ #
+ dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+-dialog.1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#dialog.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-dialog.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#dialog.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+-dialog.italic.1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#dialog.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-dialog.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#dialog.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+-dialog.bold.1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#dialog.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-dialog.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#dialog.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+-dialog.bolditalic.1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#dialog.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-dialog.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#dialog.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ # DialogInput font definition
+ #
+ dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-dialoginput.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#dialoginput.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-dialoginput.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#dialoginput.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+-dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-dialoginput.italic.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#dialoginput.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-dialoginput.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++dialoginput.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
++#dialoginput.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-dialoginput.bold.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#dialoginput.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-dialoginput.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++#dialoginput.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+-dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-dialoginput.bolditalic.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+-#replace .1 font line if you have zapf fonts
+-#dialoginput.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+-dialoginput.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
++dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
++#dialoginput.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+ 
+ # Default font definition
+ #
+@@ -175,34 +116,19 @@
+ #  has can be judged with the isCovered() method of instance of SpecialSymbols.
+ #
+ fontcharset.serif.0=sun.io.CharToByteISO8859_1
+-fontcharset.serif.1=sun.io.CharToByteISO8859_1
+-#replace .1 font line if you have zapf fonts
+-#fontcharset.serif.1=sun.awt.motif.CharToByteX11Dingbats
+-fontcharset.serif.2=sun.awt.CharToByteSymbol
++fontcharset.serif.1=sun.awt.CharToByteSymbol
+ 
+ fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+-fontcharset.sansserif.1=sun.io.CharToByteISO8859_1
+-#replace .1 font line if you have zapf fonts
+-#fontcharset.sansserif.1=sun.awt.motif.CharToByteX11Dingbats
+-fontcharset.sansserif.2=sun.awt.CharToByteSymbol
++fontcharset.sansserif.1=sun.awt.CharToByteSymbol
+ 
+ fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+-fontcharset.monospaced.1=sun.io.CharToByteISO8859_1
+-#replace .1 font line if you have zapf fonts
+-#fontcharset.monospaced.1=sun.awt.motif.CharToByteX11Dingbats
+-fontcharset.monospaced.2=sun.awt.CharToByteSymbol
++fontcharset.monospaced.1=sun.awt.CharToByteSymbol
+ 
+ fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+-fontcharset.dialog.1=sun.io.CharToByteISO8859_1
+-#replace .1 font line if you have zapf fonts
+-#fontcharset.dialog.1=sun.awt.motif.CharToByteX11Dingbats
+-fontcharset.dialog.2=sun.awt.CharToByteSymbol
++fontcharset.dialog.1=sun.awt.CharToByteSymbol
+ 
+ fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+-fontcharset.dialoginput.1=sun.io.CharToByteISO8859_1
+-#replace .1 font line if you have zapf fonts
+-#fontcharset.dialoginput.1=sun.awt.motif.CharToByteX11Dingbats
+-fontcharset.dialoginput.2=sun.awt.CharToByteSymbol
++fontcharset.dialoginput.1=sun.awt.CharToByteSymbol
+ 
+ #replace font line if you have zapf fonts
+ #fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1
+@@ -232,16 +158,16 @@
+ -b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
+ 
+ fontset.sansserif.italic=\
+--b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
++-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+ 
+ fontset.sansserif.bold=\
+--b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
++-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+ 
+ fontset.sansserif.bolditalic=\
+--b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
++-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+ 
+ fontset.sansserif.plain=\
+--b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
++-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+ 
+ fontset.monospaced.italic=\
+ -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+@@ -256,16 +182,16 @@
+ -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+ 
+ fontset.dialog.italic=\
+--b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
++-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+ 
+ fontset.dialog.bold=\
+--b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
++-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+ 
+ fontset.dialog.bolditalic=\
+--b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
++-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+ 
+ fontset.dialog.plain=\
+--b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
++-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+ 
+ fontset.dialoginput.italic=\
+ -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+@@ -285,5 +211,5 @@
+ 
+ #
+ fontset.default=\
+--b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
++-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+ #
diff --git a/java/jdk16/files/patch-..::src::solaris::native::sun::awt::awt_util.c b/java/jdk16/files/patch-..::src::solaris::native::sun::awt::awt_util.c
new file mode 100644
index 000000000000..29c54c966355
--- /dev/null
+++ b/java/jdk16/files/patch-..::src::solaris::native::sun::awt::awt_util.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- ../src/solaris/native/sun/awt/awt_util.c	2001/08/27 10:49:30	1.1
++++ ../src/solaris/native/sun/awt/awt_util.c	2001/08/27 10:49:41
+@@ -27,7 +27,6 @@
+ #include <Xm/Form.h>
+ #include <Xm/RowColumn.h>
+ #include <Xm/MwmUtil.h>
+-#include <Xm/BaseClassI.h>
+ 
+ 
+ #include <jni.h>
diff --git a/java/jdk16/files/patch-aa b/java/jdk16/files/patch-aa
deleted file mode 100644
index d773e053bc47..000000000000
--- a/java/jdk16/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
---- makefiles/Defs-freebsd.gmk	2000/10/13 00:16:56	1.1
-+++ makefiles/Defs-freebsd.gmk	2000/10/13 00:20:36
-@@ -59,11 +59,11 @@
- GCC_STYLE	= -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
- GCC_WARNINGS	= -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
- CFLAGS_COMMON   = $(GCC_WARNINGS) -pipe
--CFLAGS_OPT      = $(POPT) -fomit-frame-pointer # -mcpu=i686
--CFLAGS_DBG      = -g
-+CFLAGS_OPT      = $(POPT) $(SYS_CFLAGS) #-fomit-frame-pointer # -mcpu=i686
-+CFLAGS_DBG      = -g3
- CXXFLAGS_COMMON = $(GCC_WARNINGS) -pipe -DFD_SETSIZE=2048
--CXXFLAGS_OPT	= $(POPT) -fomit-frame-pointer # -mcpu=i686
--CXXFLAGS_DBG	= -g
-+CXXFLAGS_OPT	= $(POPT) $(SYS_CFLAGS) #-fomit-frame-pointer # -mcpu=i686
-+CXXFLAGS_DBG	= -g3
- endif
- 
- ifneq ($(CC_VERSION), gcc)
-@@ -232,7 +232,7 @@
-     _OPT = -xO4
- else
- ifneq ($(ARCH), alpha)
--    _OPT = -O2
-+    _OPT = #-O2
- endif
- endif
-     CPPFLAGS_DBG    += -DLOGGING 
-@@ -248,7 +248,7 @@
-     _OPT = -xO2
- else
- ifneq ($(ARCH), alpha)
--    _OPT = -O2
-+    _OPT = #-O2
- endif
- endif
- endif
diff --git a/java/jdk16/files/patch-common::Defs-bsd.gmk b/java/jdk16/files/patch-common::Defs-bsd.gmk
new file mode 100644
index 000000000000..9c15fd2f8448
--- /dev/null
+++ b/java/jdk16/files/patch-common::Defs-bsd.gmk
@@ -0,0 +1,21 @@
+
+$FreeBSD$
+
+--- common/Defs-bsd.gmk.orig	Mon Aug 27 13:56:54 2001
++++ common/Defs-bsd.gmk	Mon Aug 27 14:01:42 2001
+@@ -220,11 +220,11 @@
+ else # ARCH
+ CFLAGS_COMMON   = $(GCC_WARNINGS)
+ endif # ARCH
+-CFLAGS_OPT      = $(POPT)
+-CFLAGS_DBG      = -g
++CFLAGS_OPT      = $(POPT) $(SYS_CFLAGS)
++CFLAGS_DBG      = -g3
+ CXXFLAGS_COMMON = $(GCC_WARNINGS)
+-CXXFLAGS_OPT	= $(POPT)
+-CXXFLAGS_DBG	= -g
++CXXFLAGS_OPT	= $(POPT) $(SYS_CFLAGS)
++CXXFLAGS_DBG	= -g3
+ 
+ CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \
+ 		  -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -D_LITTLE_ENDIAN -DLOGGING
diff --git a/java/jdk16/pkg-descr b/java/jdk16/pkg-descr
index e403d4ee0edd..f923cbfd2320 100644
--- a/java/jdk16/pkg-descr
+++ b/java/jdk16/pkg-descr
@@ -1,10 +1,10 @@
-This is the latest patchset from the Java 2 FreeBSD porting project. This port
-allows you to easily build native JDK1.2.2 for FreeBSD.
+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.
 
-Please note that due to the current Sun licensing policy, the resulting binaries
-couln't be distributed and you are only permitted to use/hack it personally.
-Due to the same reasons you have to manually fetch source code and patchset 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.
+Due to the same reasons you have to manually fetch the source code and patchset
+for FreeBSD.
 
 WWW: http://www.freebsd.org/java/
      http://www.eyesbeyond.com/freebsddom/java/index.html
diff --git a/java/jdk16/pkg-message b/java/jdk16/pkg-message
index f3ce3f9dba1b..1078eecc4824 100644
--- a/java/jdk16/pkg-message
+++ b/java/jdk16/pkg-message
@@ -1,157 +1,966 @@
-                       Sun Microsystems, Inc.  
-                   Binary Code License Agreement
-
-READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL 
-LICENSE TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE 
-OPENING THE SOFTWARE MEDIA PACKAGE.  BY OPENING THE SOFTWARE 
-MEDIA PACKAGE, YOU AGREE TO THE TERMS OF THIS AGREEMENT.  IF 
-YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, INDICATE YOUR 
-ACCEPTANCE OF THESE TERMS BY SELECTING THE "ACCEPT" BUTTON AT 
-THE END OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO ALL THESE 
-TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE OF 
-PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED 
-ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END OF THIS
-AGREEMENT.
-
-1.  LICENSE TO USE.  Sun grants you a non-exclusive and
-non-transferable license for the internal use only of the accompanying
-software and documentation and any error corrections provided by Sun
-(collectively "Software"), by the number of users and the class of
-computer hardware for which the corresponding fee has been paid.
-
-2.  RESTRICTIONS Software is confidential and copyrighted. Title to
-Software and all associated intellectual property rights is retained
-by Sun and/or its licensors.  Except as specifically authorized in any
-Supplemental License Terms, you may not make copies of Software, other
-than a single copy of Software for archival purposes.  Unless
-enforcement is prohibited by applicable law, you may not modify,
-decompile, reverse engineer Software.  Software is not designed or
-licensed for use in on-line control of aircraft, air traffic, aircraft
-navigation or aircraft communications; or in the design, construction,
-operation or maintenance of any nuclear facility.  You warrant that
-you will not use Software for these purposes.  No right, title or 
-interest in or to any trademark, service mark, logo or trade name of 
-Sun or its licensors is granted under this Agreement.
-
-3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety
-(90) days from the date of purchase, as evidenced by a copy of the
-receipt, the media on which Software is furnished (if any) will be
-free of defects in materials and workmanship under normal use.  Except
-for the foregoing, Software is provided "AS IS".  Your exclusive
-remedy and Sun's entire liability under this limited warranty will be
-at Sun's option to replace Software media or refund the fee paid for
-Software.
-
-4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, 
-ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
-INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO 
-THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
-
-5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, 
-IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
-PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL 
-OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF
-LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO 
-USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.  In no event will Sun's liability to you, whether in
-contract, tort (including negligence), or otherwise, exceed the amount
-paid by you for Software under this Agreement.  The foregoing
-limitations will apply even if the above stated warranty fails of its
-essential purpose.
-
-6.  Termination.  This Agreement is effective until terminated.  You
-may terminate this Agreement at any time by destroying all copies of
-Software.  This Agreement will terminate immediately without notice
-from Sun if you fail to comply with any provision of this Agreement.
-Upon Termination, you must destroy all copies of Software.
-
-7.  Export Regulations.  All Software and technical data delivered
-under this Agreement are subject to US export control laws and may be
-subject to export or import regulations in other countries.  You agree
-to comply strictly with all such laws and regulations and acknowledge
-that you have the responsibility to obtain such licenses to export,
-re-export, or import as may be required after delivery to you.
-
-8.  U.S. Government Restricted Rights.  Use, duplication, or
-disclosure by the U.S. Government is subject to restrictions set forth
-in this Agreement and as provided in DFARS 227.7202-1 (a) and
-227.7202-3(a) (1995), DFARS 252.227-7013 (c)(1)(ii)(Oct 1988), FAR
-12.212 (a) (1995), FAR 52.227-19 (June 1987), or FAR 52.227-14(ALT
-III) (June 1987), as applicable.
-
-9.  Governing Law.  Any action related to this Agreement will be
-governed by California law and controlling U.S. federal law.  No
-choice of law rules of any jurisdiction will apply.
-
-10.  Severability. If any provision of this Agreement is held to be
-unenforceable, This Agreement will remain in effect with the provision
-omitted, unless omission would frustrate the intent of the parties, in
-which case this Agreement will immediately terminate.
-
-11.  Integration.  This Agreement is the entire agreement between you
-and Sun relating to its subject matter.  It supersedes all prior or
-contemporaneous oral or written communications, proposals,
-representations and warranties and prevails over any conflicting or
-additional terms of any quote, order, acknowledgment, or other
-communication between the parties relating to its subject matter
-during the term of this Agreement.  No modification of this Agreement
-will be binding, unless in writing and signed by an authorized
-representative of each party.
-
-For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio
-Road, Palo Alto, California 94303
-
-           JAVA(TM) 2 SDK, STANDARD EDITION, VERSION 1.2.2 
-                    SUPPLEMENTAL LICENSE TERMS
-
-These supplemental terms ("Supplement") add to the terms of the Binary
-Code License Agreement ("Agreement").  Capitalized terms not defined
-herein shall have the same meanings ascribed to them in the Agreement.
-The Supplement terms shall supersede any inconsistent or conflicting
-terms in the Agreement.
-
-1. Limited License Grant. Sun grants to you a non-exclusive,
-non-transferable limited license to use the Software without fee for
-evaluation of the Software and for development of Java(TM)  applets and
-applications provided that you: (i) may not re-distribute the Software
-in whole or in part, either separately or included with a
-product. (ii) may not create, or authorize your licensees to create
-additional classes, interfaces, or subpackages that are contained in
-the "java" or "sun" packages or similar as specified by Sun in any
-class file naming convention; and (iii) agree to the extent Programs
-are developed which utilize the Windows 95/98 style graphical user
-interface or components contained therein, such applets or
-applications may only be developed to run on a Windows 95/98 or
-Windows NT platform.  Refer to the Java 2 Runtime Environment Version
-1.2.2 binary code license
-(http://java.sun.com/products/jdk/1.2/jre/LICENSE) for the availability
-of runtime code which may be distributed with Java applets and
-applications.  
-
-2.  Java Platform Interface. In the event that Licensee creates an 
-additional API(s) which: (i) extends the functionality of a
-Java Environment; and, (ii) is exposed to third party software
-developers for the purpose of developing additional software which
-invokes such additional API, Licensee must promptly publish broadly an
-accurate specification for such API for free use by all developers.
-
-3. Trademarks and Logos. This Agreement does not authorize Licensee to
-use any Sun name, trademark or logo. Licensee acknowledges as between
-it and Sun that Sun owns the Java trademark and all Java-related
-trademarks, logos and icons including the Coffee Cup and Duke ("Java
-Marks") and agrees to comply with the Java Trademark Guidelines at
-http://java.sun.com/trademarks.html.
-
-4.  High Risk Activities.  Notwithstanding Section 2, with respect to
-high risk activities, the following language shall apply: the Software
-is not designed or intended for use in on-line control of aircraft,
-air traffic, aircraft navigation or aircraft communications; or in the
-design, construction, operation or maintenance of any nuclear
-facility. Sun disclaims any express or implied warranty of fitness for
-such uses.
-
-5.  Source Code.  Software may contain source code that is provided
-solely for reference purposes pursuant to the terms of this Agreement.
+SUN COMMUNITY SOURCE LICENSE
+Version 2.3
+(Rev. Date February 22, 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 
+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. 
+           
+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 
+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 
+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 
+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 
+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 
+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
+
+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.
+
+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.
+
+
+ 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."”
+
+
+
+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."”
+
+
+
+ATTACHMENT B
+
+Java(tm) 2 SDK Technology
+
+Description of "Technology"
+
+Java(tm) 2 SDK Technology v.1.3.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 
+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 
+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.
+
+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 
+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.
+
+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.
+
 
 
diff --git a/java/jdk16/pkg-plist b/java/jdk16/pkg-plist
index 06bd85b853ae..8154da9965f1 100644
--- a/java/jdk16/pkg-plist
+++ b/java/jdk16/pkg-plist
@@ -1,16 +1,21 @@
 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
 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
@@ -33,6 +38,10 @@ 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
@@ -45,6 +54,8 @@ 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
+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
@@ -68,6 +79,10 @@ 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/policytool
 %%DEBUG:%%jdk%%JDK_VERSION%%/bin/policytool_g
 jdk%%JDK_VERSION%%/bin/rmic
@@ -122,6 +137,7 @@ 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/example1.html
+jdk%%JDK_VERSION%%/demo/applets/Blink/Blink$1.class
 jdk%%JDK_VERSION%%/demo/applets/Blink/Blink.class
 jdk%%JDK_VERSION%%/demo/applets/Blink/Blink.java
 jdk%%JDK_VERSION%%/demo/applets/Blink/example1.html
@@ -326,9 +342,81 @@ jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images/jpgIcon.jpg
 jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src/ExampleFileFilter.java
 jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src/ExampleFileView.java
 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/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/Metalworks/HelpFiles/back.gif
 jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/credits.html
 jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/duke.gif
@@ -366,6 +454,7 @@ jdk%%JDK_VERSION%%/demo/jfc/Notepad/README.txt
 jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/Notepad.properties
 jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/Notepad_fr.properties
 jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/Notepad_sv.properties
+jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/Notepad_zh_CN.properties
 jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/copy.gif
 jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/cut.gif
 jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/new.gif
@@ -391,8 +480,10 @@ jdk%%JDK_VERSION%%/demo/jfc/Stylepad/Stylepad.jar
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Notepad.properties
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Notepad_fr.properties
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Notepad_sv.properties
+jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Notepad_zh_CN.properties
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Stylepad.properties
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Stylepad_sv.properties
+jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Stylepad_zh_CN.properties
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/alice.gif
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/bold.gif
 jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/bullets.gif
@@ -421,160 +512,41 @@ jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/README.txt
 jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/SwingApplet.html
 jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/SwingApplet.jar
 jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/src/SwingApplet.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/Constitution.txt
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/README.txt
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/README12.txt
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/SwingSet.jar
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/SwingSetApplet.html
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/SwingSetApplet2.html
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/ToolBar.txt
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/Wonderland.txt
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/bugfixers.html
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/example.html
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/AboutBorder.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/AboutSwing.jpg
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/BigTiger.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/Copyright.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/COPYRIGHT
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/banana.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/broccoli.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/burger.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/cake.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/cantaloupe.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/carrot.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/corn.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/donut.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/fries.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/grapes.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/hotdog.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/icecream.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/peach.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/peas.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/pie.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/pizza.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/radish.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/softdrink.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/treat.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food/watermelon.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/misc/cab.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/misc/fish.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/misc/horn.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/misc/moon.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/misc/sun.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/SmallTiger.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/COPYRIGHT
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/bulb1.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/bulb2.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/bulb3.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/left.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/leftDown.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/leftRollover.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/radio.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/radioPressed.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/radioSelected.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/right.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/rightDown.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice/rightRollover.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/buttonImage2.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/buttonImage3.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/buttonImage4.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/copy.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/cow.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/cowSmall.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/cut.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/document.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/dot.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/duke2.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/dukeMagnify.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/dukeSnooze.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/dukeWave.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/dukeWaveRed.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/folder.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/gifIcon.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/jpgIcon.jpg
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/bl.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/bldn.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/bm.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/bmdn.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/br.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/brdn.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/c.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/cdn.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/ml.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/mldn.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/mr.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/mrdn.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/tl.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/tldn.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/tm.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/tmdn.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/toggle.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/toggledn.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/tr.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout/trdn.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/list/a1.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/list/a1d.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/list/a2.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/list/a2d.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/list/a3.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/list/a3d.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/list/a4.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/list/a4d.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/list/a5.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/list/a5d.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/new.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/noDot.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/open.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/paste.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people/amy.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people/ges.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people/jag.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people/jeff.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people/mathew.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people/nathan.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people/phil.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people/pl.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people/rich.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people/rick.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people/tim.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people/tom.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/redDot.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/save.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/scrollpane/column.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/scrollpane/corner.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/scrollpane/header.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/swing-64.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/swing.small.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/swingLabelSmall.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/swirl.gif
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/BorderPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/BorderedPanePanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/ButtonPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/CheckboxPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/ComboBoxPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/ComponentOrientationChanger.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/DebugGraphicsPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/DirectionPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/ExampleFileFilter.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/ExampleFileView.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/HtmlPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/InternalWindowPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/LabelPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/LayoutControlPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/ListPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/ProgressPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/RadioButtonPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/ScrollPanePanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/SliderPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/SplitPanePanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/SwingSet.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/SwingSetApplet.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/TablePanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/TextPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/ToggleButtonPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/ToolTipPanel.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/TreeCombo.java
-jdk%%JDK_VERSION%%/demo/jfc/SwingSet/src/TreePanel.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/src/AquaTheme.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/BezierAnimationPanel.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ButtonDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/CharcoalTheme.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/CodeViewer.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ColorChooserDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ComboBoxDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ContrastTheme.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/DemoModule.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/DirectionPanel.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/EmeraldTheme.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ExampleFileFilter.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ExampleFileView.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/FileChooserDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/HtmlDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/InternalFrameDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/LayoutControlPanel.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ListDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/OptionPaneDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/Permuter.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ProgressBarDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/RubyTheme.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ScrollPaneDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/SliderDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/SplitPaneDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/SwingSet2.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/SwingSet2Applet.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/TabbedPaneDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/TableDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ToolTipDemo.java
+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/TreeDemo.java
 jdk%%JDK_VERSION%%/demo/jfc/TableExample/README.txt
 jdk%%JDK_VERSION%%/demo/jfc/TableExample/TableExample.jar
 jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/JDBCAdapter.java
@@ -585,28 +557,49 @@ jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableExample3.java
 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/bsd/byteorder_md.h
+jdk%%JDK_VERSION%%/include-old/bsd/gc_md.h
+jdk%%JDK_VERSION%%/include-old/bsd/hpi_md.h
+jdk%%JDK_VERSION%%/include-old/bsd/io_md.h
+jdk%%JDK_VERSION%%/include-old/bsd/jawt_md.h
+jdk%%JDK_VERSION%%/include-old/bsd/jmath_md.h
+jdk%%JDK_VERSION%%/include-old/bsd/jvm_md.h
+jdk%%JDK_VERSION%%/include-old/bsd/miscdefs_md.h
+jdk%%JDK_VERSION%%/include-old/bsd/path_md.h
+jdk%%JDK_VERSION%%/include-old/bsd/sysmacros_md.h
+jdk%%JDK_VERSION%%/include-old/bsd/timeval_md.h
+jdk%%JDK_VERSION%%/include-old/bsd/typedefs_md.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/jmath_md.h
-jdk%%JDK_VERSION%%/include-old/freebsd/jni_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
@@ -615,10 +608,9 @@ 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/jcov.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/jni.h
 jdk%%JDK_VERSION%%/include-old/jvm.h
 jdk%%JDK_VERSION%%/include-old/jvmdi.h
 jdk%%JDK_VERSION%%/include-old/jvmpi.h
@@ -641,16 +633,41 @@ 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/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
+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
+jdk%%JDK_VERSION%%/jre/bin/awt_robot
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/appletviewer
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/extcheck
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/idlj
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jar
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jarsigner
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javac
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javadoc
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javah
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javap
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jdb
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/keytool
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/native2ascii
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjava
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjavac
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjdb
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/policytool
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmic
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmid
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmiregistry
+jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/serialver
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/tnameserv
 jdk%%JDK_VERSION%%/jre/bin/java
 jdk%%JDK_VERSION%%/jre/bin/keytool
@@ -665,10 +682,10 @@ 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/iiimp.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.zh
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiBold.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiItalic.ttf
 jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightItalic.ttf
@@ -685,55 +702,44 @@ 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
-jdk%%JDK_VERSION%%/jre/lib/i386/classic/libjvm.so.1.2.2
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/classic/libjvm_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/green_threads/libhpi.so
-jdk%%JDK_VERSION%%/jre/lib/i386/green_threads/libhpi.so.1.2.2
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/green_threads/libhpi_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc.so.1.2.2
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libagent.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libagent.so.1.2.2
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libagent_g.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libaudio.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libaudio.so.1.2.2
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libaudio_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libawt.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libawt.so.1.2.2
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libawt_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libcmm.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libcmm.so.1.2.2
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libcmm_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr.so.1.2.2
 %%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/libfontmanager.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager.so.1.2.2
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libhprof.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libhprof.so.1.2.2
 %%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/libjava.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libjava.so.1.2.2
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_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/libjpeg.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg.so.1.2.2
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg_g.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libmath.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libmath.so.1.2.2
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libmath_g.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
-jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image.so.1.2.2
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libnet.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libnet.so.1.2.2
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libnet_g.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libsunwjdga.so
-jdk%%JDK_VERSION%%/jre/lib/i386/libsunwjdga.so.1.2.2
-%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libsunwjdga_g.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
-jdk%%JDK_VERSION%%/jre/lib/i386/libzip.so.1.2.2
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libzip_g.so
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/cursors.properties
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/invalid32x32.gif
@@ -743,33 +749,54 @@ 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
+jdk%%JDK_VERSION%%/jre/lib/jvm.cfg
 jdk%%JDK_VERSION%%/jre/lib/jvm.hprof.txt
-jdk%%JDK_VERSION%%/jre/lib/locale/ja/app-defaults/XApplication
-jdk%%JDK_VERSION%%/jre/lib/locale/ja_JP.PCK/app-defaults/XApplication
-jdk%%JDK_VERSION%%/jre/lib/locale/ja_JP.UTF-8/app-defaults/XApplication
+jdk%%JDK_VERSION%%/jre/lib/jvm.jcov.txt
+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/cacerts
 jdk%%JDK_VERSION%%/jre/lib/security/java.policy
 jdk%%JDK_VERSION%%/jre/lib/security/java.security
+jdk%%JDK_VERSION%%/jre/lib/sunrsasign.jar
+jdk%%JDK_VERSION%%/jre/lib/tzmappings
 jdk%%JDK_VERSION%%/lib/dt.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/jar.1
+jdk%%JDK_VERSION%%/man/man1/jarsigner.1
+jdk%%JDK_VERSION%%/man/man1/java.1
+jdk%%JDK_VERSION%%/man/man1/javac.1
+jdk%%JDK_VERSION%%/man/man1/javadoc.1
+jdk%%JDK_VERSION%%/man/man1/javah.1
+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/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/tnameserv.1
 jdk%%JDK_VERSION%%/src.jar
-@exec	mkdir -p %D/share/java/classes
-@exec	mkdir -p %D/share/doc/java
-@unexec	rmdir %D/share/java/classes 2>/dev/null || true
-@unexec	rmdir %D/share/java 2>/dev/null || true
-@unexec	rmdir %D/share/doc/java 2>/dev/null || true
-@exec	%D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # JDK%%JDK_VERSION%%"
-@unexec	%D/bin/unregistervm JDK%%JDK_VERSION%%
+@exec   mkdir -p %D/share/java/classes
+@exec   mkdir -p %D/share/doc/java
+@unexec rmdir %D/share/java/classes 2>/dev/null || true
+@unexec rmdir %D/share/java 2>/dev/null || true
+@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@exec   %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # JDK%%JDK_VERSION%%"
+@unexec %D/bin/unregistervm 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
+@dirrm jdk%%JDK_VERSION%%/jre/plugin
 @dirrm jdk%%JDK_VERSION%%/jre/lib/security
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja_JP.UTF-8/app-defaults
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja_JP.UTF-8
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja_JP.PCK/app-defaults
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja_JP.PCK
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/app-defaults
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale
 @dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors
 @dirrm jdk%%JDK_VERSION%%/jre/lib/images
 @dirrm jdk%%JDK_VERSION%%/jre/lib/i386/green_threads
@@ -779,28 +806,24 @@ jdk%%JDK_VERSION%%/src.jar
 @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/applet
 @dirrm jdk%%JDK_VERSION%%/jre/lib
 @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/bsd
+@dirrm jdk%%JDK_VERSION%%/include-old/bsd
 @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/SwingSet/src
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/scrollpane
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/people
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/list
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/layout
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/WebSpice
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/misc
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub/food
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images/ImageClub
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet/images
-@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet
+@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
@@ -818,7 +841,23 @@ jdk%%JDK_VERSION%%/src.jar
 @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