- update to build 15

- switch to the JRL licensed src. why? because it will allow me to complete
the port. OpenJDK/GPLv2 src isn't complete and the parts that we don't have
are only released in binary form with a defend and indemnify clause. When
all of the jdk is GPLv2 I will switch back to OpenJDK/GPLv2 src.
- copy the Linux src files for the rest of the jdk so i can begin to patch
them. One src file is based on solaris code since that suits us better as
a starting point.

devel/jdk/1.7/Makefile

@@ -1,40 +1,41 @@
-# $OpenBSD: Makefile,v 1.2 2007/05/09 15:48:31 kurt Exp $
+# $OpenBSD: Makefile,v 1.3 2007/07/13 22:52:35 kurt Exp $
 
 SHARED_ONLY=		Yes
 ONLY_FOR_ARCHS= 	i386 amd64
 
 COMMENT=		"Java2(TM) Standard Edition Dev Kit v${V}"
 V=			1.7.0
-B=			b12
-DISTNAME=		openjdk-7-ea-src-${B}-06_may_2007
-PKGNAME=		jdk-${V}p0
+B=			b15
+D=			05_jul_2007
+DISTFILES=		jdk-7-ea-src-${B}-jrl-${D}.jar \
+			jdk-7-ea-bin-${B}-jrl-${D}.jar \
+			jdk-7-ea-mozilla_headers-${B}-unix-${D}.jar
+PKGNAME=		jdk-${V}.${B}
 
 CATEGORIES=		devel/jdk java
 
-HOMEPAGE=		http://openjdk.java.net/
-MASTER_SITES=		http://www.java.net/download/openjdk/40ec4ed263a6dfce13b8cf18fa046058/jdk7/promoted/${B}/
-EXTRACT_SUFX=		.zip
+HOMEPAGE=		https://jdk7.dev.java.net/
+MASTER_SITES=		http://www.java.net/download/jdk7/
 
 MAINTAINER=		Kurt Miller <kurt@openbsd.org>
 
-# GPL2
-# since this currently copies the SCSL binaries into the package
-# we can't set them all to yes. when the full jdk is released
-# we can.
-PERMIT_PACKAGE_CDROM=	"SCSL"
-PERMIT_PACKAGE_FTP=	"SCSL"
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=	Yes
+# Java Research License
+# http://www.java.net/jrl.csp
+PERMIT_PACKAGE_CDROM=	"JRL"
+PERMIT_PACKAGE_FTP=	"JRL"
+PERMIT_DISTFILES_CDROM= "JRL"
+PERMIT_DISTFILES_FTP=	"JRL"
 
 NO_REGRESS=		Yes
 
-BUILD_DEPENDS=		:jdk->=1.5.0p30:devel/jdk/1.5
+BUILD_DEPENDS=		:jdk->=1.5.0.11:devel/jdk/1.5 \
+			::archivers/zip \
+			::archivers/unzip
 USE_MOTIF=		openmotif
 MODULES=		converters/libiconv
-WANTLIB=		X11 Xext Xi Xmu Xp Xt Xtst c m ossaudio pthread \
+WANTLIB=		X11 Xext Xi Xp Xt Xtst c m ossaudio pthread \
 			stdc++ z
 
-USE_ZIP=		Yes
 USE_GMAKE=		Yes
 
 ALT_BOOTDIR=		${LOCALBASE}/jdk-1.5.0
@@ -49,7 +50,7 @@ JDKHOME=		jdk-${V}
 
 SUBST_VARS=		JDKHOME
 
-WRKDIST=		${WRKDIR}/openjdk
+WRKDIST=		${WRKDIR}
 WRKBUILD=		${WRKDIST}/hotspot/make
 JVMARCH=		${MACHINE_ARCH:S/i386/i486/}
 OUTPUTDIR1=		${WRKDIST}/hotspot/build/bsd/bsd_${JVMARCH}_compiler1
@@ -64,15 +65,51 @@ PKG_ARGS+=		-Dclient_vm=1
 PKG_ARGS+=		-Dclient_vm=0
 .endif
 
-COPYDIRS=		hotspot/src/os/linux/launcher \
-			hotspot/src/os/linux/vm \
-			hotspot/src/os_cpu/linux_amd64/vm \
-			hotspot/src/os_cpu/linux_i486/vm \
-			hotspot/build/linux \
-			hotspot/build/linux/makefiles
+COPYDIRS=	hotspot/src/os/linux/launcher \
+		hotspot/src/os/linux/vm \
+		hotspot/src/os_cpu/linux_amd64/vm \
+		hotspot/src/os_cpu/linux_i486/vm \
+		hotspot/build/linux \
+		hotspot/build/linux/makefiles \
+		install/make/installer/binaries/linux \
+		j2se/src/linux
 
-# create initial bsd dirs from linux dirs
+COPYFILES=	control/make/common/Defs-linux.gmk \
+		deploy/make/common/Defs-linux.gmk \
+		deploy/make/common/Rules-linux.gmk \
+		deploy/make/plugin/common/Defs-linux.gmk \
+		install/make/common/Defs-linux.gmk \
+		j2se/make/com/sun/tools/attach/mapfile-linux \
+		j2se/make/common/Defs-linux.gmk \
+		j2se/make/common/shared/Defs-linux.gmk \
+		j2se/make/java/nio/mapfile-linux \
+		j2se/make/netbeans/common/architectures/name-Linux.properties \
+		j2se/make/sun/awt/mapfile-vers-linux \
+		j2se/make/tools/sharing/classlist.linux \
+		j2se/src/closed/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.properties \
+		j2se/src/closed/solaris/native/com/sun/media/sound/engine/HAE_API_LinuxOS.c \
+		j2se/src/closed/solaris/native/com/sun/media/sound/engine/HAE_API_LinuxOS_Capture.c \
+		j2se/src/solaris/classes/java/lang/UNIXProcess.java.linux \
+		j2se/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.properties \
+		j2se/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java \
+		j2se/src/solaris/hpi/include/largefile_linux.h \
+		j2se/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c
+
+do-extract:
+	@mkdir ${WRKDIR}/tmp && \
+		${CC} ${CFLAGS} -o ${WRKDIR}/tmp/x_x2zip ${FILESDIR}/x_x2zip.c
+.for jar in ${DISTFILES}
+	@cd ${WRKDIR}/tmp && \
+		unzip -qo ${FULLDISTDIR}/${jar} X_X && \
+		./x_x2zip "YES I ACCEPT THE CLICK THROUGH LICENSE.  " X_X && \
+		cd ${WRKDIR} && \
+		unzip -q ${WRKDIR}/tmp/X_X.zip -x */lib*.so
+.endfor
+	@rm -rf ${WRKDIR}/tmp
+
+# create initial bsd src from linux src (except for threads_solaris.c)
 pre-patch:
+	@chmod -R +w ${WRKDIST}/hotspot
 	@for d in ${COPYDIRS}; do \
 		mkdir -p `echo ${WRKDIST}/$$d | sed 's/linux/bsd/g;'`; \
 		cd ${WRKDIST}/$$d; \
@@ -83,7 +120,13 @@ pre-patch:
 			fi; \
 		done; \
 	done
-	@chmod -R +w ${WRKDIST}/hotspot
+	@for f in ${COPYFILES}; do \
+		t=`echo $$f | sed 's/linux/bsd/g; s/Linux/Bsd/g'`; \
+		sed 's/linux/bsd/g; s/Linux/Bsd/g' < ${WRKDIST}/$$f > ${WRKDIST}/$$t; \
+	done
+	@sed 's/solaris/bsd/g; s/Solaris/Bsd/g' \
+		< ${WRKDIST}/j2se/src/solaris/hpi/native_threads/src/threads_solaris.c \
+		> ${WRKDIST}/j2se/src/solaris/hpi/native_threads/src/threads_bsd.c
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${JDKHOME}

devel/jdk/1.7/distinfo

@@ -1,5 +1,15 @@
-MD5 (openjdk-7-ea-src-b12-06_may_2007.zip) = xrDr4CAi3aSBKFtjzSr1rg==
-RMD160 (openjdk-7-ea-src-b12-06_may_2007.zip) = IXQcZCimS25IEE+H2E0/rdE/8js=
-SHA1 (openjdk-7-ea-src-b12-06_may_2007.zip) = Vt3rX9dA2Yl/uKVWXtM7YCl6S7I=
-SHA256 (openjdk-7-ea-src-b12-06_may_2007.zip) = FjCaqA8rHYLLJWxkSRxWH9g/x6fMv8sGZoSriWyBMcw=
-SIZE (openjdk-7-ea-src-b12-06_may_2007.zip) = 81838731
+MD5 (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = 2z1HN/o7TQYmEmii6KuVrg==
+MD5 (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = 9fsvaJhKATFbEuYqX2tMgg==
+MD5 (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = J6aBuW5tWRIwkwkaAc3P3Q==
+RMD160 (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = PXd7WPhNiYBAMmUQ7/rQthtVRVA=
+RMD160 (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = tQ2ENIetrdrZwc2rWsPPR4QeaU0=
+RMD160 (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = cELHS3YwGGitLK0oSRd+VIkypD4=
+SHA1 (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = o6eEa6tvU0wZ/f+I4TiDa9atSGY=
+SHA1 (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = HzQ7uPYKJX1l23FGWhIVPel1g7A=
+SHA1 (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = qbPg9c6rvNennLRHWf+ytl4r7lA=
+SHA256 (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = ObwO+meXKjZ78j6P3ViWoZyDJ381+aq6voCpAAQLRKQ=
+SHA256 (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = VUlOcj0hjEf2+rheL4Lm/aaA7zTDLoY51EfINX6s/k4=
+SHA256 (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = KtlZp09CBFU21JLXfAs7ZuZX/KvxpnjC8+awj36ReZw=
+SIZE (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = 389618
+SIZE (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = 8608406
+SIZE (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = 73163504

devel/jdk/1.7/files/x_x2zip.c

@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2007 Greg Lewis. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#ifndef BUFSIZ
+#define BUFSIZ 0x10000
+#endif
+
+int
+main(int argc, char* argv[]) {
+    char *key;
+    char *oname;
+    char buf[BUFSIZ];
+    size_t keylen, olen;
+    int ifd, ofd, i, fileoff = 0, bufoff = 0, buflen = 0, eof = 0;
+    ssize_t bytes;
+
+    if (argc < 3) {
+        errx(1, "Usage: x_x2zip <key> <file>");
+    }
+
+    // Key
+    key = argv[1];
+    keylen = strlen(key);
+
+    // Open input file
+    if ((ifd = open(argv[2], O_RDONLY)) == -1) {
+        err(1, "Can't open input file %s", argv[2]);
+    }
+
+    // Open output file
+    olen = strlen(argv[2]) + 5;
+    if ((oname = (char *) malloc(olen)) == NULL) {
+        err(1, "Can't create output file name");
+    }
+    if (strlcpy(oname, argv[2], olen) >= olen) {
+        err(1, "Can't create output file name");
+    }
+    if (strlcat(oname, ".zip", olen) >= olen) {
+        err(1, "Can't create output file name");
+    }
+    if ((ofd = open(oname,
+                    O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR)) == -1) {
+        err(1, "Can't open output file %s", oname);
+    }
+    free(oname);
+
+    while (!eof) {
+        // Read into the buffer
+        bufoff = 0;
+        buflen = 0;
+        while (1) {
+            if (buflen >= BUFSIZ) {
+                break;
+            }
+            if ((bytes = read(ifd, buf, BUFSIZ - buflen)) == -1) {
+                err(1, "Error reading input file");
+            }
+            if (!bytes) {
+                eof = 1;
+                break;
+            }
+            buflen += bytes;
+        }
+
+        // Decrypt
+        for (i = 0; i < buflen; i++) {
+            buf[i] = buf[i] ^ key[(fileoff + i) % keylen];
+        }
+
+        // Update file offset
+        fileoff += buflen;
+
+        // Output the buffer
+        bufoff = 0;
+        while (bufoff < buflen) {
+            if ((bytes = write(ofd, buf + bufoff, buflen - bufoff)) == -1) {
+                err(1, "Error writing output file");
+            }
+            bufoff += bytes;
+        }
+    }
+
+    return 0;
+}
+

devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_vm_make

@@ -1,6 +1,6 @@
-$OpenBSD: patch-hotspot_build_bsd_makefiles_vm_make,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $
---- hotspot/build/bsd/makefiles/vm.make.orig	Mon Apr 16 08:42:36 2007
-+++ hotspot/build/bsd/makefiles/vm.make	Mon Apr 16 08:42:38 2007
+$OpenBSD: patch-hotspot_build_bsd_makefiles_vm_make,v 1.2 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/build/bsd/makefiles/vm.make.orig	Fri Jul  6 08:51:57 2007
++++ hotspot/build/bsd/makefiles/vm.make	Fri Jul  6 08:59:35 2007
 @@ -100,6 +100,10 @@ CPPFLAGS =           \
    ${RELEASE_VERSION} \
    ${VM_DISTRO}
@@ -21,23 +21,12 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_vm_make,v 1.1.1.1 2007/05/08 17:06:1
  
  # By default, link the *.o into the library, not the executable.
  LINK_INTO$(LINK_INTO) = LIBJVM
-@@ -152,10 +156,17 @@ else
-   # get around library dependency and compatibility issues. Must use gcc not
-   # g++ to link.
-   LFLAGS_VM                += $(STATIC_LIBGCC)
--  LIBS_VM                  += $(STATIC_STDCXX) $(LIBS)
-+ifeq ($(BUILDARCH), i486)
-+  LIBS_VM                  += $(STATIC_STDCXX)
- endif
-+  LIBS_VM                  += $(LIBS)
-+endif
+@@ -138,7 +142,7 @@ mapfile_reorder : mapfile $(REORDERFILE)
+ 	rm -f $@
+ 	cat $^ > $@
  
--LINK_VM = $(LINK_LIB.c)
-+ifeq ($(BUILDARCH), i486)
-+  LINK_VM = $(LINK_LIB.c)
-+else
-+  LINK_VM = $(LINK_LIB.CC)
-+endif
+-STATIC_CXX = true
++STATIC_CXX = false
  
- # rule for building precompiled header
- $(PRECOMPILED_HEADER): $(Precompiled_Files)
+ ifeq ($(LINK_INTO),AOUT)
+   LIBJVM.o                 =

devel/jdk/1.7/patches/patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp

@@ -1,21 +1,21 @@
-$OpenBSD: patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp,v 1.1.1.1 2007/05/08 17:06:19 kurt Exp $
---- hotspot/src/cpu/amd64/vm/assembler_amd64.cpp.orig	Tue Apr 10 04:01:22 2007
-+++ hotspot/src/cpu/amd64/vm/assembler_amd64.cpp	Mon Apr 16 08:42:38 2007
-@@ -1240,7 +1240,7 @@ void Assembler::movl(Address dst, Register src)
+$OpenBSD: patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp,v 1.2 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/cpu/amd64/vm/assembler_amd64.cpp.orig	Fri Jul  6 10:49:14 2007
++++ hotspot/src/cpu/amd64/vm/assembler_amd64.cpp	Fri Jul  6 10:48:32 2007
+@@ -1282,7 +1282,7 @@ void Assembler::movl(Address dst, Register src) {
    emit_operand(src, dst);
  }
  
--void Assembler::movq(Register dst, int64_t imm64)
-+void Assembler::movq(Register dst, intptr_t imm64)
- {
+-void Assembler::mov64(Register dst, int64_t imm64) {
++void Assembler::mov64(Register dst, intptr_t imm64) {
    InstructionMark im(this);
-   int dstenc = dst->encoding();
-@@ -1379,7 +1379,7 @@ void Assembler::movq(Register dst, Address src)
-   }
+   int encode = prefixq_and_encode(dst->encoding());
+   emit_byte(0xB8 | encode);
+@@ -1309,7 +1309,7 @@ void Assembler::movq(Register dst, Address src) {
+   emit_operand(dst, src);
  }
  
--void Assembler::movq(Address dst, int64_t imm32)
-+void Assembler::movq(Address dst, intptr_t imm32)
- {
+-void Assembler::mov64(Address dst, int64_t imm32) {
++void Assembler::mov64(Address dst, intptr_t imm32) {
    assert(is_simm32(imm32), "lost bits");
    InstructionMark im(this);
+   prefixq(dst);

devel/jdk/1.7/patches/patch-hotspot_src_cpu_amd64_vm_assembler_amd64_hpp

@@ -1,36 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_amd64_vm_assembler_amd64_hpp,v 1.1.1.1 2007/05/08 17:06:19 kurt Exp $
---- hotspot/src/cpu/amd64/vm/assembler_amd64.hpp.orig	Tue Apr 10 04:01:22 2007
-+++ hotspot/src/cpu/amd64/vm/assembler_amd64.hpp	Mon Apr 16 08:42:38 2007
-@@ -433,12 +433,12 @@ class Assembler 
-   void movl(Address dst, int imm32);
-   void movl(Address dst, Register src);
- 
--  void movq(Register dst, int64_t imm64);
-+  void movq(Register dst, intptr_t imm64);
-   void movq(Register dst, address imm64, relocInfo::relocType rtype);
-   void movq(Register dst, Register src);
-   void movq(Register dst, jobject obj);
-   void movq(Register dst, Address src);
--  void movq(Address dst, int64_t imm64);
-+  void movq(Address dst, intptr_t imm64);
-   void movq(Address dst, Register src);
- 
-   void movsbl(Register dst, Address src);
-@@ -976,7 +976,7 @@ class MacroAssembler
-     check_reach(src) ? Assembler::movq(dst, src) :
-                        Assembler::movq(dst, Address(rscratch1));
-   }
--  void movq(Address dst, int64_t imm64)
-+  void movq(Address dst, intptr_t imm64)
-   { 
-     if (check_reach(dst)) {
-       if (is_simm32(imm64)) {
-@@ -1441,7 +1441,7 @@ class MacroAssembler
-   void popq(Register dst)                   { Assembler::popq(dst); }
-   void movl(Register dst, int imm32)        { Assembler::movl(dst, imm32); }
-   void movl(Register dst, Register src)     { Assembler::movl(dst, src); }
--  void movq(Register dst, int64_t imm64)    { Assembler::movq(dst, imm64); }
-+  void movq(Register dst, intptr_t imm64)    { Assembler::movq(dst, imm64); }
-   void movq(Register dst, address imm64, relocInfo::relocType rtype) { Assembler::movq(dst, imm64, rtype); }
-   void movq(Register dst, Register src)     { Assembler::movq(dst, src); }
-   void movq(Register dst, jobject obj)      { Assembler::movq(dst, obj); }

devel/jdk/1.7/patches/patch-hotspot_src_cpu_i486_vm_interpreterRT_i486_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_cpu_i486_vm_interpreterRT_i486_cpp,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $
---- hotspot/src/cpu/i486/vm/interpreterRT_i486.cpp.orig	Tue Apr 10 04:01:26 2007
-+++ hotspot/src/cpu/i486/vm/interpreterRT_i486.cpp	Mon Apr 16 08:42:38 2007
-@@ -100,7 +100,7 @@ class SlowSignatureHandler: public NativeSignatureIter
+$OpenBSD: patch-hotspot_src_cpu_i486_vm_interpreterRT_i486_cpp,v 1.2 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/cpu/i486/vm/interpreterRT_i486.cpp.orig	Thu Jul  5 04:55:07 2007
++++ hotspot/src/cpu/i486/vm/interpreterRT_i486.cpp	Fri Jul  6 08:51:59 2007
+@@ -101,7 +101,7 @@ class SlowSignatureHandler: public NativeSignatureIter
    virtual void pass_object() { 
      // pass address of from
      intptr_t from_addr = (intptr_t)(_from + Interpreter::local_offset_in_bytes(0));

devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp

@@ -1,6 +1,6 @@
-$OpenBSD: patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $
---- hotspot/src/os/bsd/vm/mutex_bsd.cpp.orig	Mon Apr 16 08:42:36 2007
-+++ hotspot/src/os/bsd/vm/mutex_bsd.cpp	Mon Apr 16 08:42:39 2007
+$OpenBSD: patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp,v 1.2 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/os/bsd/vm/mutex_bsd.cpp.orig	Thu Jul  5 09:51:29 2007
++++ hotspot/src/os/bsd/vm/mutex_bsd.cpp	Thu Jul  5 09:51:31 2007
 @@ -252,7 +252,7 @@ bool Monitor::wait(bool no_safepoint_check, long timeo
      }
      
@@ -19,7 +19,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp,v 1.1.1.1 2007/05/08 17:06:1
  }
  
  
-@@ -343,7 +343,7 @@ bool Monitor::notify_all() {
+@@ -344,7 +344,7 @@ bool Monitor::notify_all() {
   * of "now + 100,000,000". This places a limit on the timeout of about 3.17
   * years from "now".
   */
@@ -28,7 +28,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp,v 1.1.1.1 2007/05/08 17:06:1
    assert (time > 0, "convertTime");
  
    struct timeval now;
-@@ -402,7 +402,7 @@ void Parker::park(bool isAbsolute, jlong time) {
+@@ -403,7 +403,7 @@ void Parker::park(bool isAbsolute, jlong time) {
    }
  
    // Next, demultiplex/decode time arguments
@@ -37,7 +37,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp,v 1.1.1.1 2007/05/08 17:06:1
    if (time < 0) { // don't wait at all
      return; 
    }
-@@ -455,8 +455,7 @@ void Parker::park(bool isAbsolute, jlong time) {
+@@ -456,8 +456,7 @@ void Parker::park(bool isAbsolute, jlong time) {
      }
    }
    assert_status(status == 0 || status == EINTR || 

devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp

@@ -1,6 +1,6 @@
-$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.2 2007/05/09 15:48:31 kurt Exp $
---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	Tue May  8 15:33:11 2007
-+++ hotspot/src/os/bsd/vm/os_bsd.cpp	Tue May  8 15:38:54 2007
+$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	Wed Jun 13 16:37:27 2007
++++ hotspot/src/os/bsd/vm/os_bsd.cpp	Wed Jun 13 16:37:30 2007
 @@ -50,13 +50,26 @@
  # include <semaphore.h>
  # include <fcntl.h>
@@ -925,8 +925,8 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.2 2007/05/09 15:48:31 kurt
 +#endif
  }
  
- #ifdef JVMPI_SUPPORT
-@@ -4176,7 +4512,7 @@ void os::PlatformEvent::park() {       // AKA "down()"
+ // System loadavg support.  Returns -1 if load average cannot be obtained.
+@@ -4169,7 +4505,7 @@ void os::PlatformEvent::park() {       // AKA "down()"
          status = pthread_cond_wait(_cond, _mutex);
          // for some reason, under 2.7 lwp_cond_wait() may return ETIME ...
          // Treat this the same as if the wait was interrupted
@@ -935,7 +935,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.2 2007/05/09 15:48:31 kurt
          assert_status(status == 0 || status == EINTR, status, "cond_wait");
       }
       -- _nParked ; 
-@@ -4234,10 +4570,10 @@ int os::PlatformEvent::park(jlong millis) {
+@@ -4227,10 +4563,10 @@ int os::PlatformEvent::park(jlong millis) {
        pthread_cond_init (_cond, NULL) ;
      }
      assert_status(status == 0 || status == EINTR || 

devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_amd64_vm_assembler_bsd_amd64_cpp

@@ -1,10 +1,10 @@
-$OpenBSD: patch-hotspot_src_os_cpu_bsd_amd64_vm_assembler_bsd_amd64_cpp,v 1.1.1.1 2007/05/08 17:06:19 kurt Exp $
---- hotspot/src/os_cpu/bsd_amd64/vm/assembler_bsd_amd64.cpp.orig	Mon Apr 16 08:42:36 2007
-+++ hotspot/src/os_cpu/bsd_amd64/vm/assembler_bsd_amd64.cpp	Mon Apr 16 08:42:39 2007
-@@ -77,5 +77,11 @@ void MacroAssembler::get_thread(Register thread)
+$OpenBSD: patch-hotspot_src_os_cpu_bsd_amd64_vm_assembler_bsd_amd64_cpp,v 1.2 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/os_cpu/bsd_amd64/vm/assembler_bsd_amd64.cpp.orig	Fri Jul  6 08:51:56 2007
++++ hotspot/src/os_cpu/bsd_amd64/vm/assembler_bsd_amd64.cpp	Fri Jul  6 09:14:42 2007
+@@ -72,5 +72,11 @@ void MacroAssembler::get_thread(Register thread) {
+ // NOTE: since the bsd kernel resides at the low end of
  // user address space, no null pointer check is needed.
- bool MacroAssembler::needs_explicit_null_check(int offset)
- {
+ bool MacroAssembler::needs_explicit_null_check(int offset) {
 +#ifdef _ALLBSD_SOURCE
 +  //XXXBSD: need to verify this. can page at 0 get mmaped?
 +  bool offset_in_first_page =   0 <= offset  &&  offset < os::vm_page_size();

devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_amd64_vm_os_bsd_amd64_cpp

@@ -1,6 +1,6 @@
-$OpenBSD: patch-hotspot_src_os_cpu_bsd_amd64_vm_os_bsd_amd64_cpp,v 1.2 2007/05/09 15:48:31 kurt Exp $
---- hotspot/src/os_cpu/bsd_amd64/vm/os_bsd_amd64.cpp.orig	Tue May  8 15:33:12 2007
-+++ hotspot/src/os_cpu/bsd_amd64/vm/os_bsd_amd64.cpp	Tue May  8 15:42:26 2007
+$OpenBSD: patch-hotspot_src_os_cpu_bsd_amd64_vm_os_bsd_amd64_cpp,v 1.3 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/os_cpu/bsd_amd64/vm/os_bsd_amd64.cpp.orig	Fri Jul  6 08:51:56 2007
++++ hotspot/src/os_cpu/bsd_amd64/vm/os_bsd_amd64.cpp	Fri Jul  6 08:51:59 2007
 @@ -47,8 +47,60 @@
  #include <sys/wait.h>
  #include <pwd.h>
@@ -144,9 +144,9 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_amd64_vm_os_bsd_amd64_cpp,v 1.2 2007/05/0
 -    if ((sig == SIGSEGV) &&
 +    if ((sig == SIGSEGV || sig == SIGBUS) &&
          os::is_memory_serialize_page(thread, (address)info->si_addr)) {
-       return true;
-     }
-@@ -354,7 +408,7 @@ JVM_handle_bsd_signal(int sig,
+       // Block current thread until the memory serialize page permission restored.
+       os::block_on_serialize_page_trap();
+@@ -356,7 +410,7 @@ JVM_handle_bsd_signal(int sig,
      // save all thread context in case we need to restore it
      thread->set_saved_exception_pc(pc);
  
@@ -155,7 +155,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_amd64_vm_os_bsd_amd64_cpp,v 1.2 2007/05/0
      return true;
    }
  
-@@ -389,6 +443,7 @@ void os::Bsd::init_thread_fpu_state(void)
+@@ -391,6 +445,7 @@ void os::Bsd::init_thread_fpu_state(void)
    // Nothing to do
  }
  
@@ -163,7 +163,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_amd64_vm_os_bsd_amd64_cpp,v 1.2 2007/05/0
  int os::Bsd::get_fpu_control_word() {
    return 0;
  }
-@@ -396,6 +451,7 @@ int os::Bsd::get_fpu_control_word() {
+@@ -398,6 +453,7 @@ int os::Bsd::get_fpu_control_word() {
  void os::Bsd::set_fpu_control_word(int fpu) {
    // nothing
  }
@@ -171,7 +171,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_amd64_vm_os_bsd_amd64_cpp,v 1.2 2007/05/0
  
  ///////////////////////////////////////////////////////////////////////////////
  // thread stack
-@@ -452,6 +508,36 @@ size_t os::Bsd::default_guard_size(os::ThreadType thr_
+@@ -454,6 +510,36 @@ size_t os::Bsd::default_guard_size(os::ThreadType thr_
  //    pthread_attr_getstack()
  
  static void current_stack_region(address* bottom, size_t* size) {
@@ -208,7 +208,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_amd64_vm_os_bsd_amd64_cpp,v 1.2 2007/05/0
    if (os::Bsd::is_initial_thread()) {
       // initial thread needs special handling because pthread_getattr_np()
       // may return bogus value.
-@@ -478,6 +564,7 @@ static void current_stack_region(address* bottom, size
+@@ -480,6 +566,7 @@ static void current_stack_region(address* bottom, size
       pthread_attr_destroy(&attr);
  
    }
@@ -216,7 +216,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_amd64_vm_os_bsd_amd64_cpp,v 1.2 2007/05/0
    assert(os::current_stack_pointer() >= *bottom &&
           os::current_stack_pointer() < *bottom + *size, "just checking");
  }
-@@ -510,32 +597,31 @@ void os::print_context(outputStream* st, void* context
+@@ -512,32 +599,31 @@ void os::print_context(outputStream* st, void* context
  
    ucontext_t* uc = (ucontext_t*) context;
    st->print_cr("Registers:");

devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp

@@ -1,6 +1,6 @@
-$OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.2 2007/05/09 15:48:31 kurt Exp $
---- hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp.orig	Tue May  8 15:33:12 2007
-+++ hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp	Tue May  8 15:43:15 2007
+$OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.3 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp.orig	Fri Jul  6 08:51:57 2007
++++ hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp	Fri Jul  6 08:51:59 2007
 @@ -47,9 +47,59 @@
  # include <sys/wait.h>
  # include <pwd.h>
@@ -136,9 +136,9 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.2 2007/05/09
 -    if ((sig == SIGSEGV) &&
 +    if ((sig == SIGSEGV || sig == SIGBUS) &&
          os::is_memory_serialize_page(thread, (address) info->si_addr)) {
-        return true;
-     }
-@@ -363,7 +415,7 @@ JVM_handle_bsd_signal(int sig,
+       // Block current thread until the memory serialize page permission restored.
+       os::block_on_serialize_page_trap();
+@@ -365,7 +417,7 @@ JVM_handle_bsd_signal(int sig,
    // Furthermore, a false-positive should be harmless.
    if (UnguardOnExecutionViolation > 0 &&
        (sig == SIGSEGV || sig == SIGBUS) &&
@@ -147,7 +147,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.2 2007/05/09
      int page_size = os::vm_page_size();
      address addr = (address) info->si_addr;
      address pc = os::Bsd::ucontext_get_pc(uc);
-@@ -431,7 +483,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -433,7 +485,7 @@ JVM_handle_bsd_signal(int sig,
      // save all thread context in case we need to restore it
      if (thread != NULL) thread->set_saved_exception_pc(pc);
  
@@ -156,7 +156,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.2 2007/05/09
      return true;
    }
  
-@@ -461,11 +513,22 @@ JVM_handle_bsd_signal(int sig,
+@@ -463,11 +515,22 @@ JVM_handle_bsd_signal(int sig,
    ShouldNotReachHere();
  }
  
@@ -179,7 +179,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.2 2007/05/09
  int os::Bsd::get_fpu_control_word(void) {
    int fpu_control;
    _FPU_GETCW(fpu_control);
-@@ -473,12 +536,17 @@ int os::Bsd::get_fpu_control_word(void) {
+@@ -475,12 +538,17 @@ int os::Bsd::get_fpu_control_word(void) {
  }
  
  void os::Bsd::set_fpu_control_word(int fpu_control) {
@@ -198,7 +198,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.2 2007/05/09
    struct utsname uts;
    if( uname(&uts) != 0 ) return false; // uname fails?
    char *minor_string;
-@@ -492,6 +560,7 @@ bool os::supports_sse() {
+@@ -494,6 +562,7 @@ bool os::supports_sse() {
    }
  #endif
    return result;
@@ -206,7 +206,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.2 2007/05/09
  }
  
  bool os::is_allocatable(size_t bytes) {
-@@ -516,6 +585,9 @@ size_t os::Bsd::min_stack_allowed  =  (48 DEBUG_ONLY(+
+@@ -518,6 +587,9 @@ size_t os::Bsd::min_stack_allowed  =  (48 DEBUG_ONLY(+
  
  #define GET_GS() ({int gs; __asm__ volatile("movw %%gs, %w0":"=q"(gs)); gs&0xffff;})
  
@@ -216,7 +216,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.2 2007/05/09
  // Test if pthread library can support variable thread stack size. BsdThreads
  // in fixed stack mode allocates 2M fixed slot for each thread. BsdThreads 
  // in floating stack mode and NPTL support variable stack size.
-@@ -548,6 +620,7 @@ bool os::Bsd::supports_variable_stack_size() {
+@@ -550,6 +622,7 @@ bool os::Bsd::supports_variable_stack_size() {
      return (GET_GS() != 0);
    }
  }
@@ -224,7 +224,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.2 2007/05/09
  
  // return default stack size for thr_type
  size_t os::Bsd::default_stack_size(os::ThreadType thr_type) {
-@@ -596,6 +669,36 @@ size_t os::Bsd::default_guard_size(os::ThreadType thr_
+@@ -598,6 +671,36 @@ size_t os::Bsd::default_guard_size(os::ThreadType thr_
  //    pthread_attr_getstack()
  
  static void current_stack_region(address * bottom, size_t * size) {
@@ -261,7 +261,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.2 2007/05/09
    if (os::Bsd::is_initial_thread()) {
       // initial thread needs special handling because pthread_getattr_np()
       // may return bogus value.
-@@ -622,6 +725,7 @@ static void current_stack_region(address * bottom, siz
+@@ -624,6 +727,7 @@ static void current_stack_region(address * bottom, siz
       pthread_attr_destroy(&attr);
  
    }
@@ -269,7 +269,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.2 2007/05/09
    assert(os::current_stack_pointer() >= *bottom &&
           os::current_stack_pointer() < *bottom + *size, "just checking");
  }
-@@ -649,19 +753,18 @@ void os::print_context(outputStream *st, void *context
+@@ -651,19 +755,18 @@ void os::print_context(outputStream *st, void *context
  
    ucontext_t *uc = (ucontext_t*)context;
    st->print_cr("Registers:");

devel/jdk/1.7/patches/patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parNew

@@ -0,0 +1,12 @@
+$OpenBSD: patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parNew,v 1.1 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew.orig	Thu Jul  5 12:45:57 2007
++++ hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew	Thu Jul  5 12:46:06 2007
+@@ -39,7 +39,7 @@ parCardTableModRefBS.cpp                cardTableRS.hp
+ parCardTableModRefBS.cpp                java.hpp
+ parCardTableModRefBS.cpp                mutexLocker.hpp
+ parCardTableModRefBS.cpp                sharedHeap.hpp
+-parCardTableModRefBS.cpp                space.hpp
++parCardTableModRefBS.cpp                space.inline.hpp
+ parCardTableModRefBS.cpp                universe.hpp
+ parCardTableModRefBS.cpp                virtualspace.hpp
+ 

devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_compiler2

@@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.2 2007/05/09 15:48:31 kurt Exp $
---- hotspot/src/share/vm/includeDB_compiler2.orig	Tue May  8 16:37:23 2007
-+++ hotspot/src/share/vm/includeDB_compiler2	Tue May  8 18:12:36 2007
-@@ -137,6 +137,7 @@ c2_globals_<os_family>.hpp              globalDefiniti
+$OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.3 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/share/vm/includeDB_compiler2.orig	Thu Jul  5 04:55:16 2007
++++ hotspot/src/share/vm/includeDB_compiler2	Fri Jul  6 08:51:59 2007
+@@ -138,6 +138,7 @@ c2_globals_<os_family>.hpp              globalDefiniti
  c2_globals_<os_family>.hpp              macros.hpp
  
  c2_init_<arch>.cpp                      compile.hpp
@@ -9,7 +9,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.2 2007/05/09 15:48:
  
  c2compiler.cpp                          ad_<arch>.hpp
  c2compiler.cpp                          c2compiler.hpp
-@@ -160,6 +161,7 @@ callGenerator.cpp                       subnode.hpp
+@@ -161,6 +162,7 @@ callGenerator.cpp                       subnode.hpp
  callGenerator.hpp                       callnode.hpp
  callGenerator.hpp                       compile.hpp
  callGenerator.hpp                       deoptimization.hpp
@@ -17,7 +17,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.2 2007/05/09 15:48:
  callGenerator.hpp                       type.hpp
  
  callnode.cpp                            callnode.hpp
-@@ -476,6 +478,7 @@ graphKit.hpp                            cfgnode.hpp
+@@ -477,6 +479,7 @@ graphKit.hpp                            cfgnode.hpp
  graphKit.hpp                            ciEnv.hpp
  graphKit.hpp                            compile.hpp
  graphKit.hpp                            deoptimization.hpp
@@ -25,7 +25,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.2 2007/05/09 15:48:
  graphKit.hpp                            phaseX.hpp
  graphKit.hpp                            type.hpp
  
-@@ -518,6 +521,7 @@ indexSet.cpp                            regmask.hpp
+@@ -521,6 +524,7 @@ indexSet.cpp                            regmask.hpp
  
  indexSet.hpp                            allocation.hpp
  indexSet.hpp                            compile.hpp
@@ -33,7 +33,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.2 2007/05/09 15:48:
  indexSet.hpp                            regmask.hpp
  indexSet.hpp                            resourceArea.hpp
  
-@@ -834,6 +838,7 @@ parseHelper.cpp                         systemDictiona
+@@ -833,6 +837,7 @@ parseHelper.cpp                         systemDictiona
  phase.cpp                               compile.hpp
  phase.cpp                               compileBroker.hpp
  phase.cpp                               nmethod.hpp

devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_core

@@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.2 2007/05/09 15:48:31 kurt Exp $
---- hotspot/src/share/vm/includeDB_core.orig	Tue May  8 16:56:40 2007
-+++ hotspot/src/share/vm/includeDB_core	Tue May  8 18:01:23 2007
-@@ -483,7 +483,7 @@ cardTableModRefBS.cpp                   cardTableRS.hp
+$OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/share/vm/includeDB_core.orig	Thu Jun 21 04:18:24 2007
++++ hotspot/src/share/vm/includeDB_core	Thu Jul  5 12:14:20 2007
+@@ -466,7 +466,7 @@ cardTableModRefBS.cpp                   cardTableRS.hp
  cardTableModRefBS.cpp                   java.hpp
  cardTableModRefBS.cpp                   mutexLocker.hpp
  cardTableModRefBS.cpp                   sharedHeap.hpp
@@ -10,8 +10,8 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.2 2007/05/09 15:48:31 ku
  cardTableModRefBS.cpp                   universe.hpp
  cardTableModRefBS.cpp                   virtualspace.hpp
  
-@@ -1090,14 +1090,14 @@ compactingPermGenGen.cpp                compactingPerm
- compactingPermGenGen.cpp                concurrentMarkSweepGeneration.inline.hpp
+@@ -1029,15 +1029,14 @@ compactPermGen.hpp                      permGen.hpp
+ compactingPermGenGen.cpp                compactingPermGenGen.hpp
  compactingPermGenGen.cpp                filemap.hpp
  compactingPermGenGen.cpp                genOopClosures.inline.hpp
 -compactingPermGenGen.cpp                generation.inline.hpp
@@ -21,13 +21,22 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.2 2007/05/09 15:48:31 ku
  compactingPermGenGen.cpp                symbolTable.hpp
  compactingPermGenGen.cpp                systemDictionary.hpp
  
--compactingPermGenGen.hpp                space.hpp
 +compactingPermGenGen.hpp                generation.inline.hpp
-+compactingPermGenGen.hpp                space.inline.hpp
+ compactingPermGenGen.hpp                generationCounters.hpp
+-compactingPermGenGen.hpp                space.hpp
  
  compilationPolicy.cpp                   compilationPolicy.hpp
  compilationPolicy.cpp                   compiledIC.hpp
-@@ -3083,6 +3083,7 @@ klass.hpp                               specialized_oo
+@@ -1785,7 +1784,7 @@ generation.hpp                          watermark.hpp
+ 
+ generation.inline.hpp                   genCollectedHeap.hpp
+ generation.inline.hpp                   generation.hpp
+-generation.inline.hpp                   space.hpp
++generation.inline.hpp                   space.inline.hpp
+ 
+ generationSpec.cpp                      compactPermGen.hpp
+ generationSpec.cpp                      defNewGeneration.hpp
+@@ -2811,6 +2810,7 @@ klass.hpp                               specialized_oo
  
  klass.inline.hpp                        klass.hpp
  klass.inline.hpp                        markOop.hpp
@@ -35,7 +44,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.2 2007/05/09 15:48:31 ku
  
  klassKlass.cpp                          collectedHeap.hpp
  klassKlass.cpp                          collectedHeap.inline.hpp
-@@ -4413,6 +4414,7 @@ space.hpp                               blockOffsetTab
+@@ -4024,6 +4024,7 @@ space.hpp                               blockOffsetTab
  space.hpp                               cardTableModRefBS.hpp
  space.hpp                               iterator.hpp
  space.hpp                               markOop.hpp
@@ -43,7 +52,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.2 2007/05/09 15:48:31 ku
  space.hpp                               memRegion.hpp
  space.hpp                               mutexLocker.hpp
  space.hpp                               os_<os_family>.inline.hpp
-@@ -4618,6 +4620,7 @@ synchronizer.cpp                        vmSymbols.hpp
+@@ -4222,6 +4223,7 @@ synchronizer.cpp                        vmSymbols.hpp
  
  synchronizer.hpp                        handles.hpp
  synchronizer.hpp                        markOop.hpp

devel/jdk/1.7/patches/patch-hotspot_src_share_vm_interpreter_bytecodeTracer_cpp

@@ -1,6 +1,6 @@
-$OpenBSD: patch-hotspot_src_share_vm_interpreter_bytecodeTracer_cpp,v 1.1.1.1 2007/05/08 17:06:19 kurt Exp $
---- hotspot/src/share/vm/interpreter/bytecodeTracer.cpp.orig	Tue Apr 10 04:01:48 2007
-+++ hotspot/src/share/vm/interpreter/bytecodeTracer.cpp	Mon Apr 16 08:42:39 2007
+$OpenBSD: patch-hotspot_src_share_vm_interpreter_bytecodeTracer_cpp,v 1.2 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/share/vm/interpreter/bytecodeTracer.cpp.orig	Thu Jun 21 03:31:03 2007
++++ hotspot/src/share/vm/interpreter/bytecodeTracer.cpp	Thu Jul  5 09:51:31 2007
 @@ -77,7 +77,7 @@ class BytecodePrinter: public BytecodeClosure {
        // the incoming method.  We could lose a line of trace output.
        // This is acceptable in a debug-only feature.
@@ -11,7 +11,7 @@ $OpenBSD: patch-hotspot_src_share_vm_interpreter_bytecodeTracer_cpp,v 1.1.1.1 20
        tty->cr();
        _current_method = method();
 @@ -90,7 +90,7 @@ class BytecodePrinter: public BytecodeClosure {
-       code = Bytecodes::cast(*bcp);
+       code = Bytecodes::code_at(bcp);
      }
      int bci = bcp - method->code_base();
 -    tty->print("[%d] ", (int) Thread::current()->osthread()->thread_id());

devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_os_cpp

@@ -0,0 +1,15 @@
+$OpenBSD: patch-hotspot_src_share_vm_runtime_os_cpp,v 1.1 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/share/vm/runtime/os.cpp.orig	Thu Jul  5 12:24:04 2007
++++ hotspot/src/share/vm/runtime/os.cpp	Thu Jul  5 13:06:15 2007
+@@ -153,7 +153,11 @@ char* os::iso8601_time(char* buffer, size_t buffer_len
+   }
+   // Save the results of localtime
+   const struct tm time_struct = *time_struct_temp;
++#if defined(_ALLBSD_SOURCE)
++  const time_t zone = (time_t) time_struct_temp->tm_gmtoff;
++#else
+   const time_t zone = timezone;
++#endif
+   
+   // If daylight savings time is in effect, 
+   // we are 1 hour East of our time zone

devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_macros_hpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_share_vm_utilities_macros_hpp,v 1.2 2007/05/09 15:48:31 kurt Exp $
---- hotspot/src/share/vm/utilities/macros.hpp.orig	Sun May  6 05:01:21 2007
-+++ hotspot/src/share/vm/utilities/macros.hpp	Tue May  8 15:33:14 2007
-@@ -117,6 +117,14 @@
+$OpenBSD: patch-hotspot_src_share_vm_utilities_macros_hpp,v 1.3 2007/07/13 22:52:35 kurt Exp $
+--- hotspot/src/share/vm/utilities/macros.hpp.orig	Thu Jun 21 03:31:11 2007
++++ hotspot/src/share/vm/utilities/macros.hpp	Thu Jul  5 09:51:32 2007
+@@ -124,6 +124,14 @@
  #define NOT_WINDOWS(code) code
  #endif
  

devel/jdk/1.7/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/05/08 17:06:20 kurt Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/07/13 22:52:36 kurt Exp $
 @option no-default-conflict
 @conflict jdk->=1.7,<1.8
 ${JDKHOME}/
@@ -296,6 +296,7 @@ ${JDKHOME}/demo/jfc/CodePointIM/
 ${JDKHOME}/demo/jfc/CodePointIM/CodePointIM.jar
 ${JDKHOME}/demo/jfc/CodePointIM/README.html
 ${JDKHOME}/demo/jfc/CodePointIM/README_ja.html
+${JDKHOME}/demo/jfc/CodePointIM/README_zh_CN.html
 ${JDKHOME}/demo/jfc/CodePointIM/src/
 ${JDKHOME}/demo/jfc/CodePointIM/src/CodePointIM.java
 ${JDKHOME}/demo/jfc/CodePointIM/src/CodePointInputMethod.java
@@ -303,16 +304,18 @@ ${JDKHOME}/demo/jfc/CodePointIM/src/CodePointInputMethodDescriptor.java
 ${JDKHOME}/demo/jfc/CodePointIM/src/resources/
 ${JDKHOME}/demo/jfc/CodePointIM/src/resources/codepoint.properties
 ${JDKHOME}/demo/jfc/CodePointIM/src/resources/codepoint_ja.properties
+${JDKHOME}/demo/jfc/CodePointIM/src/resources/codepoint_zh_CN.properties
 ${JDKHOME}/demo/jfc/FileChooserDemo/
 ${JDKHOME}/demo/jfc/FileChooserDemo/FileChooserDemo.jar
 ${JDKHOME}/demo/jfc/FileChooserDemo/README.txt
-${JDKHOME}/demo/jfc/FileChooserDemo/images/
-${JDKHOME}/demo/jfc/FileChooserDemo/images/gifIcon.gif
-${JDKHOME}/demo/jfc/FileChooserDemo/images/jpgIcon.jpg
 ${JDKHOME}/demo/jfc/FileChooserDemo/src/
 ${JDKHOME}/demo/jfc/FileChooserDemo/src/ExampleFileFilter.java
 ${JDKHOME}/demo/jfc/FileChooserDemo/src/ExampleFileView.java
 ${JDKHOME}/demo/jfc/FileChooserDemo/src/FileChooserDemo.java
+${JDKHOME}/demo/jfc/FileChooserDemo/src/resources/
+${JDKHOME}/demo/jfc/FileChooserDemo/src/resources/images/
+${JDKHOME}/demo/jfc/FileChooserDemo/src/resources/images/gifIcon.gif
+${JDKHOME}/demo/jfc/FileChooserDemo/src/resources/images/jpgIcon.jpg
 ${JDKHOME}/demo/jfc/Font2DTest/
 ${JDKHOME}/demo/jfc/Font2DTest/Font2DTest.html
 ${JDKHOME}/demo/jfc/Font2DTest/Font2DTest.jar
@@ -327,6 +330,40 @@ ${JDKHOME}/demo/jfc/Java2D/Java2Demo.html
 ${JDKHOME}/demo/jfc/Java2D/Java2Demo.jar
 ${JDKHOME}/demo/jfc/Java2D/README.txt
 ${JDKHOME}/demo/jfc/Java2D/src/
+${JDKHOME}/demo/jfc/Java2D/src/fonts/
+${JDKHOME}/demo/jfc/Java2D/src/fonts/A.ttf
+${JDKHOME}/demo/jfc/Java2D/src/images/
+${JDKHOME}/demo/jfc/Java2D/src/images/bld.jpg
+${JDKHOME}/demo/jfc/Java2D/src/images/boat.png
+${JDKHOME}/demo/jfc/Java2D/src/images/box.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/boxwave.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/clone.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/clouds.jpg
+${JDKHOME}/demo/jfc/Java2D/src/images/cupanim.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/duke.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/duke.png
+${JDKHOME}/demo/jfc/Java2D/src/images/duke.running.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/dukeplug.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/fight.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/globe.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/java-logo.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/java_logo.png
+${JDKHOME}/demo/jfc/Java2D/src/images/jumptojavastrip.png
+${JDKHOME}/demo/jfc/Java2D/src/images/loop.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/looping.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/magnify.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/painting.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/print.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/remove.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/snooze.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/star7.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/start.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/start2.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/stop.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/stop2.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/surfing.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/thumbsup.gif
+${JDKHOME}/demo/jfc/Java2D/src/images/tip.gif
 ${JDKHOME}/demo/jfc/Java2D/src/java2d/
 ${JDKHOME}/demo/jfc/Java2D/src/java2d/AnimatingControlsSurface.java
 ${JDKHOME}/demo/jfc/Java2D/src/java2d/AnimatingSurface.java
@@ -403,26 +440,8 @@ ${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Transforms/Rotate.java
 ${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Transforms/SelectTx.java
 ${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Transforms/TransformAnim.java
 ${JDKHOME}/demo/jfc/Metalworks/
-${JDKHOME}/demo/jfc/Metalworks/HelpFiles/
-${JDKHOME}/demo/jfc/Metalworks/HelpFiles/back.gif
-${JDKHOME}/demo/jfc/Metalworks/HelpFiles/credits.html
-${JDKHOME}/demo/jfc/Metalworks/HelpFiles/duke.gif
-${JDKHOME}/demo/jfc/Metalworks/HelpFiles/javalogo.gif
-${JDKHOME}/demo/jfc/Metalworks/HelpFiles/metal.html
-${JDKHOME}/demo/jfc/Metalworks/HelpFiles/metalworks.html
-${JDKHOME}/demo/jfc/Metalworks/HelpFiles/swing.html
-${JDKHOME}/demo/jfc/Metalworks/HelpFiles/toc.html
 ${JDKHOME}/demo/jfc/Metalworks/Metalworks.jar
 ${JDKHOME}/demo/jfc/Metalworks/README.txt
-${JDKHOME}/demo/jfc/Metalworks/images/
-${JDKHOME}/demo/jfc/Metalworks/images/palette_crop.gif
-${JDKHOME}/demo/jfc/Metalworks/images/palette_draw.gif
-${JDKHOME}/demo/jfc/Metalworks/images/palette_hand.gif
-${JDKHOME}/demo/jfc/Metalworks/images/palette_select.gif
-${JDKHOME}/demo/jfc/Metalworks/images/palette_text.gif
-${JDKHOME}/demo/jfc/Metalworks/images/palette_zoom.gif
-${JDKHOME}/demo/jfc/Metalworks/resources/
-${JDKHOME}/demo/jfc/Metalworks/resources/MyTheme.theme
 ${JDKHOME}/demo/jfc/Metalworks/src/
 ${JDKHOME}/demo/jfc/Metalworks/src/AquaMetalTheme.java
 ${JDKHOME}/demo/jfc/Metalworks/src/BigContrastMetalTheme.java
@@ -439,71 +458,83 @@ ${JDKHOME}/demo/jfc/Metalworks/src/MetalworksInBox.java
 ${JDKHOME}/demo/jfc/Metalworks/src/MetalworksPrefs.java
 ${JDKHOME}/demo/jfc/Metalworks/src/PropertiesMetalTheme.java
 ${JDKHOME}/demo/jfc/Metalworks/src/UISwitchListener.java
+${JDKHOME}/demo/jfc/Metalworks/src/resources/
+${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/
+${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/back.gif
+${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/credits.html
+${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/duke.gif
+${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/javalogo.gif
+${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/metal.html
+${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/metalworks.html
+${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/swing.html
+${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/toc.html
+${JDKHOME}/demo/jfc/Metalworks/src/resources/MyTheme.theme
 ${JDKHOME}/demo/jfc/Notepad/
 ${JDKHOME}/demo/jfc/Notepad/Notepad.jar
 ${JDKHOME}/demo/jfc/Notepad/README.txt
-${JDKHOME}/demo/jfc/Notepad/resources/
-${JDKHOME}/demo/jfc/Notepad/resources/Notepad.properties
-${JDKHOME}/demo/jfc/Notepad/resources/Notepad_fr.properties
-${JDKHOME}/demo/jfc/Notepad/resources/Notepad_sv.properties
-${JDKHOME}/demo/jfc/Notepad/resources/Notepad_zh_CN.properties
-${JDKHOME}/demo/jfc/Notepad/resources/copy.gif
-${JDKHOME}/demo/jfc/Notepad/resources/cut.gif
-${JDKHOME}/demo/jfc/Notepad/resources/new.gif
-${JDKHOME}/demo/jfc/Notepad/resources/open.gif
-${JDKHOME}/demo/jfc/Notepad/resources/paste.gif
-${JDKHOME}/demo/jfc/Notepad/resources/save.gif
 ${JDKHOME}/demo/jfc/Notepad/src/
 ${JDKHOME}/demo/jfc/Notepad/src/ElementTreePanel.java
 ${JDKHOME}/demo/jfc/Notepad/src/Notepad.java
+${JDKHOME}/demo/jfc/Notepad/src/resources/
+${JDKHOME}/demo/jfc/Notepad/src/resources/Notepad.properties
+${JDKHOME}/demo/jfc/Notepad/src/resources/Notepad_fr.properties
+${JDKHOME}/demo/jfc/Notepad/src/resources/Notepad_sv.properties
+${JDKHOME}/demo/jfc/Notepad/src/resources/Notepad_zh_CN.properties
+${JDKHOME}/demo/jfc/Notepad/src/resources/copy.gif
+${JDKHOME}/demo/jfc/Notepad/src/resources/cut.gif
+${JDKHOME}/demo/jfc/Notepad/src/resources/new.gif
+${JDKHOME}/demo/jfc/Notepad/src/resources/open.gif
+${JDKHOME}/demo/jfc/Notepad/src/resources/paste.gif
+${JDKHOME}/demo/jfc/Notepad/src/resources/save.gif
 ${JDKHOME}/demo/jfc/SampleTree/
 ${JDKHOME}/demo/jfc/SampleTree/README.txt
 ${JDKHOME}/demo/jfc/SampleTree/SampleTree.jar
-${JDKHOME}/demo/jfc/SampleTree/images/
-${JDKHOME}/demo/jfc/SampleTree/images/collapsed.gif
-${JDKHOME}/demo/jfc/SampleTree/images/expanded.gif
 ${JDKHOME}/demo/jfc/SampleTree/src/
 ${JDKHOME}/demo/jfc/SampleTree/src/DynamicTreeNode.java
 ${JDKHOME}/demo/jfc/SampleTree/src/SampleData.java
 ${JDKHOME}/demo/jfc/SampleTree/src/SampleTree.java
 ${JDKHOME}/demo/jfc/SampleTree/src/SampleTreeCellRenderer.java
 ${JDKHOME}/demo/jfc/SampleTree/src/SampleTreeModel.java
+${JDKHOME}/demo/jfc/SampleTree/src/resources/
+${JDKHOME}/demo/jfc/SampleTree/src/resources/images/
+${JDKHOME}/demo/jfc/SampleTree/src/resources/images/collapsed.gif
+${JDKHOME}/demo/jfc/SampleTree/src/resources/images/expanded.gif
 ${JDKHOME}/demo/jfc/Stylepad/
 ${JDKHOME}/demo/jfc/Stylepad/README.txt
 ${JDKHOME}/demo/jfc/Stylepad/Stylepad.jar
-${JDKHOME}/demo/jfc/Stylepad/resources/
-${JDKHOME}/demo/jfc/Stylepad/resources/Notepad.properties
-${JDKHOME}/demo/jfc/Stylepad/resources/Notepad_fr.properties
-${JDKHOME}/demo/jfc/Stylepad/resources/Notepad_sv.properties
-${JDKHOME}/demo/jfc/Stylepad/resources/Notepad_zh_CN.properties
-${JDKHOME}/demo/jfc/Stylepad/resources/Stylepad.properties
-${JDKHOME}/demo/jfc/Stylepad/resources/Stylepad_sv.properties
-${JDKHOME}/demo/jfc/Stylepad/resources/Stylepad_zh_CN.properties
-${JDKHOME}/demo/jfc/Stylepad/resources/alice.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/bold.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/bullets.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/caterpillar.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/center.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/copy.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/cut.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/fg.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/hatter.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/italic.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/left.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/new.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/open.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/paste.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/rabbit.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/rabbit2.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/right.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/save.gif
-${JDKHOME}/demo/jfc/Stylepad/resources/underline.gif
 ${JDKHOME}/demo/jfc/Stylepad/src/
 ${JDKHOME}/demo/jfc/Stylepad/src/ElementTreePanel.java
 ${JDKHOME}/demo/jfc/Stylepad/src/HelloWorld.java
 ${JDKHOME}/demo/jfc/Stylepad/src/Notepad.java
 ${JDKHOME}/demo/jfc/Stylepad/src/Stylepad.java
 ${JDKHOME}/demo/jfc/Stylepad/src/Wonderland.java
+${JDKHOME}/demo/jfc/Stylepad/src/resources/
+${JDKHOME}/demo/jfc/Stylepad/src/resources/Notepad.properties
+${JDKHOME}/demo/jfc/Stylepad/src/resources/Notepad_fr.properties
+${JDKHOME}/demo/jfc/Stylepad/src/resources/Notepad_sv.properties
+${JDKHOME}/demo/jfc/Stylepad/src/resources/Notepad_zh_CN.properties
+${JDKHOME}/demo/jfc/Stylepad/src/resources/Stylepad.properties
+${JDKHOME}/demo/jfc/Stylepad/src/resources/Stylepad_sv.properties
+${JDKHOME}/demo/jfc/Stylepad/src/resources/Stylepad_zh_CN.properties
+${JDKHOME}/demo/jfc/Stylepad/src/resources/alice.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/bold.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/bullets.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/caterpillar.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/center.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/copy.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/cut.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/fg.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/hatter.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/italic.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/left.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/new.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/open.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/paste.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/rabbit.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/rabbit2.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/right.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/save.gif
+${JDKHOME}/demo/jfc/Stylepad/src/resources/underline.gif
 ${JDKHOME}/demo/jfc/SwingApplet/
 ${JDKHOME}/demo/jfc/SwingApplet/README.txt
 ${JDKHOME}/demo/jfc/SwingApplet/SwingApplet.html
@@ -546,6 +577,210 @@ ${JDKHOME}/demo/jfc/SwingSet2/src/TabbedPaneDemo.java
 ${JDKHOME}/demo/jfc/SwingSet2/src/TableDemo.java
 ${JDKHOME}/demo/jfc/SwingSet2/src/ToolTipDemo.java
 ${JDKHOME}/demo/jfc/SwingSet2/src/TreeDemo.java
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/ant.html
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/bug.html
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/About.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/COPYRIGHT
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/apple.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/asparagus.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/banana.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/broccoli.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/cantaloupe.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/carrot.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/corn.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/grapefruit.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/grapes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/kiwi.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/onion.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/peach.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/pear.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/pepper.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/pickle.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/pineapple.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/raspberry.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/strawberry.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/tomato.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/watermelon.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/cab.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/cab_small.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/fish.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/fish_small.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/moon.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/moon_small.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/sun.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/sun_small.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/COPYRIGHT
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/ant.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/book.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/bug.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/bug2.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/crest.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/king.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/micro.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/seaweed.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Splash.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b1.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b1d.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b1p.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b1r.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b2.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b2d.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b2p.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b2r.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b3.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b3d.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b3p.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b3r.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/bl.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/bldn.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/bm.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/bmdn.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/br.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/brdn.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/c.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cb.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cbr.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cbrs.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cbs.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cdn.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/ml.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/mldn.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/mr.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/mrdn.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rb.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rbp.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rbr.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rbrs.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rbs.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tl.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tldn.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tm.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tmdn.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/toggle.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/toggledn.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tr.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/trdn.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/brenteyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/brenthair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/brentmouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/georgeseyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/georgeshair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/georgesmouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/hanseyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/hanshair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/hansmouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/howardeyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/howardhair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/howardmouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jameseyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jameshair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jamesmouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jeffeyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jeffhair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jeffmouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/joneyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jonhair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jonmouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/laraeyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/larahair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/laramouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/larryeyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/larryhair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/larrymouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/lisaeyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/lisahair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/lisamouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/michaeleyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/michaelhair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/michaelmouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/philipeyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/philiphair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/philipmouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/scotteyes.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/scotthair.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/scottmouth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/find.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/gifIcon.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/help.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/jpgIcon.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/htmldemo/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/htmldemo/back.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/htmldemo/forward.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/htmldemo/header.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/blue.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/cyan.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/gray.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/green.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/magenta.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/red.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/yellow.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/optionpane/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/optionpane/bottle.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/optionpane/ibd.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/optionpane/ibu.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/COPYRIGHT
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/colheader.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/crayons.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/lowerleft.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/rowheader.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/upperleft.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/upperright.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splitpane/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splitpane/README
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splitpane/earth.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splitpane/moon.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/blake.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/brooke.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/david.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/ewan.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/ewan.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/hania.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/laine.jpg
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/matthew.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/stephen.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JButton.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JColorChooser.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JComboBox.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JDesktop.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JDialog.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JEditorPane.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JFileChooser.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JList.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JMenu.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JOptionPane.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JProgressBar.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JRadioButton.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JScrollBar.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JScrollPane.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JSlider.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JSplitPane.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JTabbedPane.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JTable.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JTree.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/ToolTip.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tooltip/
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tooltip/cow.gif
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/index.html
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/king.html
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/preface.html
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/seaweed.html
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/swingset.properties
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/swingset_ja.properties
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/title.html
+${JDKHOME}/demo/jfc/SwingSet2/src/resources/tree.txt
 ${JDKHOME}/demo/jfc/TableExample/
 ${JDKHOME}/demo/jfc/TableExample/README.txt
 ${JDKHOME}/demo/jfc/TableExample/TableExample.jar
@@ -649,12 +884,15 @@ ${JDKHOME}/demo/jvmti/hprof/src/hprof_util.c
 ${JDKHOME}/demo/jvmti/hprof/src/hprof_util.h
 ${JDKHOME}/demo/jvmti/hprof/src/jvm.hprof.txt
 ${JDKHOME}/demo/jvmti/hprof/src/manual.html
+${JDKHOME}/demo/jvmti/hprof/src/sample.makefile.txt
 ${JDKHOME}/demo/jvmti/index.html
 ${JDKHOME}/demo/jvmti/java_crw_demo/
 ${JDKHOME}/demo/jvmti/java_crw_demo/README.txt
 ${JDKHOME}/demo/jvmti/java_crw_demo/src/
+${JDKHOME}/demo/jvmti/java_crw_demo/src/classfile_constants.h
 ${JDKHOME}/demo/jvmti/java_crw_demo/src/java_crw_demo.c
 ${JDKHOME}/demo/jvmti/java_crw_demo/src/java_crw_demo.h
+${JDKHOME}/demo/jvmti/java_crw_demo/src/sample.makefile.txt
 ${JDKHOME}/demo/jvmti/java_crw_demo/src/test_crw.c
 ${JDKHOME}/demo/jvmti/mtrace/
 ${JDKHOME}/demo/jvmti/mtrace/README.txt
@@ -694,6 +932,11 @@ ${JDKHOME}/demo/management/FullThreadDump/src/
 ${JDKHOME}/demo/management/FullThreadDump/src/Deadlock.java
 ${JDKHOME}/demo/management/FullThreadDump/src/FullThreadDump.java
 ${JDKHOME}/demo/management/FullThreadDump/src/ThreadMonitor.java
+${JDKHOME}/demo/management/JTop/
+${JDKHOME}/demo/management/JTop/JTop.jar
+${JDKHOME}/demo/management/JTop/README.txt
+${JDKHOME}/demo/management/JTop/src/
+${JDKHOME}/demo/management/JTop/src/JTop.java
 ${JDKHOME}/demo/management/MemoryMonitor/
 ${JDKHOME}/demo/management/MemoryMonitor/MemoryMonitor.jar
 ${JDKHOME}/demo/management/MemoryMonitor/README.txt
@@ -957,6 +1200,7 @@ ${JDKHOME}/demo/management/index.html
 @comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/CodePointIM.jar
 @comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/README.html
 @comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/README_ja.html
+@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/README_zh_CN.html
 @comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/
 @comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/CodePointIM.java
 @comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/CodePointInputMethod.java
@@ -964,16 +1208,18 @@ ${JDKHOME}/demo/management/index.html
 @comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/resources/
 @comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/resources/codepoint.properties
 @comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/resources/codepoint_ja.properties
+@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/resources/codepoint_zh_CN.properties
 @comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/
 @comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/FileChooserDemo.jar
 @comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/README.txt
-@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/images/
-@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/images/gifIcon.gif
-@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/images/jpgIcon.jpg
 @comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/
 @comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/ExampleFileFilter.java
 @comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/ExampleFileView.java
 @comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/FileChooserDemo.java
+@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/resources/
+@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/resources/images/
+@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/resources/images/gifIcon.gif
+@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/resources/images/jpgIcon.jpg
 @comment ${JDKHOME}/demo/plugin/jfc/Font2DTest/
 @comment ${JDKHOME}/demo/plugin/jfc/Font2DTest/Font2DTest.html
 @comment ${JDKHOME}/demo/plugin/jfc/Font2DTest/Font2DTest.jar
@@ -988,6 +1234,40 @@ ${JDKHOME}/demo/management/index.html
 @comment ${JDKHOME}/demo/plugin/jfc/Java2D/Java2Demo.jar
 @comment ${JDKHOME}/demo/plugin/jfc/Java2D/README.txt
 @comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/fonts/
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/fonts/A.ttf
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/bld.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/boat.png
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/box.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/boxwave.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/clone.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/clouds.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/cupanim.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/duke.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/duke.png
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/duke.running.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/dukeplug.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/fight.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/globe.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/java-logo.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/java_logo.png
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/jumptojavastrip.png
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/loop.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/looping.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/magnify.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/painting.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/print.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/remove.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/snooze.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/star7.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/start.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/start2.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/stop.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/stop2.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/surfing.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/thumbsup.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/tip.gif
 @comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/
 @comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/AnimatingControlsSurface.java
 @comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/AnimatingSurface.java
@@ -1064,26 +1344,8 @@ ${JDKHOME}/demo/management/index.html
 @comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Transforms/SelectTx.java
 @comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Transforms/TransformAnim.java
 @comment ${JDKHOME}/demo/plugin/jfc/Metalworks/
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/HelpFiles/
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/HelpFiles/back.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/HelpFiles/credits.html
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/HelpFiles/duke.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/HelpFiles/javalogo.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/HelpFiles/metal.html
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/HelpFiles/metalworks.html
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/HelpFiles/swing.html
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/HelpFiles/toc.html
 @comment ${JDKHOME}/demo/plugin/jfc/Metalworks/Metalworks.jar
 @comment ${JDKHOME}/demo/plugin/jfc/Metalworks/README.txt
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/images/
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/images/palette_crop.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/images/palette_draw.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/images/palette_hand.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/images/palette_select.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/images/palette_text.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/images/palette_zoom.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/resources/
-@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/resources/MyTheme.theme
 @comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/
 @comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/AquaMetalTheme.java
 @comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/BigContrastMetalTheme.java
@@ -1100,71 +1362,83 @@ ${JDKHOME}/demo/management/index.html
 @comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/MetalworksPrefs.java
 @comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/PropertiesMetalTheme.java
 @comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/UISwitchListener.java
+@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/
+@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/
+@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/back.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/credits.html
+@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/duke.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/javalogo.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/metal.html
+@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/metalworks.html
+@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/swing.html
+@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/toc.html
+@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/MyTheme.theme
 @comment ${JDKHOME}/demo/plugin/jfc/Notepad/
 @comment ${JDKHOME}/demo/plugin/jfc/Notepad/Notepad.jar
 @comment ${JDKHOME}/demo/plugin/jfc/Notepad/README.txt
-@comment ${JDKHOME}/demo/plugin/jfc/Notepad/resources/
-@comment ${JDKHOME}/demo/plugin/jfc/Notepad/resources/Notepad.properties
-@comment ${JDKHOME}/demo/plugin/jfc/Notepad/resources/Notepad_fr.properties
-@comment ${JDKHOME}/demo/plugin/jfc/Notepad/resources/Notepad_sv.properties
-@comment ${JDKHOME}/demo/plugin/jfc/Notepad/resources/Notepad_zh_CN.properties
-@comment ${JDKHOME}/demo/plugin/jfc/Notepad/resources/copy.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Notepad/resources/cut.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Notepad/resources/new.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Notepad/resources/open.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Notepad/resources/paste.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Notepad/resources/save.gif
 @comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/
 @comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/ElementTreePanel.java
 @comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/Notepad.java
+@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/
+@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/Notepad.properties
+@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/Notepad_fr.properties
+@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/Notepad_sv.properties
+@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/Notepad_zh_CN.properties
+@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/copy.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/cut.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/new.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/open.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/paste.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/save.gif
 @comment ${JDKHOME}/demo/plugin/jfc/SampleTree/
 @comment ${JDKHOME}/demo/plugin/jfc/SampleTree/README.txt
 @comment ${JDKHOME}/demo/plugin/jfc/SampleTree/SampleTree.jar
-@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/images/
-@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/images/collapsed.gif
-@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/images/expanded.gif
 @comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/
 @comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/DynamicTreeNode.java
 @comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/SampleData.java
 @comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/SampleTree.java
 @comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/SampleTreeCellRenderer.java
 @comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/SampleTreeModel.java
+@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/resources/
+@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/resources/images/
+@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/resources/images/collapsed.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/resources/images/expanded.gif
 @comment ${JDKHOME}/demo/plugin/jfc/Stylepad/
 @comment ${JDKHOME}/demo/plugin/jfc/Stylepad/README.txt
 @comment ${JDKHOME}/demo/plugin/jfc/Stylepad/Stylepad.jar
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/Notepad.properties
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/Notepad_fr.properties
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/Notepad_sv.properties
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/Notepad_zh_CN.properties
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/Stylepad.properties
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/Stylepad_sv.properties
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/Stylepad_zh_CN.properties
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/alice.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/bold.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/bullets.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/caterpillar.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/center.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/copy.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/cut.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/fg.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/hatter.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/italic.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/left.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/new.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/open.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/paste.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/rabbit.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/rabbit2.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/right.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/save.gif
-@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/resources/underline.gif
 @comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/
 @comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/ElementTreePanel.java
 @comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/HelloWorld.java
 @comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/Notepad.java
 @comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/Stylepad.java
 @comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/Wonderland.java
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Notepad.properties
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Notepad_fr.properties
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Notepad_sv.properties
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Notepad_zh_CN.properties
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Stylepad.properties
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Stylepad_sv.properties
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Stylepad_zh_CN.properties
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/alice.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/bold.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/bullets.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/caterpillar.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/center.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/copy.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/cut.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/fg.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/hatter.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/italic.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/left.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/new.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/open.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/paste.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/rabbit.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/rabbit2.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/right.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/save.gif
+@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/underline.gif
 @comment ${JDKHOME}/demo/plugin/jfc/SwingApplet/
 @comment ${JDKHOME}/demo/plugin/jfc/SwingApplet/README.txt
 @comment ${JDKHOME}/demo/plugin/jfc/SwingApplet/SwingApplet.html
@@ -1207,6 +1481,210 @@ ${JDKHOME}/demo/management/index.html
 @comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/TableDemo.java
 @comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/ToolTipDemo.java
 @comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/TreeDemo.java
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/ant.html
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/bug.html
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/About.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/COPYRIGHT
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/apple.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/asparagus.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/banana.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/broccoli.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/cantaloupe.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/carrot.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/corn.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/grapefruit.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/grapes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/kiwi.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/onion.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/peach.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/pear.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/pepper.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/pickle.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/pineapple.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/raspberry.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/strawberry.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/tomato.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/watermelon.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/cab.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/cab_small.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/fish.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/fish_small.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/moon.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/moon_small.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/sun.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/sun_small.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/COPYRIGHT
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/ant.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/book.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/bug.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/bug2.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/crest.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/king.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/micro.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/seaweed.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Splash.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b1.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b1d.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b1p.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b1r.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b2.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b2d.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b2p.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b2r.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b3.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b3d.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b3p.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b3r.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/bl.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/bldn.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/bm.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/bmdn.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/br.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/brdn.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/c.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/cb.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/cbr.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/cbrs.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/cbs.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/cdn.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/ml.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/mldn.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/mr.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/mrdn.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/rb.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/rbp.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/rbr.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/rbrs.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/rbs.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/tl.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/tldn.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/tm.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/tmdn.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/toggle.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/toggledn.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/tr.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/trdn.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/brenteyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/brenthair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/brentmouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/georgeseyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/georgeshair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/georgesmouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/hanseyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/hanshair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/hansmouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/howardeyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/howardhair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/howardmouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jameseyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jameshair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jamesmouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jeffeyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jeffhair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jeffmouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/joneyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jonhair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jonmouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/laraeyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/larahair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/laramouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/larryeyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/larryhair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/larrymouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/lisaeyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/lisahair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/lisamouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/michaeleyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/michaelhair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/michaelmouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/philipeyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/philiphair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/philipmouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/scotteyes.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/scotthair.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/scottmouth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/filechooser/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/filechooser/find.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/filechooser/gifIcon.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/filechooser/help.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/filechooser/jpgIcon.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/htmldemo/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/htmldemo/back.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/htmldemo/forward.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/htmldemo/header.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/blue.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/cyan.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/gray.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/green.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/magenta.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/red.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/yellow.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/optionpane/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/optionpane/bottle.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/optionpane/ibd.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/optionpane/ibu.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/COPYRIGHT
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/colheader.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/crayons.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/lowerleft.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/rowheader.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/upperleft.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/upperright.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/splitpane/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/splitpane/README
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/splitpane/earth.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/splitpane/moon.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/blake.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/brooke.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/david.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/ewan.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/ewan.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/hania.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/laine.jpg
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/matthew.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/stephen.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JButton.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JColorChooser.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JComboBox.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JDesktop.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JDialog.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JEditorPane.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JFileChooser.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JList.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JMenu.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JOptionPane.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JProgressBar.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JRadioButton.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JScrollBar.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JScrollPane.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JSlider.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JSplitPane.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JTabbedPane.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JTable.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JTree.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/ToolTip.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tooltip/
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tooltip/cow.gif
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/index.html
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/king.html
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/preface.html
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/seaweed.html
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/swingset.properties
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/swingset_ja.properties
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/title.html
+@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/tree.txt
 @comment ${JDKHOME}/demo/plugin/jfc/TableExample/
 @comment ${JDKHOME}/demo/plugin/jfc/TableExample/README.txt
 @comment ${JDKHOME}/demo/plugin/jfc/TableExample/TableExample.jar
@@ -1484,7 +1962,6 @@ ${JDKHOME}/jre/lib/zi/Africa/Nouakchott
 ${JDKHOME}/jre/lib/zi/Africa/Ouagadougou
 ${JDKHOME}/jre/lib/zi/Africa/Porto-Novo
 ${JDKHOME}/jre/lib/zi/Africa/Sao_Tome
-${JDKHOME}/jre/lib/zi/Africa/Timbuktu
 ${JDKHOME}/jre/lib/zi/Africa/Tripoli
 ${JDKHOME}/jre/lib/zi/Africa/Tunis
 ${JDKHOME}/jre/lib/zi/Africa/Windhoek
@@ -1494,6 +1971,17 @@ ${JDKHOME}/jre/lib/zi/America/Anchorage
 ${JDKHOME}/jre/lib/zi/America/Anguilla
 ${JDKHOME}/jre/lib/zi/America/Antigua
 ${JDKHOME}/jre/lib/zi/America/Araguaina
+${JDKHOME}/jre/lib/zi/America/Argentina/
+${JDKHOME}/jre/lib/zi/America/Argentina/Buenos_Aires
+${JDKHOME}/jre/lib/zi/America/Argentina/Catamarca
+${JDKHOME}/jre/lib/zi/America/Argentina/Cordoba
+${JDKHOME}/jre/lib/zi/America/Argentina/Jujuy
+${JDKHOME}/jre/lib/zi/America/Argentina/La_Rioja
+${JDKHOME}/jre/lib/zi/America/Argentina/Mendoza
+${JDKHOME}/jre/lib/zi/America/Argentina/Rio_Gallegos
+${JDKHOME}/jre/lib/zi/America/Argentina/San_Juan
+${JDKHOME}/jre/lib/zi/America/Argentina/Tucuman
+${JDKHOME}/jre/lib/zi/America/Argentina/Ushuaia
 ${JDKHOME}/jre/lib/zi/America/Aruba
 ${JDKHOME}/jre/lib/zi/America/Asuncion
 ${JDKHOME}/jre/lib/zi/America/Atikokan
@@ -1505,17 +1993,14 @@ ${JDKHOME}/jre/lib/zi/America/Blanc-Sablon
 ${JDKHOME}/jre/lib/zi/America/Boa_Vista
 ${JDKHOME}/jre/lib/zi/America/Bogota
 ${JDKHOME}/jre/lib/zi/America/Boise
-${JDKHOME}/jre/lib/zi/America/Buenos_Aires
 ${JDKHOME}/jre/lib/zi/America/Cambridge_Bay
 ${JDKHOME}/jre/lib/zi/America/Campo_Grande
 ${JDKHOME}/jre/lib/zi/America/Cancun
 ${JDKHOME}/jre/lib/zi/America/Caracas
-${JDKHOME}/jre/lib/zi/America/Catamarca
 ${JDKHOME}/jre/lib/zi/America/Cayenne
 ${JDKHOME}/jre/lib/zi/America/Cayman
 ${JDKHOME}/jre/lib/zi/America/Chicago
 ${JDKHOME}/jre/lib/zi/America/Chihuahua
-${JDKHOME}/jre/lib/zi/America/Cordoba
 ${JDKHOME}/jre/lib/zi/America/Costa_Rica
 ${JDKHOME}/jre/lib/zi/America/Cuiaba
 ${JDKHOME}/jre/lib/zi/America/Curacao
@@ -1548,11 +2033,9 @@ ${JDKHOME}/jre/lib/zi/America/Indiana/Marengo
 ${JDKHOME}/jre/lib/zi/America/Indiana/Petersburg
 ${JDKHOME}/jre/lib/zi/America/Indiana/Vevay
 ${JDKHOME}/jre/lib/zi/America/Indiana/Vincennes
-${JDKHOME}/jre/lib/zi/America/Indiana/Winamac
 ${JDKHOME}/jre/lib/zi/America/Inuvik
 ${JDKHOME}/jre/lib/zi/America/Iqaluit
 ${JDKHOME}/jre/lib/zi/America/Jamaica
-${JDKHOME}/jre/lib/zi/America/Jujuy
 ${JDKHOME}/jre/lib/zi/America/Juneau
 ${JDKHOME}/jre/lib/zi/America/Kentucky/
 ${JDKHOME}/jre/lib/zi/America/Kentucky/Louisville
@@ -1565,7 +2048,6 @@ ${JDKHOME}/jre/lib/zi/America/Managua
 ${JDKHOME}/jre/lib/zi/America/Manaus
 ${JDKHOME}/jre/lib/zi/America/Martinique
 ${JDKHOME}/jre/lib/zi/America/Mazatlan
-${JDKHOME}/jre/lib/zi/America/Mendoza
 ${JDKHOME}/jre/lib/zi/America/Menominee
 ${JDKHOME}/jre/lib/zi/America/Merida
 ${JDKHOME}/jre/lib/zi/America/Mexico_City
@@ -1721,6 +2203,7 @@ ${JDKHOME}/jre/lib/zi/Australia/
 ${JDKHOME}/jre/lib/zi/Australia/Adelaide
 ${JDKHOME}/jre/lib/zi/Australia/Brisbane
 ${JDKHOME}/jre/lib/zi/Australia/Broken_Hill
+${JDKHOME}/jre/lib/zi/Australia/Currie
 ${JDKHOME}/jre/lib/zi/Australia/Darwin
 ${JDKHOME}/jre/lib/zi/Australia/Hobart
 ${JDKHOME}/jre/lib/zi/Australia/Lindeman
@@ -1767,7 +2250,6 @@ ${JDKHOME}/jre/lib/zi/Europe/
 ${JDKHOME}/jre/lib/zi/Europe/Amsterdam
 ${JDKHOME}/jre/lib/zi/Europe/Andorra
 ${JDKHOME}/jre/lib/zi/Europe/Athens
-${JDKHOME}/jre/lib/zi/Europe/Belfast
 ${JDKHOME}/jre/lib/zi/Europe/Belgrade
 ${JDKHOME}/jre/lib/zi/Europe/Berlin
 ${JDKHOME}/jre/lib/zi/Europe/Brussels
@@ -1804,6 +2286,7 @@ ${JDKHOME}/jre/lib/zi/Europe/Uzhgorod
 ${JDKHOME}/jre/lib/zi/Europe/Vaduz
 ${JDKHOME}/jre/lib/zi/Europe/Vienna
 ${JDKHOME}/jre/lib/zi/Europe/Vilnius
+${JDKHOME}/jre/lib/zi/Europe/Volgograd
 ${JDKHOME}/jre/lib/zi/Europe/Warsaw
 ${JDKHOME}/jre/lib/zi/Europe/Zaporozhye
 ${JDKHOME}/jre/lib/zi/Europe/Zurich
@@ -1864,7 +2347,20 @@ ${JDKHOME}/jre/lib/zi/Pacific/Tongatapu
 ${JDKHOME}/jre/lib/zi/Pacific/Truk
 ${JDKHOME}/jre/lib/zi/Pacific/Wake
 ${JDKHOME}/jre/lib/zi/Pacific/Wallis
-${JDKHOME}/jre/lib/zi/Pacific/Yap
+${JDKHOME}/jre/lib/zi/SystemV/
+${JDKHOME}/jre/lib/zi/SystemV/AST4
+${JDKHOME}/jre/lib/zi/SystemV/AST4ADT
+${JDKHOME}/jre/lib/zi/SystemV/CST6
+${JDKHOME}/jre/lib/zi/SystemV/CST6CDT
+${JDKHOME}/jre/lib/zi/SystemV/EST5
+${JDKHOME}/jre/lib/zi/SystemV/EST5EDT
+${JDKHOME}/jre/lib/zi/SystemV/HST10
+${JDKHOME}/jre/lib/zi/SystemV/MST7
+${JDKHOME}/jre/lib/zi/SystemV/MST7MDT
+${JDKHOME}/jre/lib/zi/SystemV/PST8
+${JDKHOME}/jre/lib/zi/SystemV/PST8PDT
+${JDKHOME}/jre/lib/zi/SystemV/YST9
+${JDKHOME}/jre/lib/zi/SystemV/YST9YDT
 ${JDKHOME}/jre/lib/zi/WET
 ${JDKHOME}/jre/lib/zi/ZoneInfoMappings
 @comment ${JDKHOME}/jre/plugin/