changeset 5413:d0da45e684e9

Merge from main jdk7u6 OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sun, 12 Aug 2012 15:29:21 -0700
parents 8084b9d08678 4bd052837497
children bc674d446705
files .hgtags make/com/sun/tools/attach/Makefile make/common/Defs-linux.gmk make/common/Defs-solaris.gmk make/common/Defs.gmk make/common/Program.gmk make/common/Release.gmk make/common/shared/Compiler-gcc.gmk make/common/shared/Sanity.gmk make/java/instrument/Makefile make/java/java_hprof_demo/Makefile make/java/management/Makefile make/java/npt/Makefile make/java/redist/Makefile make/javax/sound/jsoundalsa/Makefile make/jpda/transport/socket/Makefile make/mkdemo/jvmti/hprof/Makefile make/sun/font/Makefile make/sun/security/ec/Makefile make/sun/security/pkcs11/Makefile make/sun/tracing/dtrace/Makefile make/sun/xawt/Makefile src/share/bin/java.c src/share/classes/java/awt/GraphicsEnvironment.java src/share/classes/sun/awt/FontConfiguration.java src/share/classes/sun/nio/ch/DevPollSelectorProvider.java src/share/classes/sun/print/PSPrinterJob.java src/share/classes/sun/tools/jar/Main.java src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt src/share/native/sun/java2d/opengl/OGLTextRenderer.c src/solaris/classes/sun/print/UnixPrintServiceLookup.java src/solaris/native/com/sun/management/UnixOperatingSystem_md.c src/solaris/native/java/lang/java_props_md.c src/solaris/native/java/net/Inet6AddressImpl.c src/solaris/native/java/net/net_util_md.c src/solaris/native/java/util/TimeZone_md.c src/solaris/native/sun/awt/awt_LoadLibrary.c test/Makefile test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh test/java/io/File/isDirectory/Applet.java test/java/io/FileDescriptor/FileChannelFDTest.java test/java/util/zip/ZipFile/VmCrash.java test/java/util/zip/ZipFile/vmcrash.zip test/sun/nio/ch/SelProvider.java
diffstat 669 files changed, 20839 insertions(+), 9558 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Aug 04 10:32:21 2012 -0700
+++ b/.hgtags	Sun Aug 12 15:29:21 2012 -0700
@@ -160,6 +160,7 @@
 16781e84dcdb5f82c287a3b5387dde9f8aaf74e0 jdk7u4-b12
 c929e96aa059c8b79ab94d5b0b1a242ca53a5b32 jdk7u4-b13
 09f612bac047b132bb9bf7d4aa8afe6ea4d5b938 jdk7u4-b14
+9e15d1f3fa4b35b8c950323c76b9ed094d434b97 jdk7u5-b01
 00f0f18379ecb927a515d1540682a922bd0227ec jdk7u4-b15
 df20c60949f8cef09be1e89d754cff366eaf7aa4 jdk7u4-b16
 b4401b362fd8076d705aa57acb9967b5962a795d jdk7u4-b17
@@ -170,3 +171,31 @@
 0573d282ca247a2848c26fe2800c7f3aa8d2e882 jdk7u4-b21
 42ca70fcb2cedc0c4f1d860baa839e19a08770db jdk7u4-b22
 3e2214ca56663a1bc65d178a23ed2ee938814e38 jdk7u4-b31
+6ccd627b4af2fbddad3a52bad5db45027668da58 jdk7u5-b02
+b52b91e22ae2c598b77d4098dcffcb6c9a50321e jdk7u5-b04
+a6911b758836f1e9c8a0577fe655d6f79ee5f4ad jdk7u5-b05
+617a55f2478b7dace5d57eb7b3f68f311a17b43a jdk7u5-b30
+09f612bac047b132bb9bf7d4aa8afe6ea4d5b938 jdk7u6-b01
+420027ae37b33e350877f3616ec857c00bd4c958 jdk7u6-b02
+8e8cedfb1ee265f4aff8441bae2ebf0f5b1ee853 jdk7u6-b03
+7bfc566a0e6df163f5fac561435663c23980df46 jdk7u6-b04
+26243ee3de2ec24bc616b2e002b2ef22429e7129 jdk7u6-b05
+bdba5717e827fe1944f7474bfafe29a21f024a0b jdk7u6-b06
+37fe62ce49ccb748df9cdc681f1f30f61778ccc9 jdk7u6-b07
+a5949f7b86939e97a8c44b9a0cea2c51602d271f jdk7u6-b08
+9e4fcaae817566977095c7beb72e2523e924a9d1 jdk7u6-b09
+a2bd61800667c38d759a0e02a756063d47dbcdc0 jdk7u6-b10
+18a1b4f0681ae6e748fc60162dd76e357de3304b jdk7u6-b11
+76306dce87104d9f333db3371ca97c80cac9674a jdk7u6-b12
+aa49fe7490963f0c53741fbca3a175e0fec93951 jdk7u6-b13
+3ce621d9b988abcccd86b52a97ea39133006c245 jdk7u6-b14
+e50c9a5f001c61f49e7e71b25b97ed4095d3557b jdk7u6-b15
+966e21feb7f088e318a35b069c1a61ff6363e554 jdk7u6-b16
+aa0ad405f70bc7a7af95fef109f114ceecf31232 jdk7u6-b17
+4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18
+a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19
+09145b546a2b6ae1f44d5c8a7d2a37d48e4b39e2 jdk7u6-b20
+243717d7fe9589148951ffb5551264af0e446314 jdk7u6-b21
+d78f2b600d393f45d6ace8ca0f29ad677624a775 jdk7u6-b22
+0ae89e53f5300da1961984a7d81c220c7cf717d7 jdk7u6-b23
+1c775da998735711853cfe1ae1d6baddc5f12a66 jdk7u6-b24
--- a/make/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -236,6 +236,9 @@
 ifeq ($(PLATFORM), macosx)
   SUBDIRS += apple
 endif
+ifeq ($(PLATFORM), windows)
+  SUBDIRS += bridge
+endif
 SUBDIRS_tools = launchers
 SUBDIRS_misc  = org sunw jpda mkdemo mksample
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/bridge/AccessBridgeJava/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,93 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Makefile for building AccessBridge
+#
+BUILDDIR = ../..
+PRODUCT = java
+PACKAGE = com.sun.java.accessibility
+
+include $(BUILDDIR)/common/Defs.gmk
+JARFILE = $(EXTDIR)/access-bridge$(ABSUFFIX).jar
+
+ifeq ($(ARCH_DATA_MODEL), 64)
+  ABPLATFORM = 64bit
+  ABSUFFIX = -64
+else
+ifeq ($(ARCH_DATA_MODEL), 32)
+ifdef ABLEGACY
+  ABSUFFIX = 
+  ABPLATFORM = legacy
+else
+  ABPLATFORM = 32bit
+  ABSUFFIX = -32
+endif
+endif
+endif
+
+#
+# Java files to compile.
+#
+FILES_java = com/sun/java/accessibility/AccessBridge.java
+
+#
+# Location for the newly built classfiles.
+#
+CLASSDESTDIR = $(TEMPDIR)/classes
+
+#
+# Rules
+#
+CLASSDESTDIR = $(TEMPDIR)/classes
+
+FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
+
+build: prebuild
+
+prebuild:
+	$(CP) $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility/$(ABPLATFORM)/AccessBridge.java \
+		$(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility
+
+all : build $(JARFILE) 
+
+#
+# JAR file
+#
+$(JARFILE): \
+	$(FILES_class)
+	$(BOOT_JAR_CMD) -cf $(JARFILE) \
+	     -C $(CLASSDESTDIR) com \
+	     $(BOOT_JAR_JFLAGS)
+	@$(java-vm-cleanup)
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Classes.gmk
+
+clean clobber::
+	$(RM) -r $(CLASSDESTDIR) \
+		 $(EXTDIR)/$(JARFILE)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/bridge/JAWTAccessBridge/Files_cpp.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Native files to compile.
+FILES_cpp = \
+	JAWTAccessBridge.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/bridge/JAWTAccessBridge/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,69 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Makefile for building JAWTAccessBridge
+#
+
+BUILDDIR = ../..
+LIBRARY = JAWTAccessBridge$(ABSUFFIX)
+include $(BUILDDIR)/common/Defs.gmk
+
+# Indicate we want the C++ compiler to do the linking.
+CPLUSPLUSLIBRARY=true
+
+ifeq ($(ARCH_DATA_MODEL), 64)
+  ABSUFFIX = -64
+  ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_64
+  ABRIDGE_MACHINE=X64
+else
+ifeq ($(ARCH_DATA_MODEL), 32)
+  ABRIDGE_MACHINE=I386
+ifdef ABLEGACY
+  ABSUFFIX = 
+  ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_LEGACY
+else
+  ABSUFFIX = -32
+  ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_32
+endif
+endif
+endif
+
+include FILES_cpp.gmk
+
+VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc
+
+OTHER_CPPFLAGS += -D$(ACCESSBRIDGE_ARCH) -I "$(INCLUDEDIR)" -I "$(PLATFORM_INCLUDE)"
+LDLIBS += kernel32.lib user32.lib gdi32.lib winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
+	uuid.lib odbc32.lib odbccp32.lib /subsystem:windows /dll /incremental:no /machine:$(ABRIDGE_MACHINE) \
+	/def:$(CLOSED_PLATFORM_SRC)/native/sun/bridge/JAWTAccessBridge.DEF  /libpath:"$(LIBDIR)"
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Library.gmk
+
+vpath %.cpp   $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.RC   $(CLOSED_PLATFORM_SRC)/native/sun/bridge
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/bridge/Jabswitch/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,63 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Makefile for building jabswitch.exe
+#
+
+BUILDDIR = ../..
+PROGRAM = jabswitch
+include $(BUILDDIR)/common/Defs.gmk
+
+# Indicate we want the C++ compiler to do the linking.
+CPLUSPLUSLIBRARY=true
+
+VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc
+VERSIONRES = $(TEMPDIR)/AccessBridgeStatusWindow.res
+
+JAB_EXE= $(TEMPDIR)/jabswitch.exe
+
+JAB_SRC = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/jabswitch.cpp
+
+JAB_MANIFEST_INP = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/jabswitch.manifest
+JAB_MANIFEST_OUT = $(TEMPDIR)/jabswitch.exe.intermediate.manifest
+
+RC_FLAGS += /fo "$(VERSIONRES)"
+OTHER_CPPFLAGS += /MD /Fo"$(TEMPDIR)/" /Fd"$(TEMPDIR)/" /analyze- /Od /Gd /nologo /Gm /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /RTC1 /W3 /ZI /Zc:wchar_t /EHsc 
+LDDFLAGS += Advapi32.lib Version.lib User32.lib
+
+all: buildexe copyfilejab
+
+buildexe : 
+	$(CD) $(TEMPDIR)  
+	$(RC) $(RC_FLAGS) $(VERSIONINFO_RESOURCE) 
+	$(CC) $(CPPFLAGS) $(JAB_SRC) $(LDDFLAGS) $(VERSIONRES) -o $(JAB_EXE) 
+	$(MT) /nologo /verbose /manifest $(JAB_MANIFEST_INP) /outputresource:$(JAB_EXE)  
+
+copyfilejab : 
+	$(CP) $(JAB_EXE) $(BINDIR)
+
+vpath %.cpp   $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.rc   $(CLOSED_PLATFORM_SRC)/native/sun/bridge
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/bridge/Jaccess/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,85 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Makefile for building jaccess
+#
+BUILDDIR = ../..
+PRODUCT = java
+PACKAGE = com.sun.java.accessibility.jaccess
+
+include $(BUILDDIR)/common/Defs.gmk
+JARFILE = $(EXTDIR)/jaccess.jar
+
+#
+# Java files to compile.
+#
+#AUTO_FILES_JAVA_DIRS = $(CLOSED_PLATFORM_SRC)/bridge
+FILES_java = \
+	com/sun/java/accessibility/util/AccessibilityEventMonitor.java \
+	com/sun/java/accessibility/util/AccessibilityListenerList.java \
+	com/sun/java/accessibility/util/AWTEventMonitor.java \
+	com/sun/java/accessibility/util/EventID.java \
+	com/sun/java/accessibility/util/EventQueueMonitor.java \
+	com/sun/java/accessibility/util/GUIInitializedListener.java \
+	com/sun/java/accessibility/util/GUIInitializedMulticaster.java \
+	com/sun/java/accessibility/util/SwingEventMonitor.java \
+	com/sun/java/accessibility/util/TopLevelWindowListener.java \
+	com/sun/java/accessibility/util/TopLevelWindowMulticaster.java \
+	com/sun/java/accessibility/util/Translator.java \
+	com/sun/java/accessibility/util/java/awt/ButtonTranslator.java \
+	com/sun/java/accessibility/util/java/awt/CheckboxTranslator.java \
+	com/sun/java/accessibility/util/java/awt/LabelTranslator.java \
+	com/sun/java/accessibility/util/java/awt/ListTranslator.java \
+	com/sun/java/accessibility/util/java/awt/TextComponentTranslator.java
+
+#
+# Rules
+#
+CLASSDESTDIR = $(TEMPDIR)/classes
+
+FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
+
+all : build $(JARFILE)
+
+#
+# JAR file
+#
+$(JARFILE): \
+	$(FILES_class)
+	$(BOOT_JAR_CMD) -cf $(JARFILE) \
+	     -C $(CLASSDESTDIR) com \
+	     $(BOOT_JAR_JFLAGS)
+	@$(java-vm-cleanup)
+
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Classes.gmk
+
+clean clobber::
+	$(RM) -r $(CLASSDESTDIR) \
+		 $(EXTDIR)/$(JARFILE)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/bridge/JavaAccessBridge/Files_cpp.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Native files to compile.
+FILES_cpp = \
+	AccessBridgeATInstance.cpp \
+	AccessBridgeDebug.cpp \
+	AccessBridgeJavaEntryPoints.cpp \
+	AccessBridgeMessages.cpp \
+	JavaAccessBridge.cpp 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/bridge/JavaAccessBridge/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,90 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Makefile for building JavaAccessBridge.DLL
+#
+
+BUILDDIR = ../..
+LIBRARY = JavaAccessBridge$(ABSUFFIX)
+include $(BUILDDIR)/common/Defs.gmk
+
+# Indicate we want the C++ compiler to do the linking.
+CPLUSPLUSLIBRARY=true
+
+ifeq ($(ARCH_DATA_MODEL), 64)
+  ABSUFFIX = -64
+  ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_64
+  ABRIDGE_MACHINE=X64
+else
+ifeq ($(ARCH_DATA_MODEL), 32)
+  ABRIDGE_MACHINE=I386
+ifdef ABLEGACY
+  ABSUFFIX = 
+  ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_LEGACY
+else
+  ABSUFFIX = -32
+  ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_32
+endif
+endif
+endif
+
+include FILES_cpp.gmk
+
+PLATFORM_INCLUDE_BRIDGE = $(PLATFORM_INCLUDE)/bridge
+
+VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc
+
+OTHER_CPPFLAGS += -D$(ACCESSBRIDGE_ARCH) -I "$(INCLUDEDIR)" -I "$(PLATFORM_INCLUDE)"
+LDLIBS += kernel32.lib user32.lib gdi32.lib winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \
+	odbc32.lib odbccp32.lib /subsystem:windows /dll /incremental:no /machine:$(ABRIDGE_MACHINE) \
+	/def:$(CLOSED_PLATFORM_SRC)/native/sun/bridge/JavaAccessBridge.DEF  /libpath:"$(LIBDIR)"
+
+all : build postbuild
+
+postbuild :
+	$(MKDIR) -p $(PLATFORM_INCLUDE_BRIDGE) 
+	$(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/accessibility.properties $(LIBDIR)
+	$(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeCallbacks.h $(PLATFORM_INCLUDE_BRIDGE)
+	$(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeCalls.h $(PLATFORM_INCLUDE_BRIDGE)
+	$(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgePackages.h $(PLATFORM_INCLUDE_BRIDGE)
+	$(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeCalls.c $(PLATFORM_INCLUDE_BRIDGE)
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Library.gmk
+
+vpath %.cpp   $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.DEF   $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.rc   $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.c   $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.h   $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+
+#
+# Extra clean rule.
+#
+clean clobber::
+	$(RM) $(FILES_h)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/bridge/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,65 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Makefile for building Java Access Bridge
+#
+
+BUILDDIR = ..
+include $(BUILDDIR)/common/Defs.gmk
+
+#
+#
+ifndef OPENJDK
+ifeq ($(PLATFORM), windows)
+include $(BUILDDIR)/common/Subdirs.gmk
+
+#
+# build for 32 and 64 bit (new api)
+#
+SUBDIRS = Jaccess JavaAccessBridge WindowsAccessBridge JAWTAccessBridge AccessBridgeJava Jabswitch
+#
+# build for legacy
+#
+ifeq ($(ARCH_DATA_MODEL), 32)
+OTHERSUBDIRS_MAKEFLAGS += ABLEGACY=true
+OTHERSUBDIRS = JavaAccessBridge WindowsAccessBridge JAWTAccessBridge AccessBridgeJava
+endif
+
+ifeq ($(ARCH_DATA_MODEL), 32)
+all build clean clobber ::
+	$(SUBDIRS-loop)
+	$(OTHERSUBDIRS-loop)
+else
+all build clean clobber ::
+	$(SUBDIRS-loop)
+endif
+
+clean::
+	$(RM) -r $(CLASSBINDIR) $(CLASSBINDIR)
+
+endif # PLATFORM
+endif #OPENJDK
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/bridge/WindowsAccessBridge/Files_cpp.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Native files to compile.
+FILES_cpp = \
+	AccessBridgeJavaVMInstance.cpp \
+	AccessBridgeMessageQueue.cpp \
+	AccessBridgeMessages.cpp \
+	AccessBridgeWindowsEntryPoints.cpp \
+	WinAccessBridge.cpp \
+	AccessBridgeDebug.cpp \
+	AccessBridgeEventHandler.cpp 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/bridge/WindowsAccessBridge/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,71 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Makefile for building WindowsAccessBridge.dll
+#
+
+BUILDDIR = ../..
+LIBRARY = WindowsAccessBridge$(ABSUFFIX)
+include $(BUILDDIR)/common/Defs.gmk
+
+# Indicate we want the C++ compiler to do the linking.
+CPLUSPLUSLIBRARY=true
+
+ifeq ($(ARCH_DATA_MODEL), 64)
+  ABSUFFIX = -64
+  ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_64
+  ABRIDGE_MACHINE=X64
+else
+ifeq ($(ARCH_DATA_MODEL), 32)
+  ABRIDGE_MACHINE=I386
+ifdef ABLEGACY
+  ABSUFFIX = 
+  ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_LEGACY
+else
+  ABSUFFIX = -32
+  ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_32
+endif
+endif
+endif
+
+include FILES_cpp.gmk
+
+VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc
+
+OTHER_CPPFLAGS += -MT -D$(ACCESSBRIDGE_ARCH) -I "$(INCLUDEDIR)" -I "$(PLATFORM_INCLUDE)"
+LDLIBS += kernel32.lib user32.lib gdi32.lib winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \
+	ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /subsystem:windows /dll /incremental:no /machine:$(ABRIDGE_MACHINE) \
+	/def:$(CLOSED_PLATFORM_SRC)/native/sun/bridge/WinAccessBridge.DEF  /libpath:"$(LIBDIR)"
+
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Library.gmk
+
+vpath %.cpp   $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.DEF   $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.rc   $(CLOSED_PLATFORM_SRC)/native/sun/bridge
--- a/make/com/apple/osxui/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/com/apple/osxui/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -65,12 +65,8 @@
 	com/apple/laf/ScreenMenuPropertyHandler.java \
 	com/apple/laf/ScreenMenuPropertyListener.java
 
-#RESOURCE_BUNDLES_COMPILED_PROPERTIES += \
-#	com/apple/laf/resources/aqua.properties \
-#	com/apple/laf/resources/aqua_de.properties \
-#	com/apple/laf/resources/aqua_fr.properties \
-#	com/apple/laf/resources/aqua_ja.properties
-
+RESOURCE_BUNDLES_COMPILED_PROPERTIES += \
+	com/apple/laf/resources/aqua.properties
 
 #
 # Rules
--- a/make/com/oracle/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/com/oracle/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -30,6 +30,24 @@
 #SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
 include $(BUILDDIR)/common/Defs.gmk
 
+JFR_SRCDIRS_EXIST := $(shell \
+  if [ -d $(CLOSED_SHARE_SRC)/native/oracle/jfr ] ; then \
+    echo true; \
+  else \
+    echo false; \
+  fi)
+
+JFR =
+ifndef OPENJDK
+  ifndef JAVASE_EMBEDDED
+    ifeq ($(JFR_SRCDIRS_EXIST), true)
+      ifneq (${ARCH},arm)
+        JFR = jfr
+      endif
+    endif
+  endif
+endif
+
 # build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds
 UCRYPTO =
 ifndef OPENJDK
@@ -38,13 +56,6 @@
   endif
 endif
 
-JFR =
-ifndef OPENJDK
-ifndef JAVASE_EMBEDDED
-	JFR = jfr
-endif
-endif
-
 SUBDIRS = $(JFR) net nio util $(UCRYPTO)
 
 include $(BUILDDIR)/common/Subdirs.gmk
--- a/make/com/oracle/security/ucrypto/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/com/oracle/security/ucrypto/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -139,7 +139,7 @@
   #
   CLASSDESTDIR = $(TEMPDIR)/classes
   JAVAHFLAGS = -bootclasspath \
-    "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)"
+    "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)"
 
   include $(BUILDDIR)/common/Mapfile-vers.gmk
   include $(BUILDDIR)/common/Library.gmk
--- a/make/com/sun/jmx/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/com/sun/jmx/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -100,6 +100,23 @@
 # so that *_tie classes are generated in package without the prefix
 # org.omg.stub (6375696)
 # 
+# To ensure the latest stub generator files are picked up from corba repo
+# when available, we need to run with latest rmic version available. rmic 
+# launch tool not built at this stage but we can invoke via rmi class.
+
+RMIC_JAVA = $(OUTPUTDIR)/bin/java
+# need to treat 64bit solaris differently
+ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
+RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
+endif
+ifeq ($(PLATFORM)-$(LIBARCH), solaris-sparcv9)
+RMIC_JAVA = $(OUTPUTDIR)/bin/sparcv9/java
+endif
+
+ifeq ($(CROSS_COMPILE_ARCH),)
+RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+endif  
+
 $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
 	$(prep-target)
 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
--- a/make/com/sun/tools/attach/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/com/sun/tools/attach/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
 #
 
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../../..
 PACKAGE = com.sun.tools.attach
 LIBRARY = attach
--- a/make/common/Defs-embedded.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/Defs-embedded.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
 OTHER_CPPFLAGS += -DJAVASE_EMBEDDED
 
 # Product naming
-PRODUCT_SUFFIX = SE Runtime Environment for Embedded
+PRODUCT_SUFFIX = SE Embedded Runtime Environment
 RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX)
 
 # Reduced JRE locations
@@ -60,6 +60,8 @@
   endif
 endif
 
+endif # JAVASE_EMBEDDED
+ifeq ($(ZERO_BUILD), )
 # NIO Platform specific source file location
 ifdef CROSS_COMPILE_ARCH
   NIO_PLATFORM_CLASSES_ROOT_DIR = $(CLOSED_PLATFORM_SRC)/classes/
@@ -71,6 +73,5 @@
 ifeq ($(CROSS_COMPILE_ARCH), arm)
   EXTRA_LIBS += $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs
 endif 
+endif
 
-endif # JAVASE_EMBEDDED
-
--- a/make/common/Defs-linux.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/Defs-linux.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -79,55 +79,90 @@
 CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
 CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
 
-# Default OBJCOPY comes from GNU Binutils on Linux:
-DEF_OBJCOPY=/usr/bin/objcopy
-ifdef CROSS_COMPILE_ARCH
-  # don't try to generate .debuginfo files when cross compiling
-  _JUNK_ := $(shell \
-    echo >&2 "INFO: cross compiling for ARCH $(CROSS_COMPILE_ARCH)," \
-      "skipping .debuginfo generation.")
-  OBJCOPY=
+# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
+# enabled with debug info files ZIP'ed to save space. For VARIANT !=
+# OPT builds, FDS is always enabled, after all a debug build without
+# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has
+# meaning when FDS is enabled.
+#
+# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
+# disabled for a VARIANT == OPT build.
+#
+# Note: Use of a different variable name for the FDS override option
+# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
+# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
+# in options via environment variables, use of distinct variables
+# prevents strange behaviours. For example, in a VARIANT != OPT build,
+# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the
+# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same
+# variable name is used, then different values can be picked up by
+# different parts of the build. Just to be clear, we only need two
+# variable names because the incoming option value can be overridden
+# in some situations, e.g., a VARIANT != OPT build.
+
+ifeq ($(VARIANT), OPT)
+  FULL_DEBUG_SYMBOLS ?= 1
+  ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
 else
-  OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
-  ifneq ($(ALT_OBJCOPY),)
-    _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
-    # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
-    OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
-  endif
+  # debug variants always get Full Debug Symbols (if available)
+  ENABLE_FULL_DEBUG_SYMBOLS = 1
 endif
+_JUNK_ := $(shell \
+  echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
+# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
 
-ifdef LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
-# The setting of OBJCOPY above enables the JDK build to import
-# .debuginfo files from the HotSpot build. However, adding FDS
-# support to the JDK build will occur in phases so a different
-# make variable is used to indicate that a particular library
-# supports FDS.
-
-ifeq ($(OBJCOPY),)
-  _JUNK_ := $(shell \
-    echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
-else
-  _JUNK_ := $(shell \
-    echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
-
-  # Library stripping policies for .debuginfo configs:
-  #   all_strip - strips everything from the library
-  #   min_strip - strips most stuff from the library; leaves minimum symbols
-  #   no_strip  - does not strip the library at all
-  #
-  # Oracle security policy requires "all_strip". A waiver was granted on
-  # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
-  #
-  DEF_STRIP_POLICY="min_strip"
-  ifeq ($(ALT_STRIP_POLICY),)
-    STRIP_POLICY=$(DEF_STRIP_POLICY)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  # Default OBJCOPY comes from GNU Binutils on Linux:
+  DEF_OBJCOPY=/usr/bin/objcopy
+  ifdef CROSS_COMPILE_ARCH
+    # don't try to generate .debuginfo files when cross compiling
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: cross compiling for ARCH $(CROSS_COMPILE_ARCH)," \
+        "skipping .debuginfo generation.")
+    OBJCOPY=
   else
-    STRIP_POLICY=$(ALT_STRIP_POLICY)
+    OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
+    ifneq ($(ALT_OBJCOPY),)
+      _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
+      # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
+      OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
+    endif
   endif
 
-  _JUNK_ := $(shell \
-    echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
-endif
+  # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the
+  # JDK build to import .debuginfo or .diz files from the HotSpot build.
+  # However, adding FDS support to the JDK build will occur in phases
+  # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
+  # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a
+  # particular library or program supports FDS.
+
+  ifeq ($(OBJCOPY),)
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
+    ENABLE_FULL_DEBUG_SYMBOLS=0
+  else
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
+
+    # Library stripping policies for .debuginfo configs:
+    #   all_strip - strips everything from the library
+    #   min_strip - strips most stuff from the library; leaves minimum symbols
+    #   no_strip  - does not strip the library at all
+    #
+    # Oracle security policy requires "all_strip". A waiver was granted on
+    # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
+    #
+    # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
+    STRIP_POLICY ?= min_strip
+
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
+
+    ZIP_DEBUGINFO_FILES ?= 1
+
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
+  endif
 endif
 
 #
@@ -226,6 +261,17 @@
   CFLAGS_REQUIRED += $(DEBUG_FLAG)
 endif
 
+# If Full Debug Symbols is enabled, then we want the same debug and
+# optimization flags as used by FASTDEBUG.
+#
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(VARIANT), OPT)
+      CC_OPT = $(DEBUG_FLAG) $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
+    endif
+  endif
+endif
+
 CFLAGS_OPT      = $(CC_OPT)
 CFLAGS_DBG      = $(DEBUG_FLAG)
 CFLAGS_COMMON += $(CFLAGS_REQUIRED)
@@ -419,6 +465,7 @@
 HOTSPOT_SALIB_PATH   = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)
 SALIB_NAME = $(LIB_PREFIX)saproc.$(LIBRARY_SUFFIX)
 SA_DEBUGINFO_NAME = $(LIB_PREFIX)saproc.debuginfo
+SA_DIZ_NAME = $(LIB_PREFIX)saproc.diz
 
 # The JDI - Serviceability Agent binding is not currently supported
 # on Linux-ia64.
--- a/make/common/Defs-solaris.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/Defs-solaris.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -79,67 +79,86 @@
 CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
 CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
 
-ifdef ENABLE_FULL_DEBUG_SYMBOLS
-# Only check for Full Debug Symbols support on Solaris if it is
-# specifically enabled. Hopefully, it can be enabled by default
-# once the .debuginfo size issues are worked out.
+# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
+# enabled with debug info files ZIP'ed to save space. For VARIANT !=
+# OPT builds, FDS is always enabled, after all a debug build without
+# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has
+# meaning when FDS is enabled.
+#
+# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
+# disabled for a VARIANT == OPT build.
+#
+# Note: Use of a different variable name for the FDS override option
+# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
+# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
+# in options via environment variables, use of distinct variables
+# prevents strange behaviours. For example, in a VARIANT != OPT build,
+# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the
+# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same
+# variable name is used, then different values can be picked up by
+# different parts of the build. Just to be clear, we only need two
+# variable names because the incoming option value can be overridden
+# in some situations, e.g., a VARIANT != OPT build.
 
-# Default OBJCOPY comes from the SUNWbinutils package:
-DEF_OBJCOPY=/usr/sfw/bin/gobjcopy
-ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
-  # On Solaris AMD64/X64, gobjcopy is not happy and fails:
-  #
-  # usr/sfw/bin/gobjcopy --add-gnu-debuglink=<lib>.debuginfo <lib>.so
-  # BFD: stKPaiop: Not enough room for program headers, try linking with -N
-  # /usr/sfw/bin/gobjcopy: stKPaiop: Bad value
-  # BFD: stKPaiop: Not enough room for program headers, try linking with -N
-  # /usr/sfw/bin/gobjcopy: libsaproc.debuginfo: Bad value
-  # BFD: stKPaiop: Not enough room for program headers, try linking with -N
-  # /usr/sfw/bin/gobjcopy: stKPaiop: Bad value
-  _JUNK_ := $(shell \
-    echo >&2 "INFO: $(DEF_OBJCOPY) is not working on Solaris AMD64/X64")
-  OBJCOPY=
+ADD_GNU_DEBUGLINK = $(ABS_BUILDTOOLBINDIR)/add_gnu_debuglink
+FIX_EMPTY_SEC_HDR_FLAGS = $(ABS_BUILDTOOLBINDIR)/fix_empty_sec_hdr_flags
+
+ifeq ($(VARIANT), OPT)
+  FULL_DEBUG_SYMBOLS ?= 1
+  ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
 else
+  # debug variants always get Full Debug Symbols (if available)
+  ENABLE_FULL_DEBUG_SYMBOLS = 1
+endif
+_JUNK_ := $(shell \
+  echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
+# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
+
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  # Default OBJCOPY comes from the SUNWbinutils package:
+  DEF_OBJCOPY=/usr/sfw/bin/gobjcopy
   OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
   ifneq ($(ALT_OBJCOPY),)
     _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
     # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
     OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
   endif
-endif
 
-ifdef LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
-# The setting of OBJCOPY above enables the JDK build to import
-# .debuginfo files from the HotSpot build. However, adding FDS
-# support to the JDK build will occur in phases so a different
-# make variable is used to indicate that a particular library
-# supports FDS.
+  # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the
+  # JDK build to import .debuginfo or .diz files from the HotSpot build.
+  # However, adding FDS support to the JDK build will occur in phases
+  # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
+  # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a
+  # particular library or program supports FDS.
 
-ifeq ($(OBJCOPY),)
-  _JUNK_ := $(shell \
-    echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
-else
-  _JUNK_ := $(shell \
-    echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
+  ifeq ($(OBJCOPY),)
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
+    ENABLE_FULL_DEBUG_SYMBOLS=0
+  else
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
 
-  # Library stripping policies for .debuginfo configs:
-  #   all_strip - strips everything from the library
-  #   min_strip - strips most stuff from the library; leaves minimum symbols
-  #   no_strip  - does not strip the library at all
-  #
-  # Oracle security policy requires "all_strip". A waiver was granted on
-  # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
-  #
-  DEF_STRIP_POLICY="min_strip"
-  ifeq ($(ALT_STRIP_POLICY),)
-    STRIP_POLICY=$(DEF_STRIP_POLICY)
-  else
-    STRIP_POLICY=$(ALT_STRIP_POLICY)
+    # Library stripping policies for .debuginfo configs:
+    #   all_strip - strips everything from the library
+    #   min_strip - strips most stuff from the library; leaves minimum symbols
+    #   no_strip  - does not strip the library at all
+    #
+    # Oracle security policy requires "all_strip". A waiver was granted on
+    # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
+    #
+    #
+    # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
+    STRIP_POLICY ?= min_strip
+
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
+
+    ZIP_DEBUGINFO_FILES ?= 1
+
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
   endif
-  _JUNK_ := $(shell \
-    echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
-endif
-endif
 endif
 
 #
@@ -209,7 +228,25 @@
   CXXFLAGS_DEBUG_OPTION  = -g0 $(CXX_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
 endif
 
-CFLAGS_COMMON   = -L$(OBJDIR)
+# If Full Debug Symbols is enabled, then we want the same debug and
+# optimization flags as used by FASTDEBUG. We also want all the
+# debug info in one place (-xs).
+#
+CFLAGS_COMMON=
+CXXFLAGS_COMMON=
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(VARIANT), OPT)
+      OPTIMIZATION_LEVEL = $(FASTDEBUG_OPTIMIZATION_LEVEL)
+      CFLAGS_COMMON += -g  -xs
+      CXXFLAGS_COMMON += -g0 -xs
+    endif
+    CFLAGS_DEBUG_OPTION    += -xs
+    CXXFLAGS_DEBUG_OPTION  += -xs
+  endif
+endif
+
+CFLAGS_COMMON  += -L$(OBJDIR)
 
 # Do not allow C99 language features like declarations in code etc.
 CFLAGS_COMMON  += -xc99=%none
@@ -762,5 +799,6 @@
 HOTSPOT_SALIB_PATH   = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)
 SALIB_NAME = $(LIB_PREFIX)saproc.$(LIBRARY_SUFFIX)
 SA_DEBUGINFO_NAME = $(LIB_PREFIX)saproc.debuginfo
+SA_DIZ_NAME = $(LIB_PREFIX)saproc.diz
 INCLUDE_SA=true
 
--- a/make/common/Defs-windows.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/Defs-windows.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -81,6 +81,45 @@
 
 EXTRA_LFLAGS += /LIBPATH:$(DXSDK_LIB_PATH)
 
+# Full Debug Symbols has been enabled on Windows since JDK1.4.1.
+# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
+# enabled with debug info files ZIP'ed to save space. For VARIANT !=
+# OPT builds, FDS is always enabled, after all a debug build without
+# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has
+# meaning when FDS is enabled.
+#
+# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
+# disabled for a VARIANT == OPT build.
+#
+# Note: Use of a different variable name for the FDS override option
+# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
+# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
+# in options via environment variables, use of distinct variables
+# prevents strange behaviours. For example, in a VARIANT != OPT build,
+# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the
+# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same
+# variable name is used, then different values can be picked up by
+# different parts of the build. Just to be clear, we only need two
+# variable names because the incoming option value can be overridden
+# in some situations, e.g., a VARIANT != OPT build.
+
+ifeq ($(VARIANT), OPT)
+  FULL_DEBUG_SYMBOLS ?= 1
+  ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
+else
+  # debug variants always get Full Debug Symbols (if available)
+  ENABLE_FULL_DEBUG_SYMBOLS = 1
+endif
+_JUNK_ := $(shell \
+  echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
+
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ZIP_DEBUGINFO_FILES ?= 1
+else
+  ZIP_DEBUGINFO_FILES=0
+endif
+_JUNK_ := $(shell echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
+
 # C Compiler flag definitions
 
 #
@@ -207,7 +246,10 @@
   #   /D _STATIC_CPPLIB
   #            Use static link for the C++ runtime (so msvcpnn.dll not needed)
   #   
-  CFLAGS_COMMON  += -Zi -nologo
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    CFLAGS_COMMON  += -Zi
+  endif
+  CFLAGS_COMMON  += -nologo
   CFLAGS_OPT      = $(CC_OPT)
   CFLAGS_DBG      = -Od $(MS_RUNTIME_DEBUG_OPTION)
 
@@ -216,7 +258,9 @@
   # All builds get the same runtime setting
   CFLAGS_COMMON += $(MS_RUNTIME_OPTION) $(CFLAGS_$(COMPILER_VERSION))
 
-  LDEBUG = /debug
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    LDEBUG = /debug
+  endif
   
   ifeq ($(VTUNE_SUPPORT), true)
     OTHER_CFLAGS = -Z7 -Ox 
@@ -250,7 +294,9 @@
 #
 # Output options (use specific filenames to avoid parallel compile errors)
 #
-CFLAGS_COMMON += -Fd$(OBJDIR)/$(basename $(@F)).pdb -Fm$(OBJDIR)/$(basename $(@F)).map
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  CFLAGS_COMMON += -Fd$(OBJDIR)/$(basename $(@F)).pdb -Fm$(OBJDIR)/$(basename $(@F)).map
+endif
 
 #
 # Use -wdNNNN to disable warning NNNN.
@@ -311,6 +357,7 @@
 SALIB_NAME = $(LIB_PREFIX)sawindbg.$(LIBRARY_SUFFIX)
 SAMAP_NAME = $(LIB_PREFIX)sawindbg.map
 SAPDB_NAME = $(LIB_PREFIX)sawindbg.pdb
+SA_DIZ_NAME = $(LIB_PREFIX)sawindbg.diz
 
 ifeq ($(ARCH), ia64)
   # SA will never be supported here.
--- a/make/common/Defs.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/Defs.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -285,6 +285,7 @@
 ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
 # for generated tool class files
 BUILDTOOLBINDIR     = $(OUTPUTDIR)/btbins
+ABS_BUILDTOOLBINDIR = $(ABS_OUTPUTDIR)/btbins
 # for generated java source files
 GENSRCDIR           = $(OUTPUTDIR)/gensrc
 # for generated C source files (not javah)
--- a/make/common/Library.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/Library.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -170,17 +170,32 @@
 # build it into $(OBJDIR) so that the other generated files get put 
 # there, then copy just the DLL (and MAP file) to the requested directory.
 #
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  MAP_OPTION="-map:$(OBJDIR)/$(LIBRARY).map"
+endif
+
 $(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf
 	@$(prep-target)
 	@$(MKDIR) -p $(OBJDIR)
 	$(LINK) -dll -out:$(OBJDIR)/$(@F) \
-	  -map:$(OBJDIR)/$(LIBRARY).map \
+	  $(MAP_OPTION) \
 	  $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
 	  $(OTHER_LCF) $(JAVALIB) $(LDLIBS)
 	$(CP) $(OBJDIR)/$(@F) $@
 	@$(call binary_file_verification,$@)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	(set -e ; \
+	 $(CD) $(OBJDIR) ; \
+	 $(ZIPEXE) -q $(LIBRARY).diz $(LIBRARY).map $(LIBRARY).pdb ; \
+	)
+	$(CP) $(OBJDIR)/$(LIBRARY).diz $(@D)
+	$(RM) $(OBJDIR)/$(LIBRARY).map $(OBJDIR)/$(LIBRARY).pdb
+  else
 	$(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
 	$(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D)
+  endif
+endif
 
 endif # LIBRARY
 
@@ -233,6 +248,12 @@
   ARFLAGS = -r
 endif
 
+ifeq ($(PLATFORM), solaris)
+  ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
+$(ACTUAL_LIBRARY):: $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS)
+  endif
+endif
+
 $(ACTUAL_LIBRARY):: $(COMPILE_FILES_o) $(FILES_m) $(FILES_reorder)
 	@$(prep-target)
 	@$(ECHO) "STATS: LIBRARY=$(LIBRARY), PRODUCT=$(PRODUCT), OPTIMIZATION_LEVEL=$(OPTIMIZATION_LEVEL)"
@@ -245,6 +266,55 @@
 ifeq ($(WRITE_LIBVERSION),true)
 	$(MCS) -d -a "$(FULL_VERSION)" $@
 endif # WRITE_LIBVERSION
+  ifneq ($(PLATFORM), macosx)
+    ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+      ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
+        ifeq ($(PLATFORM), solaris)
+# gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
+# Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
+# empty section headers until a fixed $(OBJCOPY) is available.
+# An empty section header has sh_addr == 0 and sh_size == 0.
+# This problem has only been seen on Solaris X64, but we call this tool
+# on all Solaris builds just in case.
+#
+# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
+# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
+	(set -e ; \
+	 $(CD) $(@D) ; \
+	 $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
+	 $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
+         $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
+	)
+        else # PLATFORM != solaris
+	(set -e ; \
+	 $(CD) $(@D) ; \
+	 $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
+	 $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
+	)
+        endif # PLATFORM == solaris
+        ifeq ($(STRIP_POLICY),all_strip)
+	  $(STRIP) $@
+        else
+          ifeq ($(STRIP_POLICY),min_strip)
+            ifeq ($(PLATFORM), solaris)
+	      $(STRIP) -x $@
+            else
+              # assume Linux
+	      $(STRIP) -g $@
+            endif
+          # implied else here is no stripping at all
+          endif
+        endif
+        ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	  (set -e ; \
+	   $(CD) $(@D) ; \
+	   $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
+	   $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
+	  )
+        endif
+      endif # LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
+    endif # ENABLE_FULL_DEBUG_SYMBOLS
+  endif # PLATFORM-!macosx
 endif # LIBRARY
 
 endif # PLATFORM
--- a/make/common/Program.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/Program.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -182,6 +182,10 @@
 	@$(prep-target)
 	$(SED) 's%IMVERSION%$(IMVERSION)%g;s%PROGRAM%$(PROGRAM)%g' $< > $@
 
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  MAP_OPTION="-map:$(OBJDIR)/$(PROGRAM).map"
+endif
+
   # We used a hand-crafted manifest file for all executables.
   # It is tweaked to embed the build number and executable name.
   # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
@@ -190,12 +194,21 @@
 	@set -- $?; \
 	    $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
 	$(LINK) -out:$@ /STACK:$(STACK_SIZE) \
-	    -map:$(OBJDIR)/$(PROGRAM).map $(LFLAGS) $(LDFLAGS) \
+	    $(MAP_OPTION) $(LFLAGS) $(LDFLAGS) \
 	    @$(OBJDIR)/$(PROGRAM).lcf $(LDLIBS)
   ifdef MT
 	$(MT) /manifest $(OBJDIR)/$(PROGRAM).exe.manifest /outputresource:$@;#1
   endif # MT
 	@$(call binary_file_verification,$@)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	(set -e ; \
+	 $(CD) $(OBJDIR) ; \
+	 $(ZIPEXE) -q $(PROGRAM).diz $(PROGRAM).map $(PROGRAM).pdb ; \
+	 $(RM) $(PROGRAM).map $(PROGRAM).pdb ; \
+	)
+    endif
+  endif
 else # *NIXES
   #
   # Note that we have to link -lthread even when USE_PTHREADS is true.
@@ -233,6 +246,13 @@
   #
   # This rule only applies on unix.  It supports quantify and its ilk.
   #
+
+  ifeq ($(PLATFORM), solaris)
+    ifeq ($(PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
+  $(ACTUAL_PROGRAM):: $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS)
+    endif
+  endif
+
   $(ACTUAL_PROGRAM):: $(FILES_o)
 	@$(prep-target)
 	@set -- $?; \
@@ -244,6 +264,60 @@
 	-codesign -s openjdk_codesign $@
   endif # INFO_PLIST_FILE
 	@$(call binary_file_verification,$@)
+  ifneq ($(PLATFORM), macosx)
+    ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+      ifeq ($(PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
+        ifeq ($(PLATFORM), solaris)
+# gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
+# Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
+# empty section headers until a fixed $(OBJCOPY) is available.
+# An empty section header has sh_addr == 0 and sh_size == 0.
+# This problem has only been seen on Solaris X64, but we call this tool
+# on all Solaris builds just in case.
+#
+# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
+# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
+	(set -e ; \
+	 $(CD) $(@D) ; \
+	 $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
+	 $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
+         $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \
+	)
+        else # PLATFORM != solaris
+	(set -e ; \
+	 $(CD) $(@D) ; \
+	 $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
+	 $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \
+	)
+        endif # PLATFORM == solaris
+        ifeq ($(STRIP_POLICY),all_strip)
+	  $(STRIP) $@
+        else
+          ifeq ($(STRIP_POLICY),min_strip)
+            ifeq ($(PLATFORM), solaris)
+	      $(STRIP) -x $@
+            else
+              # assume Linux
+	      $(STRIP) -g $@
+            endif
+          # implied else here is no stripping at all
+          endif
+        endif
+        ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	  (set -e ; \
+	   $(CD) $(@D) ; \
+	   $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \
+	   $(RM) $(@F).debuginfo ; \
+	  )
+          # save ZIP'ed debug info with rest of the program's build artifacts
+	  $(MV) $@.diz $(OBJDIR)
+        else
+          # save debug info with rest of the program's build artifacts
+	  $(MV) $@.debuginfo $(OBJDIR)
+        endif
+      endif # PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS
+    endif # ENABLE_FULL_DEBUG_SYMBOLS
+  endif # PLATFORM-!macosx
 endif # PLATFORM
 
 clean:: 
@@ -252,12 +326,16 @@
 	$(RM) $(OBJDIR)/$(PROGRAM).ico
 	$(RM) $(OBJDIR)/$(PROGRAM).lcf
 	$(RM) $(OBJDIR)/$(PROGRAM).map
+	$(RM) $(OBJDIR)/$(PROGRAM).pdb
 	$(RM) $(OBJDIR)/$(PROGRAM).exp
 	$(RM) $(OBJDIR)/$(PROGRAM).lib
 	$(RM) $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX)
 	$(RM) $(OBJDIR)/$(PROGRAM).ilk
 	$(RM) *.pdb
+else
+	$(RM) $(OBJDIR)/$(PROGRAM).debuginfo
 endif
+	$(RM) $(OBJDIR)/$(PROGRAM).diz
 
 
 clobber:: 
--- a/make/common/Release-embedded.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/Release-embedded.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -159,11 +159,14 @@
 
 	@# Remove misc. other files
 	$(RM) -r $(JRE_REDUCED_IMAGE_DIR)/man
-	$(RM) -f $(JRE_REDUCED_IMAGE_DIR)/CHANGES
+	$(RM) $(JRE_REDUCED_IMAGE_DIR)/CHANGES
 
 	@# Copy back in the attach library
 	$(CP) $(JDK_IMAGE_DIR)/jre/lib/$(LIBARCH)/$(LIB_PREFIX)attach.$(LIB_SUFFIX) $(JRE_REDUCED_IMAGE_DIR)/lib/$(LIBARCH)
 
+	@# Remove FDS files: debuginfo, diz
+	$(FIND) $(JRE_REDUCED_IMAGE_DIR)/lib/$(LIBARCH) -type f \( -name "*.debuginfo" -o -name "*.diz" \) -print | $(XARGS) $(RM)
+
 	@$(ECHO) Done Creating Reduced JRE
 
 #
@@ -180,33 +183,33 @@
 	    $(TAR) cf - . | ($(CD) $(JRE_REDUCED_HEADLESS_IMAGE_DIR); $(TAR) xf - ); 
 
 	@# Replace the full rt.jar with the headless rt.jar
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/rt.jar
+	$(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/rt.jar
 	$(CP) $(HL_RT_JAR) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/rt.jar
 
 	@#
 	@# Remove all of the files that are not needed for the
 	@# reduced Headless JRE
 	@#
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/gtkhelper
+	$(RM)  $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/gtkhelper
 	$(RM)  $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/libjsoundalsa.so
 	$(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/audio
-	$(RM) -fr $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/applet
+	$(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/applet
 	$(RM)  $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/awt_robot
 	$(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/xawt
 	$(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/libsplashscreen.so
 	@# Remove oblique fonts and reduce font support to LucidaSansRegular only
-	$(RM) -fr $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/oblique-fonts
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaBrightDemiBold.ttf
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaBrightDemiItalic.ttf
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaBrightItalic.ttf
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaBrightRegular.ttf
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaSansDemiBold.ttf
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaTypewriterBold.ttf
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaTypewriterRegular.ttf
+	$(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/oblique-fonts
+	$(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaBrightDemiBold.ttf
+	$(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaBrightDemiItalic.ttf
+	$(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaBrightItalic.ttf
+	$(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaBrightRegular.ttf
+	$(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaSansDemiBold.ttf
+	$(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaTypewriterBold.ttf
+	$(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaTypewriterRegular.ttf
 
 ifeq ($(PLATFORM), linux)
 # put out minimal fonts.dir file for the remaining font
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
+	$(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
 	$(ECHO) 6>$(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
 	$(ECHO) "LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-1">>$(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
 	$(ECHO) "LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-2">>$(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
--- a/make/common/Release-macosx.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/Release-macosx.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -29,8 +29,8 @@
 
 # Defines the release targets for Mac OS X build products
 
-JDK_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-bundle/$(THIS_JDK_VERSION).jdk/Contents
-JRE_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2re-bundle/$(THIS_JDK_VERSION).jre/Contents
+JDK_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents
+JRE_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2re-bundle/jre$(JDK_VERSION).jre/Contents
 
 MACOSX_SRC	 = $(JDK_TOPDIR)/src/macosx
 
--- a/make/common/Release.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/Release.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -158,6 +158,7 @@
         jstack.1           \
         jstat.1            \
         jstatd.1           \
+        jvisualvm.1        \
 	native2ascii.1     \
 	rmic.1             \
         schemagen.1        \
@@ -887,7 +888,9 @@
 	   -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@
 else
 	$(FIND) $(JRE_IMAGE_DIR)/lib -type f -name \*.$(LIB_SUFFIX) >> $@
-	$(FILE) `$(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*$(EXE_SUFFIX)` \
+# The FILE command reports .debuginfo files as "ELF", but we don't want
+# those files in the JRE_BIN_LIST file. EXE_SUFFIX is empty on non-Windows.
+	$(FILE) `$(FIND) $(JRE_IMAGE_DIR)/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \
 	    | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
 endif
 
@@ -1152,9 +1155,11 @@
 else
 	$(RM) $@
 	$(FIND) $(JDK_IMAGE_DIR)/jre/lib -type f -name \*.$(LIB_SUFFIX) >> $@
-	$(FILE) `$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f -name \*$(EXE_SUFFIX)` \
+# The FILE command reports .debuginfo files as "ELF", but we don't want
+# those files in the JDK_BIN_LIST file. EXE_SUFFIX is empty on non-Windows.
+	$(FILE) `$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \
 	    | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
-	file `$(FIND) $(JDK_IMAGE_DIR)/bin -type f -name \*$(EXE_SUFFIX)` \
+	file `$(FIND) $(JDK_IMAGE_DIR)/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \
 	    | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
 endif
 
--- a/make/common/internal/Resources.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/internal/Resources.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -197,6 +197,10 @@
 	$(add-property-java-file)
 $(GENSRCDIR)/%.java: $(GENSRCDIR)/%.properties
 	$(add-property-java-file)
+ifdef PLATFORM_SRC_MACOS
+$(GENSRCDIR)/%.java: $(PLATFORM_SRC_MACOS)/classes/%.properties
+	$(add-property-java-file)
+endif
 ifndef OPENJDK
 $(GENSRCDIR)/%.java: $(CLOSED_PLATFORM_SRC)/classes/%.properties
 	$(add-property-java-file)
--- a/make/common/shared/Compiler-gcc.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/shared/Compiler-gcc.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -67,7 +67,7 @@
     CXX            = $(COMPILER_PATH)g++
   endif
   # Option used to create a shared library
-  SHARED_LIBRARY_FLAG = -shared -mimpure-text
+  SHARED_LIBRARY_FLAG = -shared
   SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
 
 endif
--- a/make/common/shared/Defs-java.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/shared/Defs-java.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -135,7 +135,7 @@
 # built implicitly/explicitly.
 #
 ifeq ($(wildcard $(SHARE_SRC)/classes/javax/crypto/Cipher.java),)
-  JCEFLAGS = $(CLASSPATH_SEPARATOR)$(LIBDIR)/jce.jar
+  JCE_PATH = $(CLASSPATH_SEPARATOR)$(LIBDIR)/jce.jar
 endif
 
 # Add the source level
@@ -148,11 +148,11 @@
 CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
 JAVACFLAGS  += $(CLASS_VERSION)
 JAVACFLAGS  += -encoding ascii
-JAVACFLAGS  += "-Xbootclasspath:$(CLASSBINDIR)$(JCEFLAGS)"
+JAVACFLAGS  += "-Xbootclasspath:$(CLASSBINDIR)$(JCE_PATH)"
 JAVACFLAGS  += $(OTHER_JAVACFLAGS)
 
 # Needed for javah
-JAVAHFLAGS += -bootclasspath "$(CLASSBINDIR)$(JCEFLAGS)"
+JAVAHFLAGS += -bootclasspath "$(CLASSBINDIR)$(JCE_PATH)"
 
 # Needed for javadoc to ensure it builds documentation
 # against the newly built classes
--- a/make/common/shared/Sanity.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/common/shared/Sanity.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -1031,11 +1031,22 @@
 	    "      and/or check your value of ALT_HOTSPOT_LIB_PATH. \n" \
 	    "" >> $(ERROR_FILE) ; \
 	fi
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
 	@#
 	@# Check for the .map files - its OK if they are not there..
 	@#
-  ifeq ($(ARCH_DATA_MODEL), 32)
+    ifeq ($(ARCH_DATA_MODEL), 32)
 	@# There is no 64-bit HotSpot client VM
+      ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	@if [ ! -r $(HOTSPOT_CLIENT_PATH)/jvm.diz ]; then \
+	  $(ECHO) "WARNING: HOTSPOT_CLIENT_PATH does not point to valid HotSpot .diz files. \n" \
+	    "        These files are optional and aid in the debugging of the JVM. \n" \
+	    "        Please check your access to \n" \
+	    "          $(HOTSPOT_CLIENT_PATH)/jvm.diz \n" \
+	    "        and/or check your value of ALT_HOTSPOT_CLIENT_PATH. \n" \
+	    "" >> $(WARNING_FILE) ; \
+	fi
+      else
 	@if [ ! -r $(HOTSPOT_CLIENT_PATH)/jvm.map ]; then \
 	  $(ECHO) "WARNING: HOTSPOT_CLIENT_PATH does not point to valid HotSpot .map files. \n" \
 	    "        These files are optional and aid in the debugging of the JVM. \n" \
@@ -1052,7 +1063,18 @@
 	    "        and/or check your value of ALT_HOTSPOT_CLIENT_PATH. \n" \
 	    "" >> $(WARNING_FILE) ; \
 	fi
-  endif
+      endif
+    endif
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	@if [ ! -r $(HOTSPOT_SERVER_PATH)/jvm.diz ]; then \
+	  $(ECHO) "WARNING: HOTSPOT_SERVER_PATH does not point to valid HotSpot .diz files. \n" \
+	    "        These files are optional and aid in the debugging of the JVM. \n" \
+	    "        Please check your access to \n" \
+	    "          $(HOTSPOT_SERVER_PATH)/jvm.diz \n" \
+	    "        and/or check your value of ALT_HOTSPOT_SERVER_PATH. \n" \
+	    "" >> $(WARNING_FILE) ; \
+	fi
+    else
 	@if [ ! -r $(HOTSPOT_SERVER_PATH)/jvm.map ]; then \
 	  $(ECHO) "WARNING: HOTSPOT_SERVER_PATH does not point to valid HotSpot .map files. \n" \
 	    "        These files are optional and aid in the debugging of the JVM. \n" \
@@ -1069,6 +1091,8 @@
 	    "        and/or check your value of ALT_HOTSPOT_SERVER_PATH. \n" \
 	    "" >> $(WARNING_FILE) ; \
 	fi
+    endif
+  endif	
 endif	
 
 
--- a/make/java/instrument/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/java/instrument/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
 # Makefile for building the Java Programming Language Instrumentation Services
 # agent, supporting java.lang.instrument
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../..
 PACKAGE = sun.instrument
 LIBRARY = instrument
--- a/make/java/java/FILES_java.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/java/java/FILES_java.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -482,6 +482,7 @@
     sun/misc/JavaNioAccess.java \
     sun/misc/Perf.java \
     sun/misc/PerfCounter.java \
+    sun/misc/Hashing.java \
     sun/net/www/protocol/jar/Handler.java \
     sun/net/www/protocol/jar/JarURLConnection.java \
     sun/net/www/protocol/file/Handler.java \
--- a/make/java/java_crw_demo/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/java/java_crw_demo/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../..
 
 LIBRARY = java_crw_demo
--- a/make/java/java_hprof_demo/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/java/java_hprof_demo/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../..
 LIBRARY = hprof
 PRODUCT = sun
--- a/make/java/main/java/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/java/main/java/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../..
 PROGRAM = java
 PRODUCT = java
--- a/make/java/management/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/java/management/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../..
 PACKAGE = java.lang.management
 LIBRARY = management
--- a/make/java/npt/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/java/npt/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../..
 
 # It's currently used by jpda and hprof.  Put it in base module for now.
--- a/make/java/redist/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/java/redist/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -61,9 +61,13 @@
 JVMDTRACE_NAME         = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).$(LIBRARY_SUFFIX)
 
 JVM_DEBUGINFO_NAME       = $(LIB_PREFIX)jvm.debuginfo
+JVM_DIZ_NAME             = $(LIB_PREFIX)jvm.diz
 LIBJSIG_DEBUGINFO_NAME   = $(LIB_PREFIX)jsig.debuginfo
+LIBJSIG_DIZ_NAME         = $(LIB_PREFIX)jsig.diz
 JVMDB_DEBUGINFO_NAME     = $(LIB_PREFIX)jvm$(DB_SUFFIX).debuginfo
+JVMDB_DIZ_NAME           = $(LIB_PREFIX)jvm$(DB_SUFFIX).diz
 JVMDTRACE_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).debuginfo
+JVMDTRACE_DIZ_NAME       = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).diz
 
 CLASSSHARINGDATA_DIR   = $(BUILDDIR)/tools/sharing
 
@@ -86,10 +90,17 @@
 ifndef BUILD_CLIENT_ONLY
   IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
                 $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
-  ifneq ($(OBJCOPY),)
-    # the import JDK may not contain .debuginfo files
-    ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVM_DEBUGINFO_NAME)),)
-      IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DEBUGINFO_NAME)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      # the import JDK may not contain .diz files
+      ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVM_DIZ_NAME)),)
+        IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DIZ_NAME)
+      endif
+    else
+      # the import JDK may not contain .debuginfo files
+      ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVM_DEBUGINFO_NAME)),)
+        IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DEBUGINFO_NAME)
+      endif
     endif
   endif
 else
@@ -101,10 +112,17 @@
 ifeq ($(ARCH_DATA_MODEL), 32)
   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
                  $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
-  ifneq ($(OBJCOPY),)
-    # the import JDK may not contain .debuginfo files
-    ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVM_DEBUGINFO_NAME)),)
-      IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DEBUGINFO_NAME)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      # the import JDK may not contain .diz files
+      ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVM_DIZ_NAME)),)
+        IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DIZ_NAME)
+      endif
+    else
+      # the import JDK may not contain .debuginfo files
+      ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVM_DEBUGINFO_NAME)),)
+        IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DEBUGINFO_NAME)
+      endif
     endif
   endif
 endif
@@ -121,20 +139,56 @@
 
 # Get the hotspot .map and .pdb files for client and server
 ifndef BUILD_CLIENT_ONLY
-IMPORT_LIST += \
-	$(LIBDIR)/$(JVMLIB_NAME) \
-	$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \
-	$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME)
+  IMPORT_LIST += $(LIBDIR)/$(JVMLIB_NAME)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      # the import JDK may not contain .diz files
+      ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVM_DIZ_NAME)),)
+        IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DIZ_NAME)
+      endif
+    else
+      # the import JDK may not contain .pdb files
+      ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMPDB_NAME)),)
+        # assume .map file is present if .pdb file is preset
+        IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \
+	  $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME)
+      endif
+    endif
+  endif
 endif
 
 # Add .map and .pdb files to the import path for client and kernel VMs. 
 # These are only available on 32-bit windows builds. 
 ifeq ($(ARCH_DATA_MODEL), 32)
-  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \
-                 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME)
-  ifeq ($(DO_KERNEL), true)
-    IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME) \
-                   $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      # the import JDK may not contain .diz files
+      ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVM_DIZ_NAME)),)
+        IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DIZ_NAME)
+      endif
+    else
+      # the import JDK may not contain .pdb files
+      ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMPDB_NAME)),)
+        # assume .map file is present if .pdb file is preset
+        IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \
+                       $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME)
+      endif
+    endif
+    ifeq ($(DO_KERNEL), true)
+      ifeq ($(ZIP_DEBUGINFO_FILES),1)
+        # the import JDK may not contain .diz files
+        ifneq ($(wildcard $(HOTSPOT_KERNEL_PATH)/$(JVM_DIZ_NAME)),)
+          IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_DIZ_NAME)
+        endif
+      else
+        # the import JDK may not contain .pdb files
+        ifneq ($(wildcard $(HOTSPOT_KERNEL_PATH)/$(JVMPDB_NAME)),)
+          # assume .map file is present if .pdb file is preset
+          IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME) \
+                         $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME)
+        endif
+      endif
+    endif
   endif
 endif
 
@@ -165,10 +219,22 @@
 	@$(prep-target)
 	-$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMPDB_NAME)  $@
 
+$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DIZ_NAME):
+	@$(prep-target)
+	-$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVM_DIZ_NAME)  $@
+
+$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_DIZ_NAME):
+	@$(prep-target)
+	-$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVM_DIZ_NAME)  $@
+
 ifndef BUILD_CLIENT_ONLY
 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME): 
 	@$(prep-target)
 	-$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMPDB_NAME) $@
+
+$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DIZ_NAME):
+	@$(prep-target)
+	-$(CP) $(HOTSPOT_SERVER_PATH)/$(JVM_DIZ_NAME) $@
 endif
 
 #  Windows     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  Windows
@@ -176,18 +242,32 @@
 #  NOT Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  NOT Windows
 
 IMPORT_LIST += $(LIB_LOCATION)/$(LIBJSIG_NAME) 
-ifneq ($(OBJCOPY),)
-  # the import JDK may not contain .debuginfo files
-  ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),)
-    IMPORT_LIST += $(LIB_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ZIP_DEBUGINFO_FILES),1)
+    # the import JDK may not contain .diz files
+    ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DIZ_NAME)),)
+      IMPORT_LIST += $(LIB_LOCATION)/$(LIBJSIG_DIZ_NAME)
+    endif
+  else
+    # the import JDK may not contain .debuginfo files
+    ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),)
+      IMPORT_LIST += $(LIB_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME)
+    endif
   endif
 endif
 ifndef BUILD_CLIENT_ONLY
   IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME)
-  ifneq ($(OBJCOPY),)
-    # the import JDK may not contain the target of the symlink
-    ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),)
-      IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      # the import JDK may not contain the target of the symlink
+      ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DIZ_NAME)),)
+        IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DIZ_NAME)
+      endif
+    else
+      # the import JDK may not contain the target of the symlink
+      ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),)
+        IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME)
+      endif
     endif
   endif
 endif
@@ -195,19 +275,33 @@
 ifeq ($(PLATFORM), solaris)
   ifndef BUILD_CLIENT_ONLY
     IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
-    ifneq ($(OBJCOPY),)
-      # the import JDK may not contain .debuginfo files
-      ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDB_DEBUGINFO_NAME)),)
-        IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_DEBUGINFO_NAME)
+    ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+      ifeq ($(ZIP_DEBUGINFO_FILES),1)
+        # the import JDK may not contain .diz files
+        ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDB_DIZ_NAME)),)
+          IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_DIZ_NAME)
+        endif
+      else
+        # the import JDK may not contain .debuginfo files
+        ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDB_DEBUGINFO_NAME)),)
+          IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_DEBUGINFO_NAME)
+        endif
       endif
     endif
     # The conditional can be removed when import JDKs contain these files.
     ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_NAME)),)
       IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_NAME)
-      ifneq ($(OBJCOPY),)
-        # the import JDK may not contain .debuginfo files
-        ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_DEBUGINFO_NAME)),)
-          IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_DEBUGINFO_NAME)
+      ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+        ifeq ($(ZIP_DEBUGINFO_FILES),1)
+          # the import JDK may not contain .diz files
+          ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_DIZ_NAME)),)
+            IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_DIZ_NAME)
+          endif
+        else
+          # the import JDK may not contain .debuginfo files
+          ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_DEBUGINFO_NAME)),)
+            IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_DEBUGINFO_NAME)
+          endif
         endif
       endif
     else
@@ -220,10 +314,17 @@
 ifeq ($(ARCH_DATA_MODEL), 32)
 
 IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
-ifneq ($(OBJCOPY),)
-  # the import JDK may not contain the target of the symlink
-  ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),)
-    IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ZIP_DEBUGINFO_FILES),1)
+    # the import JDK may not contain the target of the symlink
+    ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DIZ_NAME)),)
+      IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DIZ_NAME)
+    endif
+  else
+    # the import JDK may not contain the target of the symlink
+    ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),)
+      IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME)
+    endif
   endif
 endif
 
@@ -231,10 +332,17 @@
 #  solaris   vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  solaris
 
 IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME)
-ifneq ($(OBJCOPY),)
-  # the import JDK may not contain .debuginfo files
-  ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDB_DEBUGINFO_NAME)),)
-    IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_DEBUGINFO_NAME)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ZIP_DEBUGINFO_FILES),1)
+    # the import JDK may not contain .diz files
+    ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDB_DIZ_NAME)),)
+      IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_DIZ_NAME)
+    endif
+  else
+    # the import JDK may not contain .debuginfo files
+    ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDB_DEBUGINFO_NAME)),)
+      IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_DEBUGINFO_NAME)
+    endif
   endif
 endif
 
@@ -243,13 +351,22 @@
   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME)
   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_NAME)
   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_NAME)
-  ifneq ($(OBJCOPY),)
-    # the import JDK may not contain .debuginfo files
-    ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_DEBUGINFO_NAME)),)
-      IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_DEBUGINFO_NAME)
-      IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME)
-      IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME)
-  endif
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      # the import JDK may not contain .diz files
+      ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_DIZ_NAME)),)
+        IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_DIZ_NAME)
+        IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_DIZ_NAME)
+        IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_DIZ_NAME)
+      endif
+    else
+      # the import JDK may not contain .debuginfo files
+      ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_DEBUGINFO_NAME)),)
+        IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_DEBUGINFO_NAME)
+        IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME)
+        IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME)
+      endif
+    endif
   endif
 else
   $(warning WARNING: $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME) not found!)
@@ -259,10 +376,17 @@
   # The conditional can be removed when import JDKs contain these files.
   ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME)),)
     IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME)
-    ifneq ($(OBJCOPY),)
-      # the import JDK may not contain .debuginfo files
-      ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_DEBUGINFO_NAME)),)
-        IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME)
+    ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+      ifeq ($(ZIP_DEBUGINFO_FILES),1)
+        # the import JDK may not contain .diz files
+        ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_DIZ_NAME)),)
+          IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_DIZ_NAME)
+        endif
+      else
+        # the import JDK may not contain .debuginfo files
+        ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_DEBUGINFO_NAME)),)
+          IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME)
+        endif
       endif
     endif
   else
@@ -272,10 +396,17 @@
   # The conditional can be removed when import JDKs contain these files.
   ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME)),)
     IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_NAME)
-    ifneq ($(OBJCOPY),)
-      # the import JDK may not contain .debuginfo files
-      ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_DEBUGINFO_NAME)),)
-        IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME)
+    ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+      ifeq ($(ZIP_DEBUGINFO_FILES),1)
+        # the import JDK may not contain .diz files
+        ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_DIZ_NAME)),)
+          IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_DIZ_NAME)
+        endif
+      else
+        # the import JDK may not contain .debuginfo files
+        ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_DEBUGINFO_NAME)),)
+          IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME)
+        endif
       endif
     endif
   else
@@ -304,9 +435,14 @@
 	$(install-import-file)
 	@$(call binary_file_verification,$@)
 
-ifneq ($(OBJCOPY),)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ZIP_DEBUGINFO_FILES),1)
+$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DIZ_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_DIZ_NAME)
+	$(install-import-file)
+  else
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_DEBUGINFO_NAME)
 	$(install-import-file)
+  endif
 endif
 
 $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME): $(HOTSPOT_KERNEL_PATH)/$(JVM_NAME)
@@ -317,9 +453,14 @@
 	$(install-import-file)
 	@$(call binary_file_verification,$@)
 
-ifneq ($(OBJCOPY),)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ZIP_DEBUGINFO_FILES),1)
+$(LIB_LOCATION)/$(LIBJSIG_DIZ_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DIZ_NAME)
+	$(install-import-file)
+  else
 $(LIB_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)
 	$(install-import-file)
+  endif
 endif
 
 ifndef BUILD_CLIENT_ONLY
@@ -328,22 +469,49 @@
 	@$(prep-target)
 	$(call install-sym-link, ../$(LIBJSIG_NAME))
 
-ifneq ($(OBJCOPY),)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+# We don't create a symlink to a libjsig.diz file, but we do put
+# the libjsig.debuginfo symlink into a libjsig.diz file. The aurora
+# system does not like dangling symlinks.
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DIZ_NAME) \
+$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DIZ_NAME):
+	@$(prep-target)
+	$(LN) -s ../$(LIBJSIG_DEBUGINFO_NAME) $(@D)/$(LIBJSIG_DEBUGINFO_NAME)
+	( $(CD) $(@D) ; \
+	 $(ZIPEXE) -y $(LIBJSIG_DIZ_NAME) $(LIBJSIG_DEBUGINFO_NAME) ; \
+	 $(RM) $(LIBJSIG_DEBUGINFO_NAME) ; \
+	)
+    else
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME) \
 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME):
 	@$(prep-target)
 	$(call install-sym-link, ../$(LIBJSIG_DEBUGINFO_NAME))
-endif
+    endif
+  endif
 else
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME):
 	@$(prep-target)
 	$(call install-sym-link, ../$(LIBJSIG_NAME))
 
-ifneq ($(OBJCOPY),)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+# We don't create a symlink to a libjsig.diz file, but we do put
+# the libjsig.debuginfo symlink into a libjsig.diz file. The aurora
+# system does not like dangling symlinks.
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DIZ_NAME):
+	@$(prep-target)
+	$(LN) -s ../$(LIBJSIG_DEBUGINFO_NAME) $(@D)/$(LIBJSIG_DEBUGINFO_NAME)
+	( $(CD) $(@D) ; \
+	 $(ZIPEXE) -y $(LIBJSIG_DIZ_NAME) $(LIBJSIG_DEBUGINFO_NAME) ; \
+	 $(RM) $(LIBJSIG_DEBUGINFO_NAME) ; \
+	)
+    else
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME):
 	@$(prep-target)
 	$(call install-sym-link, ../$(LIBJSIG_DEBUGINFO_NAME))
-endif
+    endif
+  endif
 endif
 
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_NAME)
@@ -354,12 +522,20 @@
 	$(install-import-file)
 	@$(call binary_file_verification,$@)
 
-ifneq ($(OBJCOPY),)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ZIP_DEBUGINFO_FILES),1)
+$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_DIZ_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_DIZ_NAME)
+	$(install-import-file)
+
+$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_DIZ_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDB_DIZ_NAME)
+	$(install-import-file)
+  else
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_DEBUGINFO_NAME)
 	$(install-import-file)
 
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDB_DEBUGINFO_NAME)
 	$(install-import-file)
+  endif
 endif
 
 ifndef BUILD_CLIENT_ONLY
@@ -371,13 +547,21 @@
 	$(install-import-file)
 	@$(call binary_file_verification,$@)
 
-ifneq ($(OBJCOPY),)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_DIZ_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDB_DIZ_NAME)
+	$(install-import-file)
+
+$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_DIZ_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_DIZ_NAME)
+	$(install-import-file)
+    else
 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDB_DEBUGINFO_NAME)
 	$(install-import-file)
 
 $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_DEBUGINFO_NAME)
 	$(install-import-file)
-endif
+    endif
+  endif
 endif
 
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME)
@@ -388,12 +572,20 @@
 	$(install-import-file)
 	@$(call binary_file_verification,$@)
 
-ifneq ($(OBJCOPY),)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ZIP_DEBUGINFO_FILES),1)
+$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_DIZ_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_DIZ_NAME)
+	$(install-import-file)
+
+$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_DIZ_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDTRACE_DIZ_NAME)
+	$(install-import-file)
+  else
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_DEBUGINFO_NAME)
 	$(install-import-file)
 
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDTRACE_DEBUGINFO_NAME)
 	$(install-import-file)
+  endif
 endif
 
 ifndef BUILD_CLIENT_ONLY
@@ -409,7 +601,17 @@
 	$(install-import-file)
 	@$(call binary_file_verification,$@)
 
-ifneq ($(OBJCOPY),)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ZIP_DEBUGINFO_FILES),1)
+$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_DIZ_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_DIZ_NAME)
+	$(install-import-file)
+
+$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_DIZ_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_DIZ_NAME)
+	$(install-import-file)
+
+$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DIZ_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_DIZ_NAME)
+	$(install-import-file)
+  else
 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_DEBUGINFO_NAME)
 	$(install-import-file)
 
@@ -418,6 +620,7 @@
 
 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_DEBUGINFO_NAME)
 	$(install-import-file)
+  endif
 endif
 
 $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt : $(HOTSPOT_SERVER_PATH)/Xusage.txt
--- a/make/java/redist/sajdi/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/java/redist/sajdi/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -54,14 +54,26 @@
 ifeq ($(INCLUDE_SA), true)
   IMPORT_LIST += $(LIBDIR)/sa-jdi.jar \
                  $(LIB_LOCATION)/$(SALIB_NAME)
-  ifeq ($(PLATFORM), windows)
-    IMPORT_LIST += $(LIB_LOCATION)/$(SAMAP_NAME) \
-                   $(LIB_LOCATION)/$(SAPDB_NAME)
-  endif
-  ifneq ($(OBJCOPY),)
-    # the import JDK may not contain .debuginfo files
-    ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(SA_DEBUGINFO_NAME)),)
-      IMPORT_LIST += $(LIB_LOCATION)/$(SA_DEBUGINFO_NAME)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+      # the import JDK may not contain .diz files
+      ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(SA_DIZ_NAME)),)
+        IMPORT_LIST += $(LIB_LOCATION)/$(SA_DIZ_NAME)
+      endif
+    else
+      ifeq ($(PLATFORM), windows)
+        # the import JDK may not contain .pdb files
+        ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(SAPDB_NAME)),)
+          # assume .map file is present if .pdb is present
+          IMPORT_LIST += $(LIB_LOCATION)/$(SAMAP_NAME) \
+                         $(LIB_LOCATION)/$(SAPDB_NAME)
+        endif
+      else
+        # the import JDK may not contain .debuginfo files
+        ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(SA_DEBUGINFO_NAME)),)
+          IMPORT_LIST += $(LIB_LOCATION)/$(SA_DEBUGINFO_NAME)
+        endif
+      endif
     endif
   endif
 endif # INCLUDE_SA
@@ -80,17 +92,22 @@
 $(LIB_LOCATION)/$(SALIB_NAME): $(HOTSPOT_SALIB_PATH)/$(SALIB_NAME)
 	$(install-import-file)
 
-ifeq ($(PLATFORM), windows)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+$(LIB_LOCATION)/$(SA_DIZ_NAME): $(HOTSPOT_SALIB_PATH)/$(SA_DIZ_NAME)
+	$(install-import-file)
+    else
+      ifeq ($(PLATFORM), windows)
 $(LIB_LOCATION)/$(SAPDB_NAME): $(HOTSPOT_SALIB_PATH)/$(SAPDB_NAME)
 	$(install-import-file)
 
 $(LIB_LOCATION)/$(SAMAP_NAME): $(HOTSPOT_SALIB_PATH)/$(SAMAP_NAME)
 	$(install-import-file)
-endif # windows
-
-  ifneq ($(OBJCOPY),)
+      else
 $(LIB_LOCATION)/$(SA_DEBUGINFO_NAME): $(HOTSPOT_SALIB_PATH)/$(SA_DEBUGINFO_NAME)
 	$(install-import-file)
+      endif
+    endif
   endif
 endif # INCLUDE_SA
 
--- a/make/java/verify/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/java/verify/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
 # Build libverify.so
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../..
 PRODUCT = java
 LIBRARY = verify
--- a/make/javax/sound/jsoundalsa/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/javax/sound/jsoundalsa/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -84,7 +84,7 @@
 	$(MIDIFILES_export) \
 	$(PORTFILES_export)
 
-LDFLAGS += -L$(ALSA_LIB_PATH) -lasound
+OTHER_LDLIBS += -L$(ALSA_LIB_PATH) -lasound
 
 CPPFLAGS += \
 	-DUSE_DAUDIO=TRUE \
--- a/make/jpda/jdwp/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/jpda/jdwp/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
 # Makefile for building JDWP
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../..
 PACKAGE = com.sun.tools.jdwp
 PRODUCT = jpda
--- a/make/jpda/transport/socket/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/jpda/transport/socket/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
 # Makefile for building the JDI back-end implementation
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../..
 LIBRARY = dt_socket
 PRODUCT = jbug
--- a/make/jprt.gmk	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/jprt.gmk	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,24 @@
 
 JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
 
+ifeq ($(PLATFORM),windows)
+  ZIPFLAGS=-q
+else
+  # store symbolic links as the link
+  ZIPFLAGS=-q -y
+endif
+
 jprt_build_product:  all images
 	( $(CD) $(OUTPUTDIR)/j2sdk-image && \
-	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
+	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
 
 jprt_build_fastdebug: fastdebug images
 	( $(CD) $(OUTPUTDIR)/j2sdk-image && \
-	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
+	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
 
 jprt_build_debug: debug images 
 	( $(CD) $(OUTPUTDIR)/j2sdk-image && \
-	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
+	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
 
 #
 # Phonies to avoid accidents.
--- a/make/jprt.properties	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/jprt.properties	Sun Aug 12 15:29:21 2012 -0700
@@ -89,6 +89,7 @@
     ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_tools1},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_tools2},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_jfr},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_misc}
 
 # All vm test targets (testset=all)
@@ -104,6 +105,7 @@
     ${jprt.my.test.target.set:TESTNAME=jdk_beans1},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_beans2},             \
     ${jprt.my.test.target.set:TESTNAME=jdk_beans3},             \
+    ${jprt.my.test.target.set:TESTNAME=jdk_sound},              \
     ${jprt.my.test.target.set:TESTNAME=jdk_swing}
 
 # JCK test targets in test/Makefile (no windows)
--- a/make/launchers/Makefile.launcher	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/launchers/Makefile.launcher	Sun Aug 12 15:29:21 2012 -0700
@@ -27,6 +27,8 @@
 # Makefile for building simple launchers
 #
 
+PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ..
 PACKAGE = launcher
 PRODUCT = sun
@@ -83,6 +85,7 @@
 # SA tools
 ifeq ($(PROGRAM),jstack)
   SA_TOOL=true
+  INFO_PLIST_FILE=Info-privileged.plist
 endif
 ifeq ($(PROGRAM),jsadebugd)
   SA_TOOL=true
--- a/make/mkdemo/jvmti/compiledMethodLoad/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/mkdemo/jvmti/compiledMethodLoad/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../..
 PRODUCT = demo/jvmti
 DEMONAME = compiledMethodLoad
--- a/make/mkdemo/jvmti/gctest/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/mkdemo/jvmti/gctest/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../..
 PRODUCT = demo/jvmti
 DEMONAME = gctest
--- a/make/mkdemo/jvmti/heapTracker/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/mkdemo/jvmti/heapTracker/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../..
 PRODUCT = demo/jvmti
 DEMONAME = heapTracker
--- a/make/mkdemo/jvmti/heapViewer/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/mkdemo/jvmti/heapViewer/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../..
 PRODUCT = demo/jvmti
 DEMONAME = heapViewer
--- a/make/mkdemo/jvmti/hprof/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/mkdemo/jvmti/hprof/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../..
 PRODUCT = demo/jvmti
 DEMONAME = hprof
--- a/make/mkdemo/jvmti/minst/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/mkdemo/jvmti/minst/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../..
 PRODUCT = demo/jvmti
 DEMONAME = minst
--- a/make/mkdemo/jvmti/mtrace/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/mkdemo/jvmti/mtrace/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../..
 PRODUCT = demo/jvmti
 DEMONAME = mtrace
--- a/make/mkdemo/jvmti/versionCheck/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/mkdemo/jvmti/versionCheck/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../..
 PRODUCT = demo/jvmti
 DEMONAME = versionCheck
--- a/make/mkdemo/jvmti/waiters/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/mkdemo/jvmti/waiters/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../..
 PRODUCT = demo/jvmti
 DEMONAME = waiters
--- a/make/sun/font/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/sun/font/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -90,6 +90,12 @@
 
 endif # PLATFORM
 
+# Turn off aliasing with GCC for ExtensionSubtables.cpp
+ifeq ($(PLATFORM), linux)
+  CXXFLAGS += $(CXXFLAGS_$(@F))
+  CXXFLAGS_ExtensionSubtables.o = -fno-strict-aliasing
+endif
+
 #In the non-OpenJDK mode we need to build T2K
 ifndef OPENJDK
 t2k:
--- a/make/sun/osxapp/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/sun/osxapp/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -28,6 +28,11 @@
 PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
 
+GEN_DIR=$(GENSRCDIR)/sun/osxapp
+ICON_DATA = $(GEN_DIR)/AWTIconData.h
+
+CLASSES_INIT += $(ICON_DATA)
+
 #
 # Files
 #
@@ -63,6 +68,7 @@
 	-framework QuartzCore
 
 CPPFLAGS += \
+        -I$(GEN_DIR) \
         $(call NativeSrcDirList,-I,/native/sun/osxapp)
 
 
@@ -70,6 +76,34 @@
   CPPFLAGS += -DINTERNAL_BUILD
 endif
 
-clean clobber::
+TEMPDIR_CLASSES = $(TEMPDIR)/classes
 
-.PHONY:
+$(TEMPDIR_CLASSES)/sun/osxapp/ToBin.class: ToBin.java
+	@$(prep-target)
+	$(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
+
+ifdef OPENJDK
+    ICONS_PATH_PREFIX=$(PLATFORM_SRC_MACOS)
+else
+    ICONS_PATH_PREFIX=$(CLOSED_SRC)/macosx
+endif
+
+generated.clean:
+	$(RM) -r $(GEN_DIR)/*.h
+
+ICONPATH=$(ICONS_PATH_PREFIX)/native/sun/osxapp/resource/icons
+ICON = $(ICONPATH)/JavaApp.icns
+
+$(GEN_DIR)/AWTIconData.h: $(TEMPDIR_CLASSES)/sun/osxapp/ToBin.class $(ICON) 
+	$(prep-target)
+	$(RM) $(ICON_DATA)
+	$(ECHO) "static unsigned char sAWTIconData[] = { " >> $(ICON_DATA);  \
+	$(CAT) $(ICON) | \
+	    $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) -Djava.awt.headless=true \
+	    sun.osxapp.ToBin >> $(ICON_DATA); \
+	$(ECHO) "};" >> $(ICON_DATA);
+
+
+clean clobber:: generated.clean
+
+.PHONY: generated.clean
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/sun/osxapp/ToBin.java	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.osxapp;
+
+import java.io.*;
+
+public class ToBin {
+    public static void main(String[] args) throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        int nRead;
+        byte[] data = new byte[4096];
+
+        while ((nRead = System.in.read(data, 0, data.length)) != -1) {
+            baos.write(data, 0, nRead);
+        }
+
+        baos.flush();
+
+        byte[] buf = baos.toByteArray();
+        for (int i = 0; i < buf.length; i++) {
+            System.out.print(String.format("0x%1$02X", buf[i]) + ", ");
+            if (i % 20 == 0) {
+                System.out.println();
+            }
+        }
+    }
+}
--- a/make/sun/security/ec/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/sun/security/ec/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -156,7 +156,8 @@
       $(PKGDIR)/ECDSASignature.java \
       $(PKGDIR)/ECKeyPairGenerator.java
 
-  JAVAHFLAGS = -bootclasspath "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)"
+  JAVAHFLAGS = -bootclasspath \
+    "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)"
 
   #
   # C and C++ files
--- a/make/sun/security/mscapi/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/sun/security/mscapi/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -149,7 +149,9 @@
 # Rules
 #
 CLASSDESTDIR = $(TEMPDIR)/classes
-JAVAHFLAGS = -bootclasspath "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)"
+
+JAVAHFLAGS = -bootclasspath \
+  "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)"
 
 include $(BUILDDIR)/common/Mapfile-vers.gmk
 
--- a/make/sun/security/pkcs11/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/sun/security/pkcs11/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -147,7 +147,8 @@
 # Rules
 #
 CLASSDESTDIR = $(TEMPDIR)/classes
-JAVAHFLAGS = -bootclasspath "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)"
+JAVAHFLAGS = -bootclasspath \
+  "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)"
 
 include $(BUILDDIR)/common/Mapfile-vers.gmk
 
--- a/make/sun/tracing/dtrace/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/sun/tracing/dtrace/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
 #
 # Makefile for building dtrace extension
 #
+
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 BUILDDIR = ../../..
 PACKAGE = sun.tracing.dtrace
 LIBRARY = jsdt
--- a/make/sun/xawt/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/sun/xawt/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -245,10 +245,16 @@
 SIZERS = $(SIZER).32
 SIZERS_C = $(SIZER_32_C)
 SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
+ifdef CROSS_COMPILE_ARCH
+CFLAGS_32 = -m32
+endif
 else # !32
 SIZERS = $(SIZER).64
 SIZERS_C = $(SIZER_64_C)
 SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
+ifdef CROSS_COMPILE_ARCH
+CFLAGS_64 = -m64
+endif
 endif # 32
 endif # !macosx
 endif # solaris
@@ -284,13 +290,15 @@
 WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class 
 XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
 
+ifndef CROSS_COMPILE_ARCH
+SIZERS_CC = $(CC)
+else
+SIZERS_CC = $(HOST_CC)
+endif
+
 $(SIZERS): $(SIZERS_C) 
 	$(prep-target)
-ifndef CROSS_COMPILE_ARCH
-	$(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
-else
-	$(HOST_CC) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
-endif
+	$(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
 
 $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
 	$(prep-target)
--- a/make/tools/Makefile	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/tools/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,11 @@
   SUBDIRS += generate_nimbus
 endif
 
+ifeq ($(PLATFORM), solaris)
+  # temporary tools to work around gobjcopy bugs
+  SUBDIRS += add_gnu_debuglink fix_empty_sec_hdr_flags
+endif
+
 include $(BUILDDIR)/common/Subdirs.gmk
 
 all build clean clobber::
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/tools/add_gnu_debuglink/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#  
+#
+
+# Rules to build add_gnu_debuglink, used by various Makefiles on Solaris
+
+BUILDDIR = ../..
+include $(BUILDDIR)/common/Defs.gmk
+
+# Default name
+PROGRAM = add_gnu_debuglink
+ADD_GNU_DEBUGLINK_PROG = $(ABS_BUILDTOOLBINDIR)/$(PROGRAM)
+
+ADD_GNU_DEBUGLINK_SRC     = add_gnu_debuglink.c
+ADD_GNU_DEBUGLINK_FLAGS   = 
+LIBS_ADD_GNU_DEBUGLINK   += -lelf
+
+all: $(ADD_GNU_DEBUGLINK)
+
+$(ADD_GNU_DEBUGLINK_PROG): $(ADD_GNU_DEBUGLINK_SRC)
+	$(MKDIR) -p $(BUILDTOOLBINDIR)
+	$(CC) -g -o $@ $< $(ADD_GNU_DEBUGLINK_FLAGS) $(LIBS_ADD_GNU_DEBUGLINK)
+
+clean::
+	$(RM) $(ADD_GNU_DEBUGLINK_PROG)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/tools/add_gnu_debuglink/add_gnu_debuglink.c	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * Name:        add_gnu_debuglink.c
+ *
+ * Description: Add a ".gnu_debuglink" section that refers to the specified
+ *     debug_info_path to the specified ELF object.
+ *
+ *     This program is adapted from the example program shown on the
+ *     elf(3elf) man page and from code from the Solaris compiler
+ *     driver.
+ */
+
+/*
+ * needed to define SHF_EXCLUDE
+ */
+#define ELF_TARGET_ALL
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <libelf.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static void failure(void);
+static unsigned int gnu_debuglink_crc32(unsigned int crc, unsigned char *buf,
+                                        size_t len);
+
+void
+main(int argc, char ** argv) {
+                                 /* new ELF section name */
+    static char SEC_NAME[] = ".gnu_debuglink";
+
+    unsigned char buffer[8 * 1024];  /* I/O buffer */
+    int           buffer_len;        /* buffer length */
+    char *        debug_info_path;   /* debug info path */
+    void *        ehdr;              /* ELF header */
+    Elf *         elf;               /* ELF descriptor */
+    char *        elf_ident;         /* ELF identity string */
+    char *        elf_obj;           /* elf_obj file */
+    int           fd;                /* descriptor for files */
+    unsigned int  file_crc = 0;      /* CRC for debug info file */
+    int           is_elfclass64;     /* is an ELFCLASS64 file? */
+    Elf_Data *    link_dat;          /* ELF data for new debug info link */
+    Elf_Data *    name_dat;          /* ELF data for new section name */
+    Elf_Scn *     new_scn;           /* new ELF section descriptor */
+    void *        new_shdr;          /* new ELF section header */
+    Elf_Scn *     scn;               /* ELF section descriptor */
+    void *        shdr;              /* ELF section header */
+
+    if (argc != 3) {
+        (void) fprintf(stderr, "Usage: %s debug_info_path elf_obj\n", argv[0]);
+        exit(2);
+    }
+
+    debug_info_path = argv[1];  /* save for later */
+    if ((fd = open(debug_info_path, O_RDONLY)) == -1) {
+        (void) fprintf(stderr, "%s: cannot open file.\n", debug_info_path);
+        exit(3);
+    }
+
+    (void) printf("Computing CRC for '%s'\n", debug_info_path);
+    (void) fflush(stdout);
+    /* compute CRC for the debug info file */
+    for (;;) {
+        int len = read(fd, buffer, sizeof buffer);
+        if (len <= 0) {
+            break;
+        }
+        file_crc = gnu_debuglink_crc32(file_crc, buffer, len);
+    }
+    (void) close(fd);
+
+    /* open the elf_obj */
+    elf_obj = argv[2];
+    if ((fd = open(elf_obj, O_RDWR)) == -1) {
+        (void) fprintf(stderr, "%s: cannot open file.\n", elf_obj);
+        exit(4);
+    }
+
+    (void) printf("Opening '%s' for update\n", elf_obj);
+    (void) fflush(stdout);
+    (void) elf_version(EV_CURRENT);  /* coordinate ELF versions */
+
+    /* obtain the ELF descriptors from the input file */
+    if ((elf = elf_begin(fd, ELF_C_RDWR, NULL)) == NULL) {
+        failure();
+    }
+
+    /* determine if ELFCLASS64 or not? */
+    elf_ident = elf_getident(elf, NULL);
+    is_elfclass64 = (elf_ident[EI_CLASS] == ELFCLASS64);
+
+    /* get the ELF header */
+    if (is_elfclass64) {
+        ehdr = elf64_getehdr(elf);
+    } else {
+        ehdr = elf32_getehdr(elf);
+    }
+    if (ehdr == NULL) {
+        failure();
+    }
+
+    /* get the ELF section descriptor */
+    if (is_elfclass64) {
+        scn = elf_getscn(elf, ((Elf64_Ehdr *) ehdr)->e_shstrndx);
+    } else {
+        scn = elf_getscn(elf, ((Elf32_Ehdr *) ehdr)->e_shstrndx);
+    }
+    if (scn == NULL) {
+        failure();
+    }
+
+    /* get the section header */
+    if (is_elfclass64) {
+        shdr = elf64_getshdr(scn);
+    } else {
+        shdr = elf32_getshdr(scn);
+    }
+    if (shdr == NULL) {
+        failure();
+    }
+
+    (void) printf("Adding ELF data for new section name\n");
+    (void) fflush(stdout);
+    name_dat = elf_newdata(scn);
+    name_dat->d_buf = (void *) SEC_NAME;
+    if (is_elfclass64) {
+        name_dat->d_off = ((Elf64_Shdr *) shdr)->sh_size + 1;
+    } else {
+        name_dat->d_off = ((Elf32_Shdr *) shdr)->sh_size + 1;
+    }
+    name_dat->d_align = 1;
+    name_dat->d_size = strlen(SEC_NAME) + 1;
+
+    new_scn = elf_newscn(elf);
+
+    if (is_elfclass64) {
+        new_shdr = elf64_getshdr(new_scn);
+        ((Elf64_Shdr *) new_shdr)->sh_flags = SHF_EXCLUDE;
+        ((Elf64_Shdr *) new_shdr)->sh_type = SHT_PROGBITS;
+        ((Elf64_Shdr *) new_shdr)->sh_name = ((Elf64_Shdr *) shdr)->sh_size;
+        ((Elf64_Shdr *) new_shdr)->sh_addralign = 1;
+        ((Elf64_Shdr *) shdr)->sh_size += (strlen(SEC_NAME) + 1);
+    } else {
+        new_shdr = elf32_getshdr(new_scn);
+        ((Elf32_Shdr *) new_shdr)->sh_flags = SHF_EXCLUDE;
+        ((Elf32_Shdr *) new_shdr)->sh_type = SHT_PROGBITS;
+        ((Elf32_Shdr *) new_shdr)->sh_name = ((Elf32_Shdr *) shdr)->sh_size;
+        ((Elf32_Shdr *) new_shdr)->sh_addralign = 1;
+        ((Elf32_Shdr *) shdr)->sh_size += (strlen(SEC_NAME) + 1);
+    }
+
+    (void) printf("Adding ELF data for debug_info_path value\n");
+    (void) fflush(stdout);
+    (void) memset(buffer, 0, sizeof buffer);
+    buffer_len = strlen(debug_info_path) + 1;  /* +1 for NUL */
+    (void) strncpy((char *) buffer, debug_info_path, buffer_len);
+    if (buffer_len % 4 != 0) {
+        /* not on a 4 byte boundary so pad to the next one */
+        buffer_len += (4 - buffer_len % 4);
+    }
+    /* save the CRC */
+    (void) memcpy(&buffer[buffer_len], &file_crc, sizeof file_crc);
+    buffer_len += sizeof file_crc;
+
+    link_dat = elf_newdata(new_scn);
+    link_dat->d_type = ELF_T_BYTE;
+    link_dat->d_size = buffer_len;
+    link_dat->d_buf = buffer;
+    link_dat->d_align = 1;
+
+    (void) printf("Saving updates to '%s'\n", elf_obj);
+    (void) fflush(stdout);
+    (void) elf_update(elf, ELF_C_NULL);   /* recalc ELF memory structures */
+    (void) elf_update(elf, ELF_C_WRITE);  /* write out changes to ELF obj */
+    (void) elf_end(elf);                  /* done with ELF obj */
+    (void) close(fd);
+
+    (void) printf("Done updating '%s'\n", elf_obj);
+    (void) fflush(stdout);
+    exit(0);
+}  /* end main */
+
+
+static void
+failure() {
+    (void) fprintf(stderr, "%s\n", elf_errmsg(elf_errno()));
+    exit(5);
+}
+
+
+/*
+ * The CRC used in gnu_debuglink, retrieved from
+ * http://sourceware.org/gdb/current/onlinedocs/gdb/Separate-Debug-Files.html#Separate-Debug-Files.
+ */
+
+static unsigned int
+gnu_debuglink_crc32(unsigned int crc, unsigned char *buf, size_t len) {
+    static const unsigned int crc32_table[256] = {
+        0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+        0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+        0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+        0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+        0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+        0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+        0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+        0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+        0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+        0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+        0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+        0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+        0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+        0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+        0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+        0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+        0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+        0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+        0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+        0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+        0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+        0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+        0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+        0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+        0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+        0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+        0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+        0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+        0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+        0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+        0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+        0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+        0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+        0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+        0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+        0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+        0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+        0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+        0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+        0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+        0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+        0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+        0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+        0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+        0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+        0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+        0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+        0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+        0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+        0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+        0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+        0x2d02ef8d
+    };
+
+    unsigned char *end;
+
+    crc = ~crc & 0xffffffff;
+    for (end = buf + len; buf < end; ++buf) {
+        crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8);
+    }
+    return ~crc & 0xffffffff;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/tools/fix_empty_sec_hdr_flags/Makefile	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#  
+#
+
+# Rules to build fix_empty_sec_hdr_flags, used by various Makefiles on Solaris
+
+BUILDDIR = ../..
+include $(BUILDDIR)/common/Defs.gmk
+
+# Default name
+PROGRAM = fix_empty_sec_hdr_flags
+FIX_EMPTY_SEC_HDR_FLAGS_PROG = $(ABS_BUILDTOOLBINDIR)/$(PROGRAM)
+
+FIX_EMPTY_SEC_HDR_FLAGS_SRC     = fix_empty_sec_hdr_flags.c
+FIX_EMPTY_SEC_HDR_FLAGS_FLAGS   = 
+LIBS_FIX_EMPTY_SEC_HDR_FLAGS   += -lelf
+
+all: $(FIX_EMPTY_SEC_HDR_FLAGS)
+
+$(FIX_EMPTY_SEC_HDR_FLAGS_PROG): $(FIX_EMPTY_SEC_HDR_FLAGS_SRC)
+	$(MKDIR) -p $(BUILDTOOLBINDIR)
+	$(CC) -g -o $@ $< $(FIX_EMPTY_SEC_HDR_FLAGS_FLAGS) $(LIBS_FIX_EMPTY_SEC_HDR_FLAGS)
+
+clean::
+	$(RM) $(FIX_EMPTY_SEC_HDR_FLAGS_PROG)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/tools/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c	Sun Aug 12 15:29:21 2012 -0700
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * Name:        fix_empty_sec_hdr_flags.c
+ *
+ * Description: Remove the SHF_ALLOC flag from "empty" section headers.
+ *     An "empty" section header has sh_addr == 0 and sh_size == 0.
+ *
+ *     This program is adapted from the example program shown on the
+ *     elf(3elf) man page and from code from the Solaris compiler
+ *     driver.
+ */
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <libelf.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static void failure(void);
+
+void
+main(int argc, char ** argv) {
+    void *        ehdr;           /* ELF header */
+    unsigned int  i;              /* section counter */
+    int           fd;             /* descriptor for file */
+    Elf *         elf;            /* ELF descriptor */
+    char *        elf_ident;      /* ELF identity string */
+    char *        elf_obj;        /* elf_obj file */
+    int           fix_count;      /* number of flags fixed */
+    int           is_elfclass64;  /* is an ELFCLASS64 file? */
+    Elf_Scn *     scn;            /* ELF section descriptor */
+    void *        shdr;           /* ELF section header */
+    Elf_Data *    shstrtab;       /* ELF section header string table */
+
+    if (argc != 2) {
+        (void) fprintf(stderr, "Usage: %s elf_obj\n", argv[0]);
+        exit(2);
+    }
+
+    /* open the elf_obj */
+    elf_obj = argv[1];
+    if ((fd = open(elf_obj, O_RDWR)) == -1) {
+        (void) fprintf(stderr, "%s: cannot open file.\n", elf_obj);
+        exit(3);
+    }
+
+    (void) printf("Opening '%s' for update\n", elf_obj);
+    (void) fflush(stdout);
+    (void) elf_version(EV_CURRENT);  /* coordinate ELF versions */
+
+    /* obtain the ELF descriptors from the input file */
+    if ((elf = elf_begin(fd, ELF_C_RDWR, NULL)) == NULL) {
+        failure();
+    }
+
+    /* determine if ELFCLASS64 or not? */
+    elf_ident = elf_getident(elf, NULL);
+    is_elfclass64 = (elf_ident[EI_CLASS] == ELFCLASS64);
+
+    /* get the ELF header */
+    if (is_elfclass64) {
+        ehdr = elf64_getehdr(elf);
+    } else {
+        ehdr = elf32_getehdr(elf);
+    }
+    if (ehdr == NULL) {
+        failure();
+    }
+
+    /* get the ELF section descriptor */
+    if (is_elfclass64) {
+        scn = elf_getscn(elf, ((Elf64_Ehdr *) ehdr)->e_shstrndx);
+    } else {
+        scn = elf_getscn(elf, ((Elf32_Ehdr *) ehdr)->e_shstrndx);
+    }
+    if (scn == NULL) {
+        failure();
+    }
+
+    /* get the section header string table */
+    shstrtab = elf_getdata(scn, NULL);
+    if (shstrtab == NULL) {
+        failure();
+    }
+
+    fix_count = 0;
+
+    /* traverse the sections of the input file */
+    for (i = 1, scn = NULL; scn = elf_nextscn(elf, scn); i++) {
+        int    has_flag_set;  /* is SHF_ALLOC flag set? */
+        int    is_empty;      /* is section empty? */
+        char * name;          /* short hand pointer */
+
+        /* get the section header */
+        if (is_elfclass64) {
+            shdr = elf64_getshdr(scn);
+        } else {
+            shdr = elf32_getshdr(scn);
+        }
+        if (shdr == NULL) {
+            failure();
+        }
+
+        if (is_elfclass64) {
+            name = (char *)shstrtab->d_buf + ((Elf64_Shdr *) shdr)->sh_name;
+        } else {
+            name = (char *)shstrtab->d_buf + ((Elf32_Shdr *) shdr)->sh_name;
+        }
+
+        if (is_elfclass64) {
+            has_flag_set = ((Elf64_Shdr *) shdr)->sh_flags & SHF_ALLOC;
+            is_empty = ((Elf64_Shdr *) shdr)->sh_addr == 0 &&
+                ((Elf64_Shdr *) shdr)->sh_size == 0;
+        } else {
+            has_flag_set = ((Elf32_Shdr *) shdr)->sh_flags & SHF_ALLOC;
+            is_empty = ((Elf32_Shdr *) shdr)->sh_addr == 0 &&
+                ((Elf32_Shdr *) shdr)->sh_size == 0;
+        }
+
+        if (is_empty && has_flag_set) {
+            (void) printf("section[%u] '%s' is empty, "
+                "but SHF_ALLOC flag is set.\n", i, name);
+            (void) printf("Clearing the SHF_ALLOC flag.\n");
+
+            if (is_elfclass64) {
+                ((Elf64_Shdr *) shdr)->sh_flags &= ~SHF_ALLOC;
+            } else {
+                ((Elf32_Shdr *) shdr)->sh_flags &= ~SHF_ALLOC;
+            }
+            fix_count++;
+        }
+    }  /* end for each ELF section */
+
+    if (fix_count > 0) {
+        (void) printf("Saving %d updates to '%s'\n", fix_count, elf_obj);
+        (void) fflush(stdout);
+        (void) elf_update(elf, ELF_C_NULL);   /* recalc ELF memory structures */
+        (void) elf_update(elf, ELF_C_WRITE);  /* write out changes to ELF obj */
+    } else {
+        (void) printf("No SHF_ALLOC flags needed to be cleared.\n");
+    }
+
+    (void) elf_end(elf);                  /* done with ELF obj */
+    (void) close(fd);
+
+    (void) printf("Done %s '%s'\n",
+               (fix_count > 0) ? "updating" : "with", elf_obj);
+    (void) fflush(stdout);
+    exit(0);
+}  /* end main */
+
+
+static void
+failure() {
+    (void) fprintf(stderr, "%s\n", elf_errmsg(elf_errno()));
+    exit(6);
+}
--- a/make/tools/src/build/tools/javazic/Mappings.java	Sat Aug 04 10:32:21 2012 -0700
+++ b/make/tools/src/build/tools/javazic/Mappings.java	Sun Aug 12 15:29:21 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 package build.tools.javazic;
 
 import  java.util.ArrayList;
+import  java.util.HashMap;
 import  java.util.LinkedList;
 import  java.util.List;
 import  java.util.Map;
@@ -162,6 +163,20 @@
         for (String key : toBeRemoved) {
             aliases.remove(key);
         }
+        // Eliminate any alias-to-alias mappings. For example, if
+        // there are A->B and B->C, A->B is changed to A->C.
+        Map<String, String> newMap = new HashMap<String, String>();
+        for (String key : aliases.keySet()) {
+            String realid = aliases.get(key);
+            String leaf = realid;
+            while (aliases.get(leaf) != null) {
+                leaf = aliases.get(leaf);
+            }
+            if (!realid.equals(leaf)) {
+                newMap.put(key, leaf);
+            }
+        }
+        aliases.putAll(newMap);
     }
 
     Map<String,String> getAliases() {
--- a/src/linux/doc/man/ja/appletviewer.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/appletviewer.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH appletviewer 1 "21 Mar 2012"
+.TH appletviewer 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -40,7 +40,7 @@
 .na
 \f2アプレット・ビューアのタグ\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/appletviewertags.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/tools/appletviewertags.htmlを参照してください。
 .LP
 .LP
 \f3注意:\fP \f3appletviewer\fPは開発専用です。詳細は、サンプル/テスト・アプリケーションのコードについてを参照してください。
--- a/src/linux/doc/man/ja/apt.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/apt.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH apt 1 "21 Mar 2012"
+.TH apt 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -60,7 +60,7 @@
 .na
 \f4apt\fP\f3スタート・ガイド\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.htmlを参照してください。
 .LP
 .SH "オプション"
 .LP
--- a/src/linux/doc/man/ja/extcheck.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/extcheck.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH extcheck 1 "21 Mar 2012"
+.TH extcheck 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
--- a/src/linux/doc/man/ja/idlj.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/idlj.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH idlj 1 "21 Mar 2012"
+.TH idlj 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -47,7 +47,7 @@
 .na
 \f2OMG IDL to Java Language Mapping Specification\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.htmlを参照してください。IDL\-to\-Javaコンパイラの以前のリリースの中には、\f2idltojava\fPという名前だったものがあります。
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.htmlを参照してください。IDL\-to\-Javaコンパイラの以前のリリースの中には、\f2idltojava\fPという名前だったものがあります。
 .LP
 .SS 
 クライアント・バインディングおよびサーバー・バインディングの発行
@@ -110,13 +110,13 @@
 .na
 \f2org.omg.PortableServer.Servant\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.htmlを拡張するストリームベースのスケルトンで、スケルトンが実装するIDLインタフェースに関連付けられている\f2InvokeHandler\fPインタフェースと操作インタフェースを実装します。
+http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.htmlを拡張するストリームベースのスケルトンで、スケルトンが実装するIDLインタフェースに関連付けられている\f2InvokeHandler\fPインタフェースと操作インタフェースを実装します。
 .LP
 .LP
 .na
 \f2Portable Object Adapter(POA)\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.htmlの\f2PortableServer\fPモジュールは、ネイティブの\f2Servant\fP型を定義します。Javaプログラミング言語では、\f2Servant\fP型はJavaの\f2org.omg.PortableServer.Servant\fPクラスにマップされます。このクラスは、すべてのPOAサーバント実装のベース・クラスとして機能し、アプリケーション・プログラマが呼び出すことのできるいくつかのメソッドの他に、POAそのものによって呼び出され、サーバントの動作を制御するためにユーザーがオーバーライドできるメソッドも提供します。
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/POA.htmlの\f2PortableServer\fPモジュールは、ネイティブの\f2Servant\fP型を定義します。Javaプログラミング言語では、\f2Servant\fP型はJavaの\f2org.omg.PortableServer.Servant\fPクラスにマップされます。このクラスは、すべてのPOAサーバント実装のベース・クラスとして機能し、アプリケーション・プログラマが呼び出すことのできるいくつかのメソッドの他に、POAそのものによって呼び出され、サーバントの動作を制御するためにユーザーがオーバーライドできるメソッドも提供します。
 .LP
 .LP
 継承モデルのもう1つのオプションは、\f2\-oldImplBase\fPフラグを使用することで、J2SE 1.4より前のバージョンのJavaプログラミング言語と互換性のあるサーバー側バインディングを生成することです。ただし、\f2\-oldImplBase\fPフラグを使用するのは、標準的な手法ではありません。これらのAPIは今後非推奨になる予定です。このフラグを使用するのは、J2SE 1.3で記述された既存のサーバーとの互換性が必要な場合のみです。その場合には既存のMAKEFILEを変更し、\f2idlj\fPコンパイラに\f2\-oldImplBase\fPフラグを追加する必要があります。そうしないと、POAベースのサーバー側マッピングが生成されます。下位互換性のあるサーバー側バインディングを生成するには、次のコマンドを使用します。
@@ -294,7 +294,7 @@
 .na
 \f2クラス・パスの設定\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#generalを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#generalを参照してください。
 .LP
 .SS 
 インクルード・ファイルに対するバインディングの発行
--- a/src/linux/doc/man/ja/jar.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jar.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jar 1 "21 Mar 2012"
+.TH jar 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -120,7 +120,7 @@
 .na
 \f2JARファイルの仕様\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifestを参照してください。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifestを参照してください。 
 .LP
 既存のマニフェスト・ファイル内に格納された\f2name\ :\ value\fPのペアをJARファイルに含める必要がある場合には、次のように\f2\-m\fPオプションを使用してそのファイルを指定します。
 .LP
@@ -180,7 +180,7 @@
 .na
 \f2JarIndex\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Indexがサポートされています。JarIndexを使用すると、アプリケーションのクラス・ローダーでJARファイルからクラスがロードされるときの効率が向上します。アプリケーションまたはアプレットが複数のJARファイルにバンドルされている場合は、必要なJARファイルのみがダウンロードされて開かれ、クラスがロードされます。このパフォーマンスの最適化は、\f2\-i\fPオプションを指定して\f2jar\fPを実行すると有効になります。このオプションを使用すると、指定したJARメイン・ファイルと、そのメイン・ファイルが依存しているすべてのJARファイルについて、パッケージ位置情報が生成されます。メイン・ファイルが依存しているJARファイルは、JARメイン・ファイルのマニフェストの\f2Class\-Path\fP属性に指定しておく必要があります。
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Indexがサポートされています。JarIndexを使用すると、アプリケーションのクラス・ローダーでJARファイルからクラスがロードされるときの効率が向上します。アプリケーションまたはアプレットが複数のJARファイルにバンドルされている場合は、必要なJARファイルのみがダウンロードされて開かれ、クラスがロードされます。このパフォーマンスの最適化は、\f2\-i\fPオプションを指定して\f2jar\fPを実行すると有効になります。このオプションを使用すると、指定したJARメイン・ファイルと、そのメイン・ファイルが依存しているすべてのJARファイルについて、パッケージ位置情報が生成されます。メイン・ファイルが依存しているJARファイルは、JARメイン・ファイルのマニフェストの\f2Class\-Path\fP属性に指定しておく必要があります。
 .LP
 .nf
 \f3
@@ -214,7 +214,7 @@
 .na
 \f2Javaチュートリアル\fP @
 .fi
-http://docs.oracle.com/javase/tutorial/deployment/jarのJARトライアルも参照してください。
+http://docs.oracle.com/javase/tutorial/deployment/jar/のJARトライアルも参照してください。
 .LP
 .SH "オプション"
 .LP
@@ -284,11 +284,11 @@
 .fl
 \fP
 .fi
-デフォルトのマニフェストには含まれないマニフェストに、特別な目的の\f2name\ :\ value\fPの属性ペアを追加できます。たとえば、ベンダー情報、バージョン情報、パッケージ・シーリング、またはJARにバンドルされたアプリケーションを実行可能にするための属性を追加できます。Javaチュートリアルの
+デフォルトのマニフェストには含まれないマニフェストに、特別な目的の\f2name\ :\ value\fPの属性ペアを追加できます。たとえば、ベンダー情報、バージョン情報、パッケージ・シーリング、またはJARにバンドルされたアプリケーションを実行可能にするための属性を追加できます。\f4\-m\fPオプションの使用例は、Javaチュートリアルの
 .na
-\f2JARファイル\fP @
+\f2JARファイルでのプログラムのパッケージ化\fP @
 .fi
-http://docs.oracle.com/javase/tutorial/deployment/jar/を参照し、  \f4\-m\fPオプションの使用例を確認してください。 
+http://docs.oracle.com/javase/tutorial/deployment/jar/のレッスンを参照してください。 
 .TP 3
 e 
 実行可能JARファイル内にバンドルされたスタンドアロン・アプリケーションのアプリケーション・エントリ・ポイントとして、\f2entrypoint\fPを設定します。このオプションを使用すると、マニフェスト・ファイル内の\f2Main\-Class\fP属性値が作成または上書きされます。このオプションは、JARファイルの作成中または更新中に使用できます。このオプションを使用すれば、マニフェスト・ファイルを編集または作成することなしに、アプリケーションのエントリ・ポイントを指定できます。
@@ -575,25 +575,25 @@
 .na
 \f2JARファイルの概要\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html
 .LP
 .LP
 .na
 \f2JARファイルの仕様\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html
 .LP
 .LP
 .na
 \f2JarIndexの仕様\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index
 .LP
 .LP
 .na
 \f2JARチュートリアル\fP @
 .fi
-http://docs.oracle.com/javase/tutorial/deployment/jar/index.html
+http://docs.oracle.com/javase/tutorial/deployment/jar//index.html
 .LP
 .LP
 pack200(1)
--- a/src/linux/doc/man/ja/jarsigner.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jarsigner.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jarsigner 1 "21 Mar 2012"
+.TH jarsigner 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -147,7 +147,7 @@
 .na
 \f2Java暗号化アーキテクチャ用プロバイダの実装方法\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.htmlで説明しているように、クライアントが「プロバイダ」を実装し、KeystoreSpiサブクラスの実装を提供する必要があります。
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.htmlで説明しているように、クライアントが「プロバイダ」を実装し、KeystoreSpiサブクラスの実装を提供する必要があります。
 .LP
 .LP
 アプリケーションでは、\f2KeyStore\fPクラスが提供するgetInstanceファクトリ・メソッドを使用することで、様々なプロバイダから異なる\f2タイプ\fPのキーストアの実装を選択できます。キーストアのタイプは、キーストア情報の格納形式とデータ形式を定義するとともに、キーストア内の秘密鍵とキーストア自体の整合性を保護するために使用されるアルゴリズムを定義します。異なるタイプのキーストアの実装には、互換性はありません。
@@ -208,7 +208,7 @@
 .na
 \f2KeyToolとJarSigner\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSignerの項を参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSignerの項を参照してください。
 .LP
 .SS 
 サポートされるアルゴリズム
@@ -513,7 +513,7 @@
 .na
 \f2付録A\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppAを参照してください。このアルゴリズムには、JARファイルの署名に使用する秘密鍵との互換性が必要です。このオプションを指定しなかった場合、秘密鍵のタイプに応じてSHA1withDSA、SHA256withRSA、SHA256withECDSAのいずれかが使用されます。指定されたアルゴリズムの実装を提供するプロバイダが静的にインストールされているか、\f2\-providerClass\fPオプションを使用してそのようなプロバイダをユーザーが指定する必要があります。そうでない場合、コマンドの実行が失敗します。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppAを参照してください。このアルゴリズムには、JARファイルの署名に使用する秘密鍵との互換性が必要です。このオプションを指定しなかった場合、秘密鍵のタイプに応じてSHA1withDSA、SHA256withRSA、SHA256withECDSAのいずれかが使用されます。指定されたアルゴリズムの実装を提供するプロバイダが静的にインストールされているか、\f2\-providerClass\fPオプションを使用してそのようなプロバイダをユーザーが指定する必要があります。そうでない場合、コマンドの実行が失敗します。 
 .TP 3
 \-digestalg algorithm 
 JARファイルのエントリをダイジェストする際に使用するメッセージ・ダイジェスト・アルゴリズムの名前を指定します。
@@ -523,7 +523,7 @@
 .na
 \f2付録A\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppAを参照してください。このオプションを指定しなかった場合、SHA256が使用されます。指定されたアルゴリズムの実装を提供するプロバイダが静的にインストールされているか、\f2\-providerClass\fPオプションを使用してそのようなプロバイダをユーザーが指定する必要があります。そうでない場合、コマンドの実行が失敗します。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppAを参照してください。このオプションを指定しなかった場合、SHA256が使用されます。指定されたアルゴリズムの実装を提供するプロバイダが静的にインストールされているか、\f2\-providerClass\fPオプションを使用してそのようなプロバイダをユーザーが指定する必要があります。そうでない場合、コマンドの実行が失敗します。 
 .TP 3
 \-signedjar file 
 署名付きJARファイルの名前を指定します。
@@ -608,7 +608,7 @@
 .na
 \f2構成属性の表\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRSを参照してください。たとえば、次のコマンドは、名前接尾辞\f2SmartCard\fPのPKCS#11キーストア・プロバイダ・インスタンスの内容をリストします。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRSを参照してください。たとえば、次のコマンドは、名前接尾辞\f2SmartCard\fPのPKCS#11キーストア・プロバイダ・インスタンスの内容をリストします。 
 .nf
 \f3
 .fl
--- a/src/linux/doc/man/ja/java.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/java.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH java 1 "01 Apr 2012"
+.TH java 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -112,7 +112,7 @@
 .na
 \f2サーバー \- クラス・マシンの検出\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.htmlを参照してください。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.htmlを参照してください。 
 .TP 3
 \-server 
 Java HotSpot Server VMを選択します。64ビット対応JDK上では、サポートされるのはJava Hotspot Server VMのみであるため、\-serverオプションが暗黙的に選択されます。
@@ -122,7 +122,7 @@
 .na
 \f2サーバー \- クラス・マシンの検出\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.htmlを参照してください。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.htmlを参照してください。 
 .TP 3
 \-agentlib:libname[=options] 
 ネイティブ・エージェント・ライブラリ\f2libname\fPをロードします。たとえば次のように指定します。
@@ -141,14 +141,14 @@
 .na
 \f2JVMTIエージェントのコマンドライン・オプション\fP @
 .fi
-http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#startingを参照してください。 
+http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#startingを参照してください。 
 .TP 3
 \-agentpath:pathname[=options] 
 フルパス名を使用して、ネーティブ・エージェント・ライブラリをロードします。詳細は、
 .na
 \f2JVMTIエージェントのコマンドライン・オプション\fP @
 .fi
-http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#startingを参照してください。 
+http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#startingを参照してください。 
 .TP 3
 \-classpath classpath 
 .TP 3
@@ -169,7 +169,7 @@
 .na
 \f2クラス・パスの設定\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpathを参照してください。 
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpathを参照してください。 
 .TP 3
 \-Dproperty=value 
 システム・プロパティの値を設定します。 
@@ -241,7 +241,7 @@
 .na
 \f2Javaチュートリアル\fP @
 .fi
-http://docs.oracle.com/javase/tutorial/deployment/jarの「Trail: Jar Files」を参照してください。\ 
+http://docs.oracle.com/javase/tutorial/deployment/jar/の「Trail: Jar Files」を参照してください。\ 
 .br
 .br
 このオプションを使用すると、指定したJARファイルがすべてのユーザー・クラスのソースになり、ユーザー・クラス・パスの他の設定は無視されます。
@@ -251,14 +251,14 @@
 .na
 \f2Java Archive(JAR)ファイル\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/index.htmlを参照してください。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/index.htmlを参照してください。 
 .TP 3
 \-javaagent:jarpath[=options] 
 Javaプログラミング言語エージェントをロードします。
 .na
 \f2java.lang.instrument\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.htmlを参照してください。 
+http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.htmlを参照してください。 
 .TP 3
 \-jre\-restrict\-search 
 ユーザー・プライベートなJREをバージョン検索に含めます。 
@@ -357,7 +357,7 @@
 .na
 \f2HotSpot Ergonomics\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.htmlを参照してください。
 .br
 .br
 例: 
@@ -380,7 +380,7 @@
 .na
 \f2HotSpot Ergonomics\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.htmlを参照してください。
 .br
 .br
 例: 
@@ -455,7 +455,7 @@
 \-XX:MaxGCPauseMillis=n 
 最大GC休止時間のターゲットを設定します。
 .br
-これはソフト・ゴールのため、JVMは実現のために最善の努力をします。 
+これはソフト・ゴールのため、JVMは実現のために最善の努力をします。デフォルトで設定されている最大値はありません。 
 .TP 3
 \-XX:NewSize 
 若い世代(ナーサリ)のサイズを設定します。\f3\-Xmn\fP\f4size\fPと同じです。 
@@ -520,9 +520,14 @@
 \-XX:+UseParallelOldGC 
 パラレル・ガベージ・コレクタを有効にします。これはスループットおよび平均レスポンス時間に対して最適化されます。
 .br
-.SH "注意" 
+.RE
+
 .LP
-\f3\-version:\fP\f2release\fPコマンドライン・オプションでは、リリース指定の複雑さに制限はありません。ただし、可能なリリース指定の限られたサブセットのみが適切なサウンド・ポリシーを表現でき、それらのみが完全にサポートされます。それらのポリシーを次に示します。 
+.SH "注意"
+.LP
+.LP
+\f3\-version:\fP\f2release\fPコマンドライン・オプションでは、リリース指定の複雑さに制限はありません。ただし、可能なリリース指定の限られたサブセットのみが適切なサウンド・ポリシーを表現でき、それらのみが完全にサポートされます。それらのポリシーを次に示します。
+.LP
 .RS 3
 .TP 3
 1.
@@ -560,9 +565,42 @@
 .fi
 これは項目2に似ていますが、ある変更が特定のリリース(1.7)で導入されたが、その同じ変更が以前のリリースのアップデートでも利用可能になった、という場合に便利です。 
 .RE
-.SH "終了ステータス" 
+
 .LP
-一般に、次の終了値が起動ツールから返されるのは通常、起動元が不正な引数で呼び出されたか、深刻なエラーが発生したか、あるいはJava仮想マシンから例外がスローされた場合です。ただしJavaアプリケーションは、API呼出し\f2System.exit(exitValue)\fPを使用して任意の値を返すことを選択することもできます。 
+.SH "パフォーマンス・チューニングの例"
+.LP
+.LP
+スループットまたはレスポンス時間の高速化のどちらかを最適化するための、試験的なチューニング・フラグの使用例を次に示します。
+.LP
+.SS 
+スループットを向上するためのチューニング
+.LP
+.nf
+\f3
+.fl
+        java \-d64 \-server \-XX:+AggressiveOpts \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g 
+.fl
+\fP
+.fi
+
+.LP
+.SS 
+レスポンス時間を速くするためのチューニング
+.LP
+.nf
+\f3
+.fl
+        java \-d64 \-XX:+UseG1GC \-Xms26g Xmx26g \-XX:MaxGCPauseMillis=500 \-XX:+PrintGCTimeStamps 
+.fl
+\fP
+.fi
+
+.LP
+.SH "終了ステータス"
+.LP
+.LP
+一般に、次の終了値が起動ツールから返されるのは通常、起動元が不正な引数で呼び出されたか、深刻なエラーが発生したか、あるいはJava仮想マシンから例外がスローされた場合です。ただしJavaアプリケーションは、API呼出し\f2System.exit(exitValue)\fPを使用して任意の値を返すことを選択することもできます。
+.LP
 .RS 3
 .TP 2
 o
@@ -571,7 +609,10 @@
 o
 \f2>0\fP: エラー発生 
 .RE
-.SH "関連項目" 
+
+.LP
+.SH "関連項目"
+.LP
 .RS 3
 .TP 2
 o
@@ -590,20 +631,19 @@
 .na
 \f2Java拡張機能フレームワーク\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
 .TP 2
 o
 .na
 \f2セキュリティ\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/index.html 
 .TP 2
 o
 .na
 \f2HotSpot VM Specific Options\fP @
 .fi
-http://java.sun.com/docs/hotspot/VMOptions.html 
-.RE
+http://www.oracle.com/technetwork/java/javase/tech/vmoptions\-jsp\-140102.html 
 .RE
 
 .LP
--- a/src/linux/doc/man/ja/javac.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/javac.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javac 1 "21 Mar 2012"
+.TH javac 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -1209,7 +1209,7 @@
 .na
 \f2javacガイド\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javac/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/javac/index.html 
 .TP 2
 o
 java(1) \- Javaアプリケーション起動ツール 
@@ -1233,7 +1233,7 @@
 .na
 \f2Java拡張機能フレームワーク\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
 .RE
 
 .LP
--- a/src/linux/doc/man/ja/javadoc.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/javadoc.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javadoc 1 "21 Mar 2012"
+.TH javadoc 1 "05 Jul 2012"
 .SH "名前"
 javadoc \- Java APIドキュメント・ジェネレータ
 .LP
@@ -111,7 +111,7 @@
 .na
 \f2クラスの検索方法\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.htmlを参照してください。通常、作成するクラスは、拡張機能としてロードするか、Javadocツールのクラス・パス内に置く必要があります。
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.htmlを参照してください。通常、作成するクラスは、拡張機能としてロードするか、Javadocツールのクラス・パス内に置く必要があります。
 .SS 
 Javadocのドックレット
 .LP
@@ -122,7 +122,7 @@
 .na
 \f2Javadocのドックレット\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html 
 .TP 2
 o
 \f2\-doclet\fPコマンドライン・オプション 
@@ -137,13 +137,13 @@
 .na
 \f2Javadocに施された拡張機能\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html \- Javadocで追加された改良点の詳細。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html \- Javadocで追加された改良点の詳細。 
 .TP 2
 o
 .na
 \f2Javadoc FAQ\fP @
 .fi
-http://java.sun.com/j2se/javadoc/faq/index.html \- 頻繁に寄せられる質問に対する回答、Javadoc関連のツールについての情報、およびバグの回避方法。 
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137483.html \- 頻繁に寄せられる質問に対する回答、Javadoc関連のツールについての情報、およびバグの回避方法。 
 .TP 2
 o
 .na
@@ -155,25 +155,19 @@
 .na
 \f2API仕様を記述するための要件\fP @
 .fi
-http://java.sun.com/j2se/javadoc/writingapispecs/index.html \- Java SEプラットフォーム仕様を記述する際に使用された標準要件。この情報は、ソース・ファイルのドキュメンテーション・コメント形式でAPI仕様を記述する場合にも、その他の形式で記述する場合にも役立ちます。検証可能なアサーションを満たすパッケージ、クラス、インタフェース、フィールド、およびメソッドについての要件を定めています。 
+http://www.oracle.com/technetwork/java/javase/documentation/index\-142372.html \- Java SEプラットフォーム仕様を記述する際に使用された標準要件。この情報は、ソース・ファイルのドキュメンテーション・コメント形式でAPI仕様を記述する場合にも、その他の形式で記述する場合にも役立ちます。検証可能なアサーションを満たすパッケージ、クラス、インタフェース、フィールド、およびメソッドについての要件を定めています。 
 .TP 2
 o
 .na
 \f2ドキュメンテーション・コメントの仕様\fP @
 .fi
-http://java.sun.com/docs/books/jls/first_edition/html/18.doc.html \- ドキュメンテーション・コメントのオリジナル仕様については、\f2Java Language Specification\fP (James Gosling、Bill Joy、Guy Steele共著)の初版の第18章、Documentation Commentsを参照してください。(この章は、第2版では削除されました。) 
+http://docs.oracle.com/javase/specs/ \- ドキュメンテーション・コメントのオリジナル仕様については、\f2Java Language Specification\fP (James Gosling、Bill Joy、Guy Steele共著)の初版の第18章、Documentation Commentsを参照してください。(この章は、第2版では削除されました。) 
 .TP 2
 o
 .na
 \f2DocCheckドックレット\fP @
 .fi
 http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- ソース・ファイル内のドキュメンテーション・コメントをチェックし、検出されたエラーや不正のレポートを生成します。Doc Checkユーティリティの一部です。 
-.TP 2
-o
-.na
-\f2MIFドックレット\fP @
-.fi
-http://java.sun.com/j2se/javadoc/mifdoclet/ \- MIF、FrameMaker、PDFの形式でAPIドキュメントを自動生成します。MIFはAdobe FrameMakerの交換形式です。 
 .RE
 .SS 
 用語
@@ -338,14 +332,14 @@
 .na
 \f2パッケージの概要\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/applet/package\-summary.htmlを参照)。 
+http://docs.oracle.com/javase/7/docs/api/java/applet/package\-summary.htmlを参照)。 
 .TP 2
 o
 パッケージの概要ページの先頭に、パッケージ・コメントの最初の文をコピーします。さらに、概要ページのパッケージ・リストに、パッケージ名とパッケージ・コメントの最初の文を追加します(
 .na
 \f2概要の要約\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/overview\-summary.htmlを参照)。文の終わりは、クラスやメンバーの主説明の最初の文の終わりと同じルールによって判断されます。 
+http://docs.oracle.com/javase/7/docs/api/overview\-summary.htmlを参照)。文の終わりは、クラスやメンバーの主説明の最初の文の終わりと同じルールによって判断されます。 
 .RE
 .SS 
 概要コメント・ファイル
@@ -372,7 +366,7 @@
 .na
 \f2概要の要約\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/overview\-summary.htmlを参照)。 
+http://docs.oracle.com/javase/7/docs/api/overview\-summary.htmlを参照)。 
 .TP 2
 o
 概要ページの先頭に、概要コメントの最初の文をコピーします。 
@@ -820,12 +814,6 @@
 \f3インライン・タグ\fP \- 主説明内、またはブロック・タグのコメント内に記述可能。インライン・タグは、\f2{@tag}\fPのように中括弧で囲みます。 
 .RE
 .LP
-今後のリリースで導入されるタグについては、
-.na
-\f2提案されているタグ\fP @
-.fi
-http://java.sun.com/j2se/javadoc/proposed\-tags.htmlを参照してください。
-.LP
 現時点で有効なタグは、次のとおりです。
 .LP
 .TS
@@ -939,7 +927,7 @@
 .nr 41 \n(80+(3*\n(38)
 .nr 81 +\n(41
 .nr TW \n(81
-.if t .if \n(TW>\n(.li .tm Table at line 873 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 861 file Input is too wide - \n(TW units
 .fc  
 .nr #T 0-1
 .nr #a 0-1
@@ -1093,7 +1081,7 @@
 .na
 \f2@deprecatedタグ\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.htmlのドキュメントを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.htmlのドキュメントを参照してください。
 .LP
 .RS 3
 .TP 3
@@ -1615,7 +1603,7 @@
 .nr 40 \n(79+(0*\n(38)
 .nr 80 +\n(40
 .nr TW \n(80
-.if t .if \n(TW>\n(.li .tm Table at line 1364 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1352 file Input is too wide - \n(TW units
 .fc  
 .nr #T 0-1
 .nr #a 0-1
@@ -1961,7 +1949,7 @@
 .nr 42 \n(81+(3*\n(38)
 .nr 82 +\n(42
 .nr TW \n(82
-.if t .if \n(TW>\n(.li .tm Table at line 1440 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 1428 file Input is too wide - \n(TW units
 .fc  
 .nr #T 0-1
 .nr #a 0-1
@@ -2165,15 +2153,15 @@
 .na
 \f2クラスの直列化可能なフィールドおよびデータの文書化\fP @
 .fi
-http://download.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.htmlを参照してください。また、
+http://docs.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.htmlを参照してください。また、
 .na
 \f2直列化のFAQ\fP @
 .fi
-http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missingも参照してください。このFAQには、「\-privateスイッチを指定しないでjavadocを実行しているのにprivateフィールドの@serialタグが見つからないというjavadocの警告が表示される」などの一般的な質問への回答が記載されています。直列化された形式の仕様にクラスを含める場合には、
+http://www.oracle.com/technetwork/java/javase/tech/serializationfaq\-jsp\-136699.html#javadoc_warn_missingも参照してください。このFAQには、「\-privateスイッチを指定しないでjavadocを実行しているのにprivateフィールドの@serialタグが見つからないというjavadocの警告が表示される」などの一般的な質問への回答が記載されています。直列化された形式の仕様にクラスを含める場合には、
 .na
-\f2Sunの基準\fP @
+\f2Oracleの基準\fP @
 .fi
-http://java.sun.com/j2se/javadoc/writingapispecs/serialized\-criteria.htmlも参照してください。 
+http://www.oracle.com/technetwork/java/javase/documentation/serialized\-criteria\-137781.htmlも参照してください。 
 .LP
 .TP 3
 @serialField\  field\-name\  field\-type\  field\-description 
@@ -2258,7 +2246,7 @@
 .na
 \f2定数フィールド値\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/constant\-values.htmlページにも表示されます。 
+http://docs.oracle.com/javase/7/docs/api/constant\-values.htmlページにも表示されます。 
 .LP
 .TP 3
 @version\  version\-text 
@@ -2760,7 +2748,7 @@
 .nr 42 \n(81+(3*\n(38)
 .nr 82 +\n(42
 .nr TW \n(82
-.if t .if \n(TW>\n(.li .tm Table at line 2015 file Input is too wide - \n(TW units
+.if t .if \n(TW>\n(.li .tm Table at line 2003 file Input is too wide - \n(TW units
 .fc  
 .nr #T 0-1
 .nr #a 0-1
@@ -2857,45 +2845,21 @@
 ドキュメントの生成に使用するドックレットを起動するためのクラス・ファイルを指定します。完全修飾名を指定してください。このドックレットにより、出力の内容と形式が定義されます。\f4\-doclet\fPオプションが使用されていない場合、Javadocは、標準ドックレットを使用してデフォルトのHTML形式を生成します。このクラスには\f2start(Root)\fPメソッドが含まれている必要があります。この起動クラスへのパスは\f2\-docletpath\fPオプションによって定義されます。
 .br
 .br
-たとえば、MIFドックレットを呼び出すには、次のように指定します。 
-.nf
-\f3
-.fl
-    \-doclet com.sun.tools.doclets.mif.MIFDoclet
-.fl
-\fP
+詳細は、
+.na
+\f2ドックレットの概要\fP @
 .fi
-特定のドックレットを実行した完全な例については、
-.na
-\f2MIFドックレットのドキュメント\fP @
-.fi
-http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.htmlを参照してください。  
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/doclet/overview.htmlを参照してください。 
 .TP 3
 \-docletpath\  classpathlist 
 \f2\-doclet\fPオプションで指定されたドックレット開始クラス・ファイル、およびそのクラスが依存するすべてのJARファイルへのパスを指定します。開始クラス・ファイルがjarファイル内にある場合、次の例のようにjarファイルのパスが指定されます。絶対パスまたは現在のディレクトリからの相対パスを指定できます。\f2classpathlist\fPに複数のパスやJARファイルが含まれる場合には、それらをSolarisの場合はコロン(:)で、Windowsの場合はセミコロン(;)でそれぞれ区切ります。目的のドックレット開始クラスがすでに検索パス内にある場合は、このオプションは不要です。
 .br
 .br
-jarファイルへのパスの例には、ドックレット開始クラス・ファイルが含まれています。jarファイル名が含まれている点に注目してください。 
-.nf
-\f3
-.fl
-   \-docletpath /home/user/mifdoclet/lib/mifdoclet.jar
-.fl
-\fP
+詳細は、
+.na
+\f2ドックレットの概要\fP @
 .fi
-ドックレット開始クラス・ファイルのパスの例。クラス・ファイル名が省略されている点に注目してください。 
-.nf
-\f3
-.fl
-   \-docletpath /home/user/mifdoclet/classes/com/sun/tools/doclets/mif/
-.fl
-\fP
-.fi
-特定のドックレットを実行した完全な例については、
-.na
-\f2MIFドックレットのドキュメント\fP @
-.fi
-http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.htmlを参照してください。  
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/doclet/overview.htmlを参照してください。 
 .TP 3
 \-1.1 
 \f2この機能はJavadoc 1.4から削除されました。代替機能はありません。このオプションは、Javadoc 1.1によって生成されるのと同じ外見と機能を持つドキュメントを作成するためのものでした(ネストされたクラスはサポートされていません)。このオプションが必要な場合は、Javadoc 1.2または1.3をかわりに使用してください。\fP  
@@ -2953,7 +2917,7 @@
 .na
 \f2クラス・パス\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#generalのドキュメントにある指示に従ってください。
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#generalのドキュメントにある指示に従ってください。
 .br
 .br
 \f2\-sourcepath\fPが省略された場合、Javadocツールはクラス・ファイルを検索するときのみでなく、ソース・ファイルを検索するときにも\f2\-classpath\fPを使用します(下位互換性のため)。したがって、ソース・ファイルとクラス・ファイルを別々のパスから検索する必要がある場合は、\f2\-sourcepath\fPと\f2\-classpath\fPの両方を使用します。
@@ -2973,7 +2937,7 @@
 .na
 \f2クラスの検索方法\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.htmlを参照してください。  
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.htmlを参照してください。  
 .br
 .br
 便宜上、\f2*\fPのベース名を含むクラス・パス要素は、\f2.jar\fPまたは\f2.JAR\fPを拡張子に持つディレクトリ内のすべてのファイルのリストを指定するのと同等とみなされます(Javaプログラムはこの2つの呼出しを区別できません)。
@@ -3012,7 +2976,7 @@
 .na
 \f2クラスの検索方法\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfilesを参照してください。\f2classpathlist\fP内の複数のディレクトリは、コロン(:)で区切ります。  
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfilesを参照してください。\f2classpathlist\fP内の複数のディレクトリは、コロン(:)で区切ります。  
 .TP 3
 \-extdirs\  dirlist 
 拡張機能クラスが存在するディレクトリを指定します。拡張機能クラスとは、Java拡張機能機構を使用するすべてのクラスです。extdirsは、Javadocツールがソース・ファイルとクラス・ファイルを探すときに使用する検索パスの一部です。詳細は、前述の\f2\-classpath\fPを参照してください。\f2dirlist\fP内の複数のディレクトリは、コロン(:)で区切ります。  
@@ -3028,7 +2992,7 @@
 .na
 \f2java.text.BreakIterator\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/text/BreakIterator.htmlの国際化された文境界を使用します(他のすべてのロケールはすでに\f2BreakIterator\fPを使用)。\f2最初の文\fPとは、パッケージ、クラス、またはメンバーの主説明での最初の文のことです。この文は、パッケージ、クラス、またはメンバーの要約にコピーされ、アルファベット順の索引にコピーされます。
+http://docs.oracle.com/javase/7/docs/api/java/text/BreakIterator.htmlの国際化された文境界を使用します(他のすべてのロケールはすでに\f2BreakIterator\fPを使用)。\f2最初の文\fPとは、パッケージ、クラス、またはメンバーの主説明での最初の文のことです。この文は、パッケージ、クラス、またはメンバーの要約にコピーされ、アルファベット順の索引にコピーされます。
 .br
 .br
 JDK 1.2以降、BreakIteratorクラスは、英語を除くすべての言語の文の終わりを判断するために、すでに使用されています。したがって、\f2\-breakiterator\fPオプションは、1.2以降では英文以外には効果がありません。英文には、次のような独自のデフォルトのアルゴリズムがあります。 
@@ -3229,7 +3193,7 @@
 \f2\-link\fPの引数は、宛先ディレクトリ(\f2docs/spi\fP)からの相対パスです。
 .br
 .br
-\f3詳細\fP \- \f2\-link\fPオプションを使用すると、コードからは参照されていても、今回のJavadocの実行ではドキュメント化\f2されない\fPというクラスにリンクできるようになります。リンクから有効なページに移動できるようにするには、それらのHTMLページがある場所を調べ、その場所を\f2extdocURL\fPに指定する必要があります。これにより、たとえば、サード・パーティのドキュメントから\f2http://java.sun.com\fP上の\f2java.*\fPのドキュメントにリンクすることができます。
+\f3詳細\fP \- \f2\-link\fPオプションを使用すると、コードからは参照されていても、今回のJavadocの実行ではドキュメント化\f2されない\fPというクラスにリンクできるようになります。リンクから有効なページに移動できるようにするには、それらのHTMLページがある場所を調べ、その場所を\f2extdocURL\fPに指定する必要があります。これにより、たとえば、サード・パーティのドキュメントから\f2http://docs.oracle.com\fP上の\f2java.*\fPのドキュメントにリンクすることができます。
 .br
 .br
 今回の実行でJavadocによって生成されるドキュメント内のAPIのみを対象にリンクを作成する場合は、\f2\-link\fPオプションを省略します。(\f2\-link\fPオプションが指定されていないと、Javadocツールは、外部参照のドキュメントへのリンクを作成しません。これは、そのドキュメントが存在するかどうか、および存在する場合はその場所がわからないからです。)
@@ -3694,7 +3658,7 @@
 .na
 \f2タグレットの概要\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html 
 .RE
 タグレットは、ブロックタグまたはインライン・タグで便利です。タグレットは任意の数の引数をとることができます。また、テキストを太字にする、箇条書きを作成する、テキストをファイルに書き出す、その他のプロセスを開始するなどのカスタム動作を実装できます。
 .br
@@ -3907,13 +3871,13 @@
 .na
 \f2標準ドックレット\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammaticallyを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammaticallyを参照してください。
 .LP
-\f3ドックレットの実行\fP \- 下の説明は、標準HTMLドックレットを呼び出すためのものです。カスタム・ドックレットを呼び出すには、\-docletおよび\-docletpathオプションを使用します。特定のドックレットを実行した完全な例については、
+\f3ドックレットの実行\fP \- 下の説明は、標準HTMLドックレットを呼び出すためのものです。カスタム・ドックレットを呼び出すには、\-docletおよび\-docletpathオプションを使用します。詳細は、
 .na
-\f2MIFドックレットのドキュメント\fP @
+\f2ドックレットの概要\fP @
 .fi
-http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/doclet/overview.htmlを参照してください。
 .SH "簡単な例"
 .LP
 Javadocは、パッケージ全体に対して実行することも、個々のソース・ファイルに対して実行することもできます。各パッケージ名は、それぞれのパッケージ名に対応するディレクトリ名を持ちます。次の例では、ソース・ファイルは\f2/home/src/java/awt/*.java\fPにあります。生成先ディレクトリは\f2/home/html\fPです。
@@ -4076,7 +4040,7 @@
 .na
 \f2WindowsのMakefileの作成方法\fP @
 .fi
-http://java.sun.com/j2se/javadoc/faq/index.html#makefilesを参照してください。
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137483.html#makefilesを参照してください。
 .nf
 \f3
 .fl
@@ -4161,7 +4125,7 @@
 .na
 \f2JavadocのFAQ\fP @
 .fi
-http://java.sun.com/j2se/javadoc/faq/index.html#Bで参照できます。 
+http://www.oracle.com/technetwork/java/javase/documentation/index\-137483.htmlで参照できます。 
 .TP 2
 o
 \f3バグおよび制限事項\fP \- バグの一部は、バグ修正および変更のインポートでも参照できます。 
@@ -4222,12 +4186,12 @@
 .na
 \f2クラス・パスの設定\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general 
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general 
 .TP 2
 o
 .na
 \f2javacとjavadocがクラスを検索する方法\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles(tools.jar) 
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles(tools.jar) 
 .RE
  
--- a/src/linux/doc/man/ja/javah.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/javah.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javah 1 "21 Mar 2012"
+.TH javah 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
--- a/src/linux/doc/man/ja/javap.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/javap.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javap 1 "21 Mar 2012"
+.TH javap 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -293,7 +293,7 @@
 .na
 \f2Java Virtual Machine Specification\fP @
 .fi
-http://java.sun.com/docs/books/vmspec/にドキュメント化されています。 
+http://docs.oracle.com/javase/specs/にドキュメント化されています。 
 .TP 3
 \-verbose 
 メソッドのスタック・サイズ、および\f2locals\fPと\f2args\fPの数を出力します。 
--- a/src/linux/doc/man/ja/javaws.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/javaws.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javaws 1 "21 Mar 2012"
+.TH javaws 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -208,7 +208,7 @@
 .na
 \f2システム・レベルおよびユーザー・レベルのプロパティ\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.htmlを参照してください。
 .LP
 .SH "詳細情報"
 .LP
@@ -217,6 +217,6 @@
 .na
 \f2Java Web Start\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javaws/index.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/javaws/index.htmlを参照してください。
 .LP
  
--- a/src/linux/doc/man/ja/jcmd.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jcmd.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,10 +19,10 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jcmd 1 "22 Mar 2012"
+.TH jcmd 1 "05 Jul 2012"
 
 .LP
-.SH "Name"
+.SH "名前"
 jcmd \- 診断コマンド
 .LP
 .LP
@@ -56,7 +56,7 @@
 プロセスIDをコマンドラインに指定すると、jcmdでは、このIDのプロセスに診断コマンド・リクエストが送信されます。
 .LP
 .LP
-メイン・クラスをコマンドラインに指定すると、jcmdでは、このメイン・クラスのすべてのJavaプロセスに診断コマンド・リクエストが送信されます。
+メイン・クラスをコマンドラインに指定すると、jcmdでは、コマンドライン引数がJavaプロセスのメイン・クラスの部分文字列であるすべてのJavaプロセスに診断コマンド・リクエストが送信されます。
 .LP
 .LP
 PerfCounter.print引数を指定すると、jcmdでは、ターゲットのJavaプロセスで使用可能なパフォーマンス・カウンタが出力されます。
@@ -73,11 +73,9 @@
 .TP 3
 \-l 
 実行中のJavaプロセスの一覧がプロセスID、メイン・クラスおよびコマンドライン引数とともに出力されます。 
-.br
 .TP 3
 \-h 
 ヘルプ・メッセージが出力されます。 
-.br
 .TP 3
 \-help 
 ヘルプ・メッセージが出力されます。 
@@ -90,19 +88,15 @@
 .TP 3
 pid 
 診断コマンド・リクエストを受信するプロセスを指定します。プロセスはJavaプロセスである必要があります。マシン上で実行しているJavaプロセスの一覧を取得するには、jps(1)またはjcmd(1)を使用します。 
-.br
 .TP 3
 main class 
-診断コマンド・リクエストを受信するプロセスのメイン・クラスです。いくつかの実行中のJavaプロセスがこのメイン・クラスを共有している場合は、それらすべてのプロセスに診断コマンド・リクエストが送信されます。マシン上で実行しているJavaプロセスの一覧を取得するには、jps(1)またはjcmd(1)を使用します。 
-.br
+診断コマンド・リクエストを受信するプロセスのメイン・クラスです。プロセスを照合する際には、指定された文字列がメイン・クラス名に部分文字列として含まれているすべてのプロセスが一致したとみなされます。いくつかの実行中のJavaプロセスがこのメイン・クラスを共有している場合は、それらすべてのプロセスに診断コマンド・リクエストが送信されます。マシン上で実行しているJavaプロセスの一覧を取得するには、jps(1)またはjcmd(1)を使用します。 
 .TP 3
 command [arguments] 
-\f2command\fPという名前の診断コマンドをターゲットのJavaプロセスに対して起動します。指定したプロセスで使用できる診断コマンドのリストは、このプロセスに対して\f3help\fPコマンドを呼び出せば表示されます。各診断コマンドには独自の\f2arguments\fPのセットがあり、\f3help\fPコマンドの後にコマンド名を指定して呼び出せば表示されます。 
-.br
+\f2command\fPという名前の診断コマンドをターゲットのJavaプロセスに対して起動します。指定したプロセスで使用できる診断コマンドのリストは、このプロセスに対して\f3help\fPコマンドを呼び出せば表示されます。各診断コマンドには独自の\f2arguments\fPのセットがあり、コマンド名の後に\f3help\fPを指定して呼び出せば表示されます。 
 .TP 3
-Counter.print 
+PerfCounter.print 
 ターゲットのJavaプロセスで使用可能なパフォーマンス・カウンタが出力されます。パフォーマンス・カウンタのリストはJavaプロセスによって異なる場合があります。 
-.br
 .TP 3
 \-f file 
 \f2file\fPからコマンドを読み取って、ターゲットのJavaプロセスで呼び出します。\f2file\fPでは、各コマンドを1行に記述する必要があります。#で始まる行は無視されます。すべての行が呼び出されるか、\f3stop\fPキーワードを含む行が読み取られると、\f2file\fPの処理が終了します。 
--- a/src/linux/doc/man/ja/jconsole.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jconsole.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jconsole 1 "21 Mar 2012"
+.TH jconsole 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -71,21 +71,21 @@
 .na
 \f2JMXの監視および管理\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.htmlを参照してください。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/management/agent.htmlを参照してください。 
 .TP 2
 o
 \f2host\fP:\f2port\fP: Java VMを実行しているホスト・システムの名前と、Java VMを起動したときにシステム・プロパティ\f2com.sun.management.jmxremote.port\fPで指定したポート番号。詳細は、
 .na
 \f2JMXの監視および管理\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.htmlを参照してください。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/management/agent.htmlを参照してください。 
 .TP 2
 o
 \f2jmxUrl\fP: 
 .na
 \f2JMXServiceURL\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.htmlに記述されている接続先のJMXエージェントのアドレス。 
+http://docs.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.htmlに記述されている接続先のJMXエージェントのアドレス。 
 .RE
 .RE
 
@@ -122,7 +122,7 @@
 .na
 \f2com.sun.tools.jconsole.JConsolePlugin\fP @
 .fi
-http://download.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.htmlクラスを実装するクラスの完全修飾クラス名を指定する行が、プラグインごとに1行ずつ含まれています。 
+http://docs.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.htmlクラスを実装するクラスの完全修飾クラス名を指定する行が、プラグインごとに1行ずつ含まれています。 
 .TP 3
 \-version 
 バージョン情報を出力して終了します。 
@@ -143,13 +143,13 @@
 .na
 \f2JConsoleの使用\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html 
 .TP 2
 o
 .na
 \f2Javaプラットフォームの監視および管理\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/management/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/management/index.html 
 .RE
 
 .LP
--- a/src/linux/doc/man/ja/jdb.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jdb.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jdb 1 "21 Mar 2012"
+.TH jdb 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -58,7 +58,7 @@
 .na
 \f2Java Platform Debugger Architecture\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jpda/index.htmlを視覚的に実行し、ローカルまたはリモートのJava Virtual Machineの検査とデバッグを行うことができます。
+http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/index.htmlを視覚的に実行し、ローカルまたはリモートのJava Virtual Machineの検査とデバッグを行うことができます。
 .LP
 .SS 
 jdbセッションの開始
@@ -122,11 +122,11 @@
 .na
 \f2ドキュメント\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.htmlを参照してください。\f3jdb\fPで使用するためにJ2SE 1.4.2以前のVMを起動する方法については、
+http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.htmlを参照してください。\f3jdb\fPで使用するためにJ2SE 1.4.2以前のVMを起動する方法については、
 .na
 \f21.4.2のドキュメント\fP @
 .fi
-http://java.sun.com/j2se/1.4.2/docs/guide/jpda/conninv.htmlを参照してください。
+http://docs.oracle.com/javase/1.4.2/docs/guide/jpda/conninv.htmlを参照してください。
 .LP
 .SS 
 基本jdbコマンド
@@ -301,7 +301,7 @@
 .na
 \f2ドキュメント\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.htmlを参照してください。
 .LP
 .SS 
 デバッグ対象のプロセスに転送されるオプション
--- a/src/linux/doc/man/ja/jhat.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jhat.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jhat 1 "21 Mar 2012"
+.TH jhat 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -86,16 +86,13 @@
 .na
 \f2HotSpotDiagnosticMXBean\fP @
 .fi
-http://download.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html経由で実行時にヒープ・ダンプを取得する方法 
+http://docs.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html経由で実行時にヒープ・ダンプを取得する方法 
 .TP 2
 o
 \-XX:+HeapDumpOnOutOfMemoryError VMオプションを指定して、OutOfMemoryErrorのスロー時にヒープ・ダンプを生成する方法 
 .TP 2
 o
-.na
-\f2hprof\fP @
-.fi
-http://java.sun.com/developer/technicalArticles/Programming/HPROF.htmlを使用する方法 
+hprofを使用する方法 
 .RE
 
 .LP
@@ -149,10 +146,7 @@
 jconsole(1) 
 .TP 2
 o
-.na
-\f2hprof \- ヒープおよびCPUプロファイリング・ツール\fP @
-.fi
-http://java.sun.com/developer/technicalArticles/Programming/HPROF.html 
+hprof \- ヒープおよびCPUプロファイリング・ツール 
 .RE
 
 .LP
--- a/src/linux/doc/man/ja/jinfo.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jinfo.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jinfo 1 "21 Mar 2012"
+.TH jinfo 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
--- a/src/linux/doc/man/ja/jmap.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jmap.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jmap 1 "21 Mar 2012"
+.TH jmap 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
--- a/src/linux/doc/man/ja/jps.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jps.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jps 1 "21 Mar 2012"
+.TH jps 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
--- a/src/linux/doc/man/ja/jrunscript.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jrunscript.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jrunscript 1 "21 Mar 2012"
+.TH jrunscript 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -137,7 +137,7 @@
 .fl
 jrunscript \-e "print('hello world')"
 .fl
-jrunscript \-e "cat('http://java.sun.com')"
+jrunscript \-e "cat('http://www.example.com')"
 .fl
 \fP
 .fi
@@ -207,6 +207,6 @@
 .na
 \f2jsdocs\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.htmlを参照してください。
 .LP
  
--- a/src/linux/doc/man/ja/jsadebugd.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jsadebugd.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jsadebugd 1 "21 Mar 2012"
+.TH jsadebugd 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -78,7 +78,7 @@
 .na
 \f2rmiregistry\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmiを起動する必要があります。
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#rmiを起動する必要があります。
 .LP
 .nf
 \f3
@@ -118,7 +118,7 @@
 .na
 \f2rmiregistry\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi 
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#rmi 
 .RE
 
 .LP
--- a/src/linux/doc/man/ja/jstack.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jstack.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jstack 1 "21 Mar 2012"
+.TH jstack 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -130,7 +130,7 @@
 .na
 \f2所有できるシンクロナイザ\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.htmlの一覧など、ロックについての追加情報を印刷します。 
+http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.htmlの一覧など、ロックについての追加情報を印刷します。 
 .TP 3
 \-m 
 混合モード(JavaおよびネイティブC/C++フレームの両方)のスタック・トレースを出力します。 
--- a/src/linux/doc/man/ja/jstat.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jstat.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jstat 1 "21 Mar 2012"
+.TH jstat 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
--- a/src/linux/doc/man/ja/jstatd.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jstatd.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jstatd 1 "21 Mar 2012"
+.TH jstatd 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -120,7 +120,7 @@
 .na
 \f2ポリシー・ファイルの構文\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.htmlに準拠する必要があります。
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.htmlに準拠する必要があります。
 .LP
 .LP
 次のポリシー・ファイルでは、セキュリティ例外を発生せずに\f3jstatd\fPサーバーを実行できます。このポリシーは、すべてのコードベースへのあらゆるアクセス権を認めるポリシーよりも自由度が低いですが、\f3jstatd\fPサーバーを実行するために最低限必要なアクセス権のみを認めるポリシーよりも自由度が高くなっています。
@@ -278,7 +278,7 @@
 .na
 \f2rmiregistry\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- Javaリモート・オブジェクト・レジストリ 
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- Javaリモート・オブジェクト・レジストリ 
 .RE
 
 .LP
--- a/src/linux/doc/man/ja/jvisualvm.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/jvisualvm.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jvisualvm 1 "21 Mar 2012"
+.TH jvisualvm 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -116,7 +116,7 @@
 .na
 \f2Java SEプラットフォームでのJava VisualVMのドキュメント\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/visualvm/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/visualvm/index.html 
 .RE
 
 .LP
--- a/src/linux/doc/man/ja/keytool.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/keytool.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH keytool 1 "21 Mar 2012"
+.TH keytool 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -202,7 +202,7 @@
 .na
 \f2Java Cryptography Architecture API Specification & Reference\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppAを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppAを参照してください。
 .LP
 .SS 
 一般オプション
@@ -1009,7 +1009,7 @@
 .na
 \f2JSSEリファレンス・ガイド\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.htmlを参照してください。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.htmlを参照してください。 
 .LP
 \f3注意\fP: このオプションはキーストアとは関係なく使用できます。  
 .TP 3
@@ -1369,7 +1369,7 @@
 .na
 \f2Java暗号化アーキテクチャ用プロバイダの実装方法\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.htmlで説明しているように、クライアントが「プロバイダ」を実装し、KeystoreSpiサブクラスの実装を提供する必要があります。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.htmlで説明しているように、クライアントが「プロバイダ」を実装し、KeystoreSpiサブクラスの実装を提供する必要があります。 
 .LP
 アプリケーションでは、\f2KeyStore\fPクラスが提供するgetInstanceファクトリ・メソッドを使用することで、様々なプロバイダから異なる\f2タイプ\fPのキーストアの実装を選択できます。キーストアのタイプは、キーストア情報の格納形式とデータ形式を定義するとともに、キーストア内の非公開/秘密鍵とキーストア自体の整合性を保護するために使用されるアルゴリズムを定義します。異なるタイプのキーストアの実装には、互換性はありません。 
 .LP
@@ -1826,19 +1826,19 @@
 .na
 \f2\-keyclone\fP @
 .fi
-http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#keycloneCmd 
+http://docs.oracle.com/javase/1.5.0/docs/tooldocs/windows/keytool.html#keycloneCmd 
 .TP 2
 o
 .na
 \f2\-identitydb\fP @
 .fi
-http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#identitydbCmd 
+http://docs.oracle.com/javase/1.5.0/docs/tooldocs/windows/keytool.html#identitydbCmd 
 .TP 2
 o
 .na
 \f2\-selfcert\fP @
 .fi
-http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#selfcertCmd 
+http://docs.oracle.com/javase/1.5.0/docs/tooldocs/windows/keytool.html#selfcertCmd 
 .RE
 
 .LP
--- a/src/linux/doc/man/ja/native2ascii.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/native2ascii.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH native2ascii 1 "21 Mar 2012"
+.TH native2ascii 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -60,7 +60,7 @@
 .na
 \f4サポートされている文字列エンコーディング\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html・ドキュメントに示されている、Java実行環境でサポートされる文字エンコーディングの名前にする必要があります。
+http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html・ドキュメントに示されている、Java実行環境でサポートされる文字エンコーディングの名前にする必要があります。
 .br
 .br
 .TP 3
--- a/src/linux/doc/man/ja/orbd.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/orbd.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH orbd 1 "21 Mar 2012"
+.TH orbd 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -33,7 +33,7 @@
 .na
 \f2ネーム・サービス\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
 .LP
 .SH "形式"
 .LP
@@ -69,7 +69,7 @@
 .na
 \f2ネーム・サービス\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.htmlを参照してください。
 .LP
 .SH "オプション"
 .LP
@@ -133,11 +133,11 @@
 .na
 \f2CORBAオブジェクト\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20objectにネーミングを可能にするCORBAサービスです。ネーミングは名前をオブジェクト参照にバインドすることにより可能になります。
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20objectにネーミングを可能にするCORBAサービスです。ネーミングは名前をオブジェクト参照にバインドすることにより可能になります。
 .na
 \f2ネーム・バインディング\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20bindingをネーム・サービスに格納すれば、クライアントが名前を指定して目的のオブジェクト参照を取得できるようになります。
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20bindingをネーム・サービスに格納すれば、クライアントが名前を指定して目的のオブジェクト参照を取得できるようになります。
 .LP
 .LP
 ORBDは、クライアントまたはサーバーを実行する前に起動します。ORBDには、永続ネーム・サービスおよび一時ネーム・サービスが組み込まれています。これらはどちらもCOSネーム・サービスの実装です。
@@ -216,7 +216,7 @@
 .na
 \f2ネーム・サービス\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.htmlを参照してください。
 .LP
 .SH "サーバー・マネージャ"
 .LP
@@ -231,7 +231,7 @@
 .na
 \f2サンプル・チュートリアル\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.htmlを使用し、チュートリアルの手順に従って、\f2idlj\fPコンパイラと\f2javac\fPコンパイラを実行します。サーバー・マネージャを実行するには、次の手順に従ってアプリケーションを実行します。
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.htmlを使用し、チュートリアルの手順に従って、\f2idlj\fPコンパイラと\f2javac\fPコンパイラを実行します。サーバー・マネージャを実行するには、次の手順に従ってアプリケーションを実行します。
 .LP
 .LP
 \f2orbd\fPを起動します。
@@ -354,7 +354,7 @@
 .na
 \f2ネーム・サービス\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
 .br
 .TP 2
 o
--- a/src/linux/doc/man/ja/pack200.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/pack200.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH pack200 1 "21 Mar 2012"
+.TH pack200 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -332,13 +332,13 @@
 .na
 \f2Java SEのドキュメント\fP @
 .fi
-http://download.oracle.com/javase/7/docs/index.html 
+http://docs.oracle.com/javase/7/docs/index.html 
 .TP 2
 o
 .na
 \f2Javaデプロイメント・ガイド \- Pack200\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html 
 .TP 2
 o
 jar(1) \- Java Archiveツール 
--- a/src/linux/doc/man/ja/policytool.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/policytool.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH policytool 1 "21 Mar 2012"
+.TH policytool 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -76,7 +76,7 @@
 .na
 \f2ポリシー・ファイル作成および管理ツール\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.htmlを参照してください。
 .LP
 .SH "オプション"
 .LP
@@ -92,28 +92,28 @@
 .na
 \f2デフォルトのポリシー実装および構文\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html
 .br
 
 .LP
 .na
 \f2ポリシー・ツール・ユーザーズ・ガイド\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html
 .br
 
 .LP
 .na
 \f2セキュリティ権限\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/permissions.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/permissions.html
 .br
 
 .LP
 .na
 \f2セキュリティの概要\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html
 .br
 
 .LP
--- a/src/linux/doc/man/ja/rmic.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/rmic.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH rmic 1 "21 Mar 2012"
+.TH rmic 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -170,7 +170,7 @@
 .na
 \f2Portable Object Adapter\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html(POA)の\f2PortableServer\fPモジュールは、ネイティブの\f2Servant\fP型を定義します。Javaプログラミング言語では、\f2Servant\fP型はJavaの\f2org.omg.PortableServer.Servant\fPクラスにマップされます。このクラスは、すべてのPOAサーバント実装のベース・クラスとして機能し、アプリケーション・プログラマが呼び出すことのできるいくつかのメソッドの他に、POAそのものによって呼び出され、サーバントの動作を制御するためにユーザーがオーバーライドできるメソッドも提供します。OMG IDL to Java Language Mapping Specification、CORBA V 2.3.1 ptc/00\-01\-08.pdfに準拠しています。 
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/POA.html(POA)の\f2PortableServer\fPモジュールは、ネイティブの\f2Servant\fP型を定義します。Javaプログラミング言語では、\f2Servant\fP型はJavaの\f2org.omg.PortableServer.Servant\fPクラスにマップされます。このクラスは、すべてのPOAサーバント実装のベース・クラスとして機能し、アプリケーション・プログラマが呼び出すことのできるいくつかのメソッドの他に、POAそのものによって呼び出され、サーバントの動作を制御するためにユーザーがオーバーライドできるメソッドも提供します。OMG IDL to Java Language Mapping Specification、CORBA V 2.3.1 ptc/00\-01\-08.pdfに準拠しています。 
 .RE
 .TP 3
 \-J 
@@ -222,6 +222,6 @@
 .na
 \f2CLASSPATH\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
 .LP
  
--- a/src/linux/doc/man/ja/rmid.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/rmid.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH rmid 1 "21 Mar 2012"
+.TH rmid 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -46,11 +46,11 @@
 .na
 \f2Java RMI仕様\fP @
 .fi
-http://download.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.htmlおよび
+http://docs.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.htmlおよび
 .na
 \f2起動のチュートリアル\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.htmlを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.htmlを参照してください。
 .LP
 .LP
 デーモンを起動するには、次のように、セキュリティ・ポリシー・ファイルを指定して\f2rmid\fPコマンドを実行します。
@@ -323,6 +323,6 @@
 .na
 \f2CLASSPATH\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath、java(1)
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath、java(1)
 .LP
  
--- a/src/linux/doc/man/ja/rmiregistry.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/rmiregistry.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH rmiregistry 1 "21 Mar 2012"
+.TH rmiregistry 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -76,8 +76,8 @@
 .na
 \f2java.rmi.registry.LocateRegistry\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.htmlおよび
+http://docs.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.htmlおよび
 .na
 \f2java.rmi.Naming\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html  
+http://docs.oracle.com/javase/7/docs/api/java/rmi/Naming.html  
--- a/src/linux/doc/man/ja/schemagen.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/schemagen.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH schemagen 1 "21 Mar 2012"
+.TH schemagen 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -120,7 +120,7 @@
 .na
 \f2XMLバインドのためのJavaアーキテクチャ(JAXB)\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html 
 .RE
 
 .LP
--- a/src/linux/doc/man/ja/serialver.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/serialver.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH serialver 1 "21 Mar 2012"
+.TH serialver 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -92,6 +92,6 @@
 .na
 \f2java.io.ObjectStreamClass\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
+http://docs.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
 .LP
  
--- a/src/linux/doc/man/ja/servertool.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/servertool.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH servertool 1 "21 Mar 2012"
+.TH servertool 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
--- a/src/linux/doc/man/ja/tnameserv.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/tnameserv.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH tnameserv 1 "21 Mar 2012"
+.TH tnameserv 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -30,7 +30,7 @@
 .na
 \f2ORBDに含まれるJava IDLネーム・サービス\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.htmlに関するトピックを参照してください。
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.htmlに関するトピックを参照してください。
 .LP
 .LP
 ここでは、以下の項目について説明します。
@@ -120,11 +120,11 @@
 .na
 \f2RMI\-IIOPを使用したHello Worldの例\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.htmlに示されています。コマンドライン・オプション\f2\-ORBInitialPort\fP \f2nameserverport#\fPと\f2\-ORBInitialHost\fP \f2nameserverhostname\fPを使用して、クライアントとサーバーに対してネーム・サービスを探す場所を指定することもできます。
+http://docs.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.htmlに示されています。コマンドライン・オプション\f2\-ORBInitialPort\fP \f2nameserverport#\fPと\f2\-ORBInitialHost\fP \f2nameserverhostname\fPを使用して、クライアントとサーバーに対してネーム・サービスを探す場所を指定することもできます。
 .na
 \f2Java IDL: 2台のマシン上で実行するHello Worldプログラム\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.htmlには、コマンドライン・オプションを使用して指定する方法が示されています。
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.htmlには、コマンドライン・オプションを使用して指定する方法が示されています。
 .LP
 .LP
 たとえば、一時ネーム・サービス\f2tnameserv\fPが、ホスト\f2nameserverhost\fPのポート1050上で実行されているとします。さらに、クライアントがホスト\f2clienthost\fP上で実行され、サーバーはホスト\f2serverhost\fP上で実行されているとします。
--- a/src/linux/doc/man/ja/unpack200.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/unpack200.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH unpack200 1 "21 Mar 2012"
+.TH unpack200 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -148,13 +148,13 @@
 .na
 \f2Java SEのドキュメント\fP @
 .fi
-http://download.oracle.com/javase/7/docs/index.html 
+http://docs.oracle.com/javase/7/docs/index.html 
 .TP 2
 o
 .na
 \f2Javaデプロイメント・ガイド \- Pack200\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html 
 .TP 2
 o
 jar(1) \- Java Archiveツール 
--- a/src/linux/doc/man/ja/wsgen.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/wsgen.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH wsgen 1 "21 Mar 2012"
+.TH wsgen 1 "05 Jul 2012"
 .SH "名前"
 wsgen \- XML Web Services(JAX\-WS)2.0のためのJava(tm)API
 .LP
--- a/src/linux/doc/man/ja/wsimport.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/wsimport.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH wsimport 1 "21 Mar 2012"
+.TH wsimport 1 "05 Jul 2012"
 .SH "名前"
 wsimport \- XML Web Services(JAX\-WS)2.0のためのJava(tm)API
 .LP
--- a/src/linux/doc/man/ja/xjc.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/ja/xjc.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH xjc 1 "21 Mar 2012"
+.TH xjc 1 "05 Jul 2012"
 
 .LP
 .SH "名前"
@@ -290,7 +290,7 @@
 .na
 \f2XMLバインドのためのJavaアーキテクチャ(JAXB)\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html 
 .RE
 
 .LP
--- a/src/linux/doc/man/jcmd.1	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/linux/doc/man/jcmd.1	Sun Aug 12 15:29:21 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jcmd 1 "16 Mar 2012"
+.TH jcmd 1 "10 Jul 2012"
 
 .LP
 .SH "Name"
@@ -56,7 +56,7 @@
 When a process id is specified on the command line, jcmd sends the diagnostic command request to the process with this id.
 .LP
 .LP
-When a main class is specified on the command line, jcmd sends the diagnostic command request to all Java processes with this main class.
+When a main class is specified on the command line, jcmd sends the diagnostic command request to all Java processes for which the command line argument is a substring of the Java process' main class.
 .LP
 .LP
 With the PerfCounter.print argument, jcmd prints the performance counters available on the targeted Java process(es).
@@ -73,11 +73,9 @@
 .TP 3
 \-l 
 Prints the list of running Java processes with their process id, their main class and their command line arguments. 
-.br
 .TP 3
 \-h 
 Prints a help message. 
-.br
 .TP 3
 \-help 
 Prints a help message. 
@@ -90,19 +88,15 @@
 .TP 3
 pid 
 Identifies the process that receives the diagnostic command requests. The process must be a Java process. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
-.br
 .TP 3
 main class 
-Main class of the process that receives the diagnostic command requests. If several running Java processes share this main class, the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
-.br
+Main class of the process that receives the diagnostic command requests. When matching processes, any process whose main class name contains the specified string as a substring will be matched. If several running Java processes share this main class, the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
 .TP 3
 command [arguments] 
-Invoke the diagnostic command called \f2command\fP on the targeted Java process(es). The list of available diagnostic commands for a given process can be obtained by invoking the \f3help\fP command on this process. Each diagnostic command has its own set of \f2arguments\fP, which can be obtained by invoking the \f3help\fP command followed by the command name. 
-.br
+Invoke the diagnostic command called \f2command\fP on the targeted Java process(es). The list of available diagnostic commands for a given process can be obtained by invoking the \f3help\fP command on this process. Each diagnostic command has its own set of \f2arguments\fP, which can be obtained by invoking the the command name followed by \f3help\fP. 
 .TP 3
-Counter.print 
+PerfCounter.print 
 Print the performance counters available on the targeted Java process(es). The list of performance counters may vary with the Java process. 
-.br
 .TP 3
 \-f file 
 Read commands from \f2file\fP and invoke them on the targeted Java process(es). In \f2file\fP, each command must be written on a single line. Lines starting with # are ignored. Processing of \f2file\fP ends when all lines have been invoked or when a line containing the \f3stop\fP keyword is read. 
--- a/src/macosx/bin/java_md_macosx.c	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/macosx/bin/java_md_macosx.c	Sun Aug 12 15:29:21 2012 -0700
@@ -906,11 +906,41 @@
 {
     char envVar[80];
     if (strstr(arg, "-Xdock:name=") == arg) {
+        /*
+         * The APP_NAME_<pid> environment variable is used to pass
+         * an application name as specified with the -Xdock:name command
+         * line option from Java launcher code to the AWT code in order
+         * to assign this name to the app's dock tile on the Mac.
+         * The _<pid> part is added to avoid collisions with child processes.
+         *
+         * WARNING: This environment variable is an implementation detail and
+         * isn't meant for use outside of the core platform. The mechanism for
+         * passing this information from Java launcher to other modules may
+         * change drastically between update release, and it may even be
+         * removed or replaced with another mechanism.
+         *
+         * NOTE: It is used by SWT, and JavaFX.
+         */
         snprintf(envVar, sizeof(envVar), "APP_NAME_%d", getpid());
         setenv(envVar, (arg + 12), 1);
     }
 
     if (strstr(arg, "-Xdock:icon=") == arg) {
+        /*
+         * The APP_ICON_<pid> environment variable is used to pass
+         * an application icon as specified with the -Xdock:icon command
+         * line option from Java launcher code to the AWT code in order
+         * to assign this icon to the app's dock tile on the Mac.
+         * The _<pid> part is added to avoid collisions with child processes.
+         *
+         * WARNING: This environment variable is an implementation detail and
+         * isn't meant for use outside of the core platform. The mechanism for
+         * passing this information from Java launcher to other modules may
+         * change drastically between update release, and it may even be
+         * removed or replaced with another mechanism.
+         *
+         * NOTE: It is used by SWT, and JavaFX.
+         */
         snprintf(envVar, sizeof(envVar), "APP_ICON_%d", getpid());
         setenv(envVar, (arg + 12), 1);
     }
@@ -931,6 +961,22 @@
     NULL_CHECK(mainClassName = (*env)->GetStringUTFChars(env, mainClassString, NULL));
 
     char envVar[80];
+    /*
+     * The JAVA_MAIN_CLASS_<pid> environment variable is used to pass
+     * the name of a Java class whose main() method is invoked by
+     * the Java launcher code to start the application, to the AWT code
+     * in order to assign the name to the Apple menu bar when the app
+     * is active on the Mac.
+     * The _<pid> part is added to avoid collisions with child processes.
+     *
+     * WARNING: This environment variable is an implementation detail and
+     * isn't meant for use outside of the core platform. The mechanism for
+     * passing this information from Java launcher to other modules may
+     * change drastically between update release, and it may even be
+     * removed or replaced with another mechanism.
+     *
+     * NOTE: It is used by SWT, and JavaFX.
+     */
     snprintf(envVar, sizeof(envVar), "JAVA_MAIN_CLASS_%d", getpid());
     setenv(envVar, mainClassName, 1);
 
--- a/src/macosx/classes/apple/applescript/AppleScriptEngine.java	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/macosx/classes/apple/applescript/AppleScriptEngine.java	Sun Aug 12 15:29:21 2012 -0700
@@ -26,6 +26,7 @@
 package apple.applescript;
 
 import java.io.*;
+import java.nio.file.Files;
 import java.util.*;
 import java.util.Map.Entry;
 
@@ -297,7 +298,7 @@
         File tmpfile;
         FileWriter tmpwrite;
         try {
-            tmpfile = File.createTempFile("AppleScriptEngine.", ".scpt");
+            tmpfile = Files.createTempFile("AppleScriptEngine.", ".scpt").toFile();
             tmpwrite = new FileWriter(tmpfile);
 
             // read in our input and write directly to tmpfile
--- a/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java	Sun Aug 12 15:29:21 2012 -0700
@@ -244,6 +244,7 @@
      */
     private void initResourceBundle(final UIDefaults table) {
         table.setDefaultLocale(Locale.getDefault());
+        table.addResourceBundle(PKG_PREFIX + "resources.aqua");
         try {
             final ResourceBundle aquaProperties = MacOSXResourceBundle.getMacResourceBundle(PKG_PREFIX + "resources.aqua");
             final Enumeration<String> propertyKeys = aquaProperties.getKeys();
@@ -253,7 +254,6 @@
                 table.put(key, aquaProperties.getString(key));
             }
         } catch (final Exception e) {
-            table.addResourceBundle(PKG_PREFIX + "resources.aqua");
         }
     }
 
--- a/src/macosx/classes/com/apple/laf/resources/aqua.properties	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/macosx/classes/com/apple/laf/resources/aqua.properties	Sun Aug 12 15:29:21 2012 -0700
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Generic File
-FileChooser.directoryDescriptionText=Directory
-FileChooser.newFolderErrorText=Error occured during folder creation
+FileChooser.fileDescription.textAndMnemonic=Generic File
+FileChooser.directoryDescription.textAndMnemonic=Directory
+FileChooser.newFolderError.textAndMnemonic=Error occured during folder creation
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=All Files
-FileChooser.cancelButtonText=Cancel
-FileChooser.saveButtonText=Save
-FileChooser.openButtonText=Open
-FileChooser.saveDialogTitleText=Save
-FileChooser.openDialogTitleText=Open
-FileChooser.updateButtonText=Update
-FileChooser.helpButtonText=Help
-FileChooser.directoryOpenButtonText=Open
+FileChooser.acceptAllFileFilter.textAndMnemonic=All Files
+FileChooser.cancelButton.textAndMnemonic=Cancel
+FileChooser.saveButton.textAndMnemonic=Save
+FileChooser.openButton.textAndMnemonic=Open
+FileChooser.saveDialogTitle.textAndMnemonic=Save
+FileChooser.openDialogTitle.textAndMnemonic=Open
+FileChooser.updateButton.textAndMnemonic=Update
+FileChooser.helpButton.textAndMnemonic=Help
+FileChooser.directoryOpenButton.textAndMnemonic=Open
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Save
-FileChooser.openTitleText=Open
-FileChooser.newFolderExistsErrorText=That name is already taken
-FileChooser.chooseButtonText=Choose
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Save
+FileChooser.openTitle.textAndMnemonic=Open
+FileChooser.newFolderExistsError.textAndMnemonic=That name is already taken
+FileChooser.chooseButton.textAndMnemonic=Choose
 
-FileChooser.newFolderButtonText=New Folder
-FileChooser.newFolderTitleText=New Folder
-FileChooser.fileNameLabelText=File:
-FileChooser.saveDialogFileNameLabelText=Save As:
-FileChooser.filesOfTypeLabelText=File Format:
+FileChooser.newFolderButton.textAndMnemonic=New Folder
+FileChooser.newFolderTitle.textAndMnemonic=New Folder
+FileChooser.fileNameLabel.textAndMnemonic=File:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Save As:
+FileChooser.filesOfTypeLabel.textAndMnemonic=File Format:
 
 FileChooser.desktopName=Desktop
-FileChooser.newFolderPromptText=Name of new folder:
+FileChooser.newFolderPrompt.textAndMnemonic=Name of new folder:
 FileChooser.untitledFolderName=untitled folder
 FileChooser.untitledFileName=untitled
-FileChooser.createButtonText=Create
+FileChooser.createButton.textAndMnemonic=Create
 
-FileChooser.byDateText=Date Modified
-FileChooser.byNameText=Name
+FileChooser.byDate.textAndMnemonic=Date Modified
+FileChooser.by.textAndMnemonic=Name
 FileChooser.newFolderAccessibleName=New Folder
 
 FileChooser.mac.newFolder=untitled folder
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Preview
-ColorChooser.okText=OK
-ColorChooser.cancelText=Cancel
-ColorChooser.resetText=Reset
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=Sample Text  Sample Text
-ColorChooser.swatchesNameText=Swatches
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Recent:
-ColorChooser.hsbNameText=HSB
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=Red
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=Green
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=Blue
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=Preview
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Cancel
+ColorChooser.reset.textAndMnemonic=&Reset
+ColorChooser.sample.textAndMnemonic=Sample Text  Sample Text
+ColorChooser.swatches.textAndMnemonic=&Swatches
+ColorChooser.swatchesRecent.textAndMnemonic=Recent:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Re&d
+ColorChooser.rgbGreen.textAndMnemonic=Gree&n
+ColorChooser.rgbBlue.textAndMnemonic=&Blue
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=Yes
-OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=No
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Cancel
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=Select an Option
+OptionPane.yesButton.textAndMnemonic=&Yes
+OptionPane.noButton.textAndMnemonic=&No
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Cancel
+OptionPane.title.textAndMnemonic=Select an Option
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Input
+OptionPane.inputDialog.titleAndMnemonic=Input
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Message
+OptionPane.messageDialog.titleAndMnemonic=Message
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Printing
-PrintingDialog.titleAbortingText=Printing (Aborting)
+PrintingDialog.titleProgress.textAndMnemonic=Printing
+PrintingDialog.titleAborting.textAndMnemonic=Printing (Aborting)
 
-PrintingDialog.contentInitialText=Printing in progress...
+PrintingDialog.contentInitial.textAndMnemonic=Printing in progress...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Printed page {0}...
+PrintingDialog.contentProgress.textAndMnemonic=Printed page {0}...
 
-PrintingDialog.contentAbortingText=Printing aborting...
+PrintingDialog.contentAborting.textAndMnemonic=Printing aborting...
 
-PrintingDialog.abortButtonText=Abort
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Abort Printing
+PrintingDialog.abortButton.textAndMnemonic=&Abort
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abort Printing
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimize
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=Close
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Restore
-InternalFrameTitlePane.moveButtonText=Move
-InternalFrameTitlePane.sizeButtonText=Size
-InternalFrameTitlePane.minimizeButtonText=Minimize
-InternalFrameTitlePane.maximizeButtonText=Maximize
-InternalFrameTitlePane.closeButtonText=Close
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restore
+InternalFrameTitlePane.moveButton.textAndMnemonic=Move
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Size
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimize
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximize
+InternalFrameTitlePane.closeButton.textAndMnemonic=Close
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Submit Query
-FormView.resetButtonText=Reset
-FormView.browseFileButtonText=Browse...
+FormView.submitButton.textAndMnemonic=Submit Query
+FormView.resetButton.textAndMnemonic=Reset
+FormView.browseFileButton.textAndMnemonic=Browse...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=style change
-AbstractDocument.additionText=addition
-AbstractDocument.deletionText=deletion
-AbstractDocument.undoText=Undo
-AbstractDocument.redoText=Redo
+AbstractDocument.styleChange.textAndMnemonic=style change
+AbstractDocument.addition.textAndMnemonic=addition
+AbstractDocument.deletion.textAndMnemonic=deletion
+AbstractDocument.undo.textAndMnemonic=Undo
+AbstractDocument.redo.textAndMnemonic=Redo
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=click
+AbstractButton.click.textAndMnemonic=click
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Undo
-AbstractUndoableEdit.redoText=Redo
+AbstractUndoableEdit.undo.textAndMnemonic=Undo
+AbstractUndoableEdit.redo.textAndMnemonic=Redo
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Progress...
+ProgressMonitor.progress.textAndMnemonic=Progress...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=left button
-SplitPane.rightButtonText=right button
+SplitPane.leftButton.textAndMnemonic=left button
+SplitPane.rightButton.textAndMnemonic=right button
 # Used for Isindex
 IsindexView.prompt=This is a searchable index.  Enter search keywords:
 
--- a/src/macosx/classes/com/apple/laf/resources/aqua_de.properties	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/macosx/classes/com/apple/laf/resources/aqua_de.properties	Sun Aug 12 15:29:21 2012 -0700
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Allgemeine Datei
-FileChooser.directoryDescriptionText=Verzeichnis
-FileChooser.newFolderErrorText=Bei der Erstellung des Ordners ist ein Fehler aufgetreten
+FileChooser.fileDescription.textAndMnemonic=Allgemeine Datei
+FileChooser.directoryDescription.textAndMnemonic=Verzeichnis
+FileChooser.newFolderError.textAndMnemonic=Bei der Erstellung des Ordners ist ein Fehler aufgetreten
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=Alle Dateien
-FileChooser.cancelButtonText=Abbrechen
-FileChooser.saveButtonText=Speichern
-FileChooser.openButtonText=\u00D6ffnen
-FileChooser.saveDialogTitleText=Speichern
-FileChooser.openDialogTitleText=\u00D6ffnen
-FileChooser.updateButtonText=Updaten
-FileChooser.helpButtonText=Hilfe
-FileChooser.directoryOpenButtonText=\u00D6ffnen
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien
+FileChooser.cancelButton.textAndMnemonic=Abbrechen
+FileChooser.saveButton.textAndMnemonic=Speichern
+FileChooser.openButton.textAndMnemonic=\u00D6ffnen
+FileChooser.saveDialogTitle.textAndMnemonic=Speichern
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.updateButton.textAndMnemonic=Updaten
+FileChooser.helpButton.textAndMnemonic=Hilfe
+FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ffnen
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Speichern
-FileChooser.openTitleText=\u00D6ffnen
-FileChooser.newFolderExistsErrorText=Dieser Name ist bereits vergeben
-FileChooser.chooseButtonText=W\u00E4hlen
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Speichern
+FileChooser.openTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.newFolderExistsError.textAndMnemonic=Dieser Name ist bereits vergeben
+FileChooser.chooseButton.textAndMnemonic=W\u00E4hlen
 
-FileChooser.newFolderButtonText=Neuer Ordner
-FileChooser.newFolderTitleText=Neuer Ordner
-FileChooser.fileNameLabelText=Datei:
-FileChooser.saveDialogFileNameLabelText=Speichern unter:
-FileChooser.filesOfTypeLabelText=Dateiformat:
+FileChooser.newFolderButton.textAndMnemonic=Neuer Ordner
+FileChooser.newFolderTitle.textAndMnemonic=Neuer Ordner
+FileChooser.fileNameLabel.textAndMnemonic=Datei:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Speichern unter:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Dateiformat:
 
 FileChooser.desktopName=Desktop
-FileChooser.newFolderPromptText=Name des neuen Ordners:
+FileChooser.newFolderPrompt.textAndMnemonic=Name des neuen Ordners:
 FileChooser.untitledFolderName=unbenannter Ordner
 FileChooser.untitledFileName=unbenannt
-FileChooser.createButtonText=Erstellen
+FileChooser.createButton.textAndMnemonic=Erstellen
 
-FileChooser.byDateText=\u00C4nderungsdatum
-FileChooser.byNameText=Name
+FileChooser.byDate.textAndMnemonic=\u00C4nderungsdatum
+FileChooser.by.textAndMnemonic=Name
 FileChooser.newFolderAccessibleName=Neuer Ordner
 
 FileChooser.mac.newFolder=unbenannter Ordner
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Vorschau
-ColorChooser.okText=OK
-ColorChooser.cancelText=Abbrechen
-ColorChooser.resetText=Zur\u00FCcksetzen
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=90
-ColorChooser.sampleText=Beispieltext  Beispieltext
-ColorChooser.swatchesNameText=Muster
-ColorChooser.swatchesMnemonic=77
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Aktuell:
-ColorChooser.hsbNameText=HSB
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=Rot
-ColorChooser.rgbRedMnemonic=84
-ColorChooser.rgbGreenText=Gr\u00FCn
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=Blau
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=Vorschau
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Abbrechen
+ColorChooser.reset.textAndMnemonic=&Zur\u00FCcksetzen
+ColorChooser.sample.textAndMnemonic=Beispieltext  Beispieltext
+ColorChooser.swatches.textAndMnemonic=&Muster
+ColorChooser.swatchesRecent.textAndMnemonic=Aktuell:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Ro&t
+ColorChooser.rgbGreen.textAndMnemonic=Gr\u00FC&n
+ColorChooser.rgbBlue.textAndMnemonic=&Blau
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=Ja
-OptionPane.yesButtonMnemonic=74
-OptionPane.noButtonText=Nein
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Abbrechen
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=Option ausw\u00E4hlen
+OptionPane.yesButton.textAndMnemonic=&Ja
+OptionPane.noButton.textAndMnemonic=&Nein
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Abbrechen
+OptionPane.title.textAndMnemonic=Option ausw\u00E4hlen
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Eingabe
+OptionPane.inputDialog.titleAndMnemonic=Eingabe
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Meldung
+OptionPane.messageDialog.titleAndMnemonic=Meldung
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Drucken
-PrintingDialog.titleAbortingText=Drucken (wird abgebrochen)
+PrintingDialog.titleProgress.textAndMnemonic=Drucken
+PrintingDialog.titleAborting.textAndMnemonic=Drucken (wird abgebrochen)
 
-PrintingDialog.contentInitialText=Druckvorgang l\u00E4uft...
+PrintingDialog.contentInitial.textAndMnemonic=Druckvorgang l\u00E4uft...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Seite {0} wurde gedruckt ...
+PrintingDialog.contentProgress.textAndMnemonic=Seite {0} wurde gedruckt ...
 
-PrintingDialog.contentAbortingText=Druckvorgang wird abgebrochen ...
+PrintingDialog.contentAborting.textAndMnemonic=Druckvorgang wird abgebrochen ...
 
-PrintingDialog.abortButtonText=Abbruch
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Druckvorgang abbrechen
+PrintingDialog.abortButton.textAndMnemonic=&Abbruch
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Druckvorgang abbrechen
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimieren
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=Schlie\u00DFen
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Wiederherstellen
-InternalFrameTitlePane.moveButtonText=Verschieben
-InternalFrameTitlePane.sizeButtonText=Gr\u00F6\u00DFe
-InternalFrameTitlePane.minimizeButtonText=Minimieren
-InternalFrameTitlePane.maximizeButtonText=Maximieren
-InternalFrameTitlePane.closeButtonText=Schlie\u00DFen
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Wiederherstellen
+InternalFrameTitlePane.moveButton.textAndMnemonic=Verschieben
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Gr\u00F6\u00DFe
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimieren
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximieren
+InternalFrameTitlePane.closeButton.textAndMnemonic=Schlie\u00DFen
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Abfrage weiterleiten
-FormView.resetButtonText=Zur\u00FCcksetzen
-FormView.browseFileButtonText=Durchsuchen ...
+FormView.submitButton.textAndMnemonic=Abfrage weiterleiten
+FormView.resetButton.textAndMnemonic=Zur\u00FCcksetzen
+FormView.browseFileButton.textAndMnemonic=Durchsuchen ...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=Formatvorlagen\u00E4nderung
-AbstractDocument.additionText=Hinzuf\u00FCgen
-AbstractDocument.deletionText=L\u00F6schen
-AbstractDocument.undoText=R\u00FCckg\u00E4ngig
-AbstractDocument.redoText=Wiederherstellen
+AbstractDocument.styleChange.textAndMnemonic=Formatvorlagen\u00E4nderung
+AbstractDocument.addition.textAndMnemonic=Hinzuf\u00FCgen
+AbstractDocument.deletion.textAndMnemonic=L\u00F6schen
+AbstractDocument.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractDocument.redo.textAndMnemonic=Wiederherstellen
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=Klicken
+AbstractButton.click.textAndMnemonic=Klicken
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=R\u00FCckg\u00E4ngig
-AbstractUndoableEdit.redoText=Wiederherstellen
+AbstractUndoableEdit.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractUndoableEdit.redo.textAndMnemonic=Wiederherstellen
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Fortschritt ...
+ProgressMonitor.progress.textAndMnemonic=Fortschritt ...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=linke Schaltfl\u00E4che
-SplitPane.rightButtonText=rechte Schaltfl\u00E4che
+SplitPane.leftButton.textAndMnemonic=linke Schaltfl\u00E4che
+SplitPane.rightButton.textAndMnemonic=rechte Schaltfl\u00E4che
 # Used for Isindex
 IsindexView.prompt=Dieser Index kann durchsucht werden. Geben Sie Schl\u00FCsselw\u00F6rter f\u00FCr die Suche ein:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Als Symbol darstellen
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximieren
 InternalFrameTitlePane.closeButtonAccessibleName=Schlie\u00DFen
-
--- a/src/macosx/classes/com/apple/laf/resources/aqua_es.properties	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/macosx/classes/com/apple/laf/resources/aqua_es.properties	Sun Aug 12 15:29:21 2012 -0700
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Archivo Gen\u00E9rico
-FileChooser.directoryDescriptionText=Directorio
-FileChooser.newFolderErrorText=Se ha producido un error durante la creaci\u00F3n de carpetas
+FileChooser.fileDescription.textAndMnemonic=Archivo Gen\u00E9rico
+FileChooser.directoryDescription.textAndMnemonic=Directorio
+FileChooser.newFolderError.textAndMnemonic=Se ha producido un error durante la creaci\u00F3n de carpetas
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=Todos los Archivos
-FileChooser.cancelButtonText=Cancelar
-FileChooser.saveButtonText=Guardar
-FileChooser.openButtonText=Abrir
-FileChooser.saveDialogTitleText=Guardar
-FileChooser.openDialogTitleText=Abrir
-FileChooser.updateButtonText=Actualizar
-FileChooser.helpButtonText=Ayuda
-FileChooser.directoryOpenButtonText=Abrir
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos
+FileChooser.cancelButton.textAndMnemonic=Cancelar
+FileChooser.saveButton.textAndMnemonic=Guardar
+FileChooser.openButton.textAndMnemonic=Abrir
+FileChooser.saveDialogTitle.textAndMnemonic=Guardar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.updateButton.textAndMnemonic=Actualizar
+FileChooser.helpButton.textAndMnemonic=Ayuda
+FileChooser.directoryOpenButton.textAndMnemonic=Abrir
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Guardar
-FileChooser.openTitleText=Abrir
-FileChooser.newFolderExistsErrorText=Ya existe ese nombre
-FileChooser.chooseButtonText=Seleccionar
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Guardar
+FileChooser.openTitle.textAndMnemonic=Abrir
+FileChooser.newFolderExistsError.textAndMnemonic=Ya existe ese nombre
+FileChooser.chooseButton.textAndMnemonic=Seleccionar
 
-FileChooser.newFolderButtonText=Nueva Carpeta
-FileChooser.newFolderTitleText=Nueva Carpeta
-FileChooser.fileNameLabelText=Archivo:
-FileChooser.saveDialogFileNameLabelText=Guardar como:
-FileChooser.filesOfTypeLabelText=Formato de Archivo:
+FileChooser.newFolderButton.textAndMnemonic=Nueva Carpeta
+FileChooser.newFolderTitle.textAndMnemonic=Nueva Carpeta
+FileChooser.fileNameLabel.textAndMnemonic=Archivo:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Guardar como:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Formato de Archivo:
 
 FileChooser.desktopName=Escritorio
-FileChooser.newFolderPromptText=Nombre de la Nueva Carpeta:
+FileChooser.newFolderPrompt.textAndMnemonic=Nombre de la Nueva Carpeta:
 FileChooser.untitledFolderName=carpeta sin t\u00EDtulo
 FileChooser.untitledFileName=sin t\u00EDtulo
-FileChooser.createButtonText=Crear
+FileChooser.createButton.textAndMnemonic=Crear
 
-FileChooser.byDateText=Fecha de Modificaci\u00F3n
-FileChooser.byNameText=Nombre
+FileChooser.byDate.textAndMnemonic=Fecha de Modificaci\u00F3n
+FileChooser.by.textAndMnemonic=Nombre
 FileChooser.newFolderAccessibleName=Nueva Carpeta
 
 FileChooser.mac.newFolder=carpeta sin t\u00EDtulo
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Vista Previa
-ColorChooser.okText=Aceptar
-ColorChooser.cancelText=Cancelar
-ColorChooser.resetText=Restablecer
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=Texto de Ejemplo  Texto de Ejemplo
-ColorChooser.swatchesNameText=Muestras
-ColorChooser.swatchesMnemonic=85
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Reciente:
-ColorChooser.hsbNameText=HSB
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=Rojo
-ColorChooser.rgbRedMnemonic=74
-ColorChooser.rgbGreenText=Verde
-ColorChooser.rgbGreenMnemonic=86
-ColorChooser.rgbBlueText=Azul
-ColorChooser.rgbBlueMnemonic=90
+ColorChooser.preview.textAndMnemonic=Vista Previa
+ColorChooser.ok.textAndMnemonic=Aceptar
+ColorChooser.cancel.textAndMnemonic=Cancelar
+ColorChooser.reset.textAndMnemonic=&Restablecer
+ColorChooser.sample.textAndMnemonic=Texto de Ejemplo  Texto de Ejemplo
+ColorChooser.swatches.textAndMnemonic=M&uestras
+ColorChooser.swatchesRecent.textAndMnemonic=Reciente:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Ro&jo
+ColorChooser.rgbGreen.textAndMnemonic=&Verde
+ColorChooser.rgbBlue.textAndMnemonic=A&zul
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=S\u00ED
-OptionPane.yesButtonMnemonic=83
-OptionPane.noButtonText=No
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Cancelar
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=Seleccionar una Opci\u00F3n
+OptionPane.yesButton.textAndMnemonic=&S\u00ED
+OptionPane.noButton.textAndMnemonic=&No
+OptionPane.okButton.textAndMnemonic=Aceptar
+OptionPane.cancelButton.textAndMnemonic=Cancelar
+OptionPane.title.textAndMnemonic=Seleccionar una Opci\u00F3n
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Entrada
+OptionPane.inputDialog.titleAndMnemonic=Entrada
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Mensaje
+OptionPane.messageDialog.titleAndMnemonic=Mensaje
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Impresi\u00F3n
-PrintingDialog.titleAbortingText=Impresi\u00F3n (Abortando)
+PrintingDialog.titleProgress.textAndMnemonic=Impresi\u00F3n
+PrintingDialog.titleAborting.textAndMnemonic=Impresi\u00F3n (Abortando)
 
-PrintingDialog.contentInitialText=Impresi\u00F3n en curso...
+PrintingDialog.contentInitial.textAndMnemonic=Impresi\u00F3n en curso...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=P\u00E1gina {0} impresa...
+PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina {0} impresa...
 
-PrintingDialog.contentAbortingText=Abortando la impresi\u00F3n...
+PrintingDialog.contentAborting.textAndMnemonic=Abortando la impresi\u00F3n...
 
-PrintingDialog.abortButtonText=Abortar
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Abortar Impresi\u00F3n
+PrintingDialog.abortButton.textAndMnemonic=&Abortar
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impresi\u00F3n
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimizar
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=Cerrar
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Restaurar
-InternalFrameTitlePane.moveButtonText=Mover
-InternalFrameTitlePane.sizeButtonText=Tama\u00F1o
-InternalFrameTitlePane.minimizeButtonText=Minimizar
-InternalFrameTitlePane.maximizeButtonText=Maximizar
-InternalFrameTitlePane.closeButtonText=Cerrar
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
+InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Tama\u00F1o
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
+InternalFrameTitlePane.closeButton.textAndMnemonic=Cerrar
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Enviar Consulta
-FormView.resetButtonText=Restablecer
-FormView.browseFileButtonText=Examinar...
+FormView.submitButton.textAndMnemonic=Enviar Consulta
+FormView.resetButton.textAndMnemonic=Restablecer
+FormView.browseFileButton.textAndMnemonic=Examinar...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=cambio de estilo
-AbstractDocument.additionText=adici\u00F3n
-AbstractDocument.deletionText=supresi\u00F3n
-AbstractDocument.undoText=Deshacer
-AbstractDocument.redoText=Rehacer
+AbstractDocument.styleChange.textAndMnemonic=cambio de estilo
+AbstractDocument.addition.textAndMnemonic=adici\u00F3n
+AbstractDocument.deletion.textAndMnemonic=supresi\u00F3n
+AbstractDocument.undo.textAndMnemonic=Deshacer
+AbstractDocument.redo.textAndMnemonic=Rehacer
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=hacer clic
+AbstractButton.click.textAndMnemonic=hacer clic
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Deshacer
-AbstractUndoableEdit.redoText=Rehacer
+AbstractUndoableEdit.undo.textAndMnemonic=Deshacer
+AbstractUndoableEdit.redo.textAndMnemonic=Rehacer
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Progreso...
+ProgressMonitor.progress.textAndMnemonic=Progreso...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=bot\u00F3n: izquierda
-SplitPane.rightButtonText=bot\u00F3n: derecha
+SplitPane.leftButton.textAndMnemonic=bot\u00F3n: izquierda
+SplitPane.rightButton.textAndMnemonic=bot\u00F3n: derecha
 # Used for Isindex
 IsindexView.prompt=En este \u00EDndice se pueden efectuar b\u00FAsquedas. Escriba las palabras clave de b\u00FAsqueda:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Convertir en Icono
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
 InternalFrameTitlePane.closeButtonAccessibleName=Cerrar
-
--- a/src/macosx/classes/com/apple/laf/resources/aqua_fr.properties	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/macosx/classes/com/apple/laf/resources/aqua_fr.properties	Sun Aug 12 15:29:21 2012 -0700
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Fichier g\u00E9n\u00E9rique
-FileChooser.directoryDescriptionText=R\u00E9pertoire
-FileChooser.newFolderErrorText=Erreur lors de la cr\u00E9ation du dossier
+FileChooser.fileDescription.textAndMnemonic=Fichier g\u00E9n\u00E9rique
+FileChooser.directoryDescription.textAndMnemonic=R\u00E9pertoire
+FileChooser.newFolderError.textAndMnemonic=Erreur lors de la cr\u00E9ation du dossier
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=Tous les fichiers
-FileChooser.cancelButtonText=Annuler
-FileChooser.saveButtonText=Enregistrer
-FileChooser.openButtonText=Ouvrir
-FileChooser.saveDialogTitleText=Enregistrer
-FileChooser.openDialogTitleText=Ouvrir
-FileChooser.updateButtonText=Mettre \u00E0 jour
-FileChooser.helpButtonText=Aide
-FileChooser.directoryOpenButtonText=Ouvrir
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
+FileChooser.cancelButton.textAndMnemonic=Annuler
+FileChooser.saveButton.textAndMnemonic=Enregistrer
+FileChooser.openButton.textAndMnemonic=Ouvrir
+FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
+FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
+FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jour
+FileChooser.helpButton.textAndMnemonic=Aide
+FileChooser.directoryOpenButton.textAndMnemonic=Ouvrir
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Enregistrer
-FileChooser.openTitleText=Ouvrir
-FileChooser.newFolderExistsErrorText=Ce nom est d\u00E9j\u00E0 utilis\u00E9
-FileChooser.chooseButtonText=Choisir
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Enregistrer
+FileChooser.openTitle.textAndMnemonic=Ouvrir
+FileChooser.newFolderExistsError.textAndMnemonic=Ce nom est d\u00E9j\u00E0 utilis\u00E9
+FileChooser.chooseButton.textAndMnemonic=Choisir
 
-FileChooser.newFolderButtonText=Nouveau dossier
-FileChooser.newFolderTitleText=Nouveau dossier
-FileChooser.fileNameLabelText=Fichier :
-FileChooser.saveDialogFileNameLabelText=Enregistrer sous :
-FileChooser.filesOfTypeLabelText=Format de fichier :
+FileChooser.newFolderButton.textAndMnemonic=Nouveau dossier
+FileChooser.newFolderTitle.textAndMnemonic=Nouveau dossier
+FileChooser.fileNameLabel.textAndMnemonic=Fichier :
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Enregistrer sous :
+FileChooser.filesOfTypeLabel.textAndMnemonic=Format de fichier :
 
 FileChooser.desktopName=Bureau
-FileChooser.newFolderPromptText=Nom du nouveau dossier :
+FileChooser.newFolderPrompt.textAndMnemonic=Nom du nouveau dossier :
 FileChooser.untitledFolderName=dossier sans titre
 FileChooser.untitledFileName=sans titre
-FileChooser.createButtonText=Cr\u00E9er
+FileChooser.createButton.textAndMnemonic=Cr\u00E9er
 
-FileChooser.byDateText=Date de modification
-FileChooser.byNameText=Nom
+FileChooser.byDate.textAndMnemonic=Date de modification
+FileChooser.by.textAndMnemonic=Nom
 FileChooser.newFolderAccessibleName=Nouveau dossier
 
 FileChooser.mac.newFolder=dossier sans titre
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Aper\u00E7u
-ColorChooser.okText=OK
-ColorChooser.cancelText=Annuler
-ColorChooser.resetText=R\u00E9initialiser
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=Echantillon de texte  Echantillon de texte
-ColorChooser.swatchesNameText=Echantillons
-ColorChooser.swatchesMnemonic=69
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Dernier :
-ColorChooser.hsbNameText=TSL
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=84
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=T
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=L
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=V
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RVB
-ColorChooser.rgbMnemonic=86
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=Rouge
-ColorChooser.rgbRedMnemonic=79
-ColorChooser.rgbGreenText=Vert
-ColorChooser.rgbGreenMnemonic=86
-ColorChooser.rgbBlueText=Bleu
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=Aper\u00E7u
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Annuler
+ColorChooser.reset.textAndMnemonic=&R\u00E9initialiser
+ColorChooser.sample.textAndMnemonic=Echantillon de texte  Echantillon de texte
+ColorChooser.swatches.textAndMnemonic=&Echantillons
+ColorChooser.swatchesRecent.textAndMnemonic=Dernier :
+ColorChooser.hsb.textAndMnemonic=&TSL
+ColorChooser.hsbHue.textAndMnemonic=T
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=V
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&VB
+ColorChooser.rgbRed.textAndMnemonic=R&ouge
+ColorChooser.rgbGreen.textAndMnemonic=&Vert
+ColorChooser.rgbBlue.textAndMnemonic=&Bleu
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=Oui
-OptionPane.yesButtonMnemonic=79
-OptionPane.noButtonText=Non
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Annuler
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=S\u00E9lectionner une option
+OptionPane.yesButton.textAndMnemonic=&Oui
+OptionPane.noButton.textAndMnemonic=&Non
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Annuler
+OptionPane.title.textAndMnemonic=S\u00E9lectionner une option
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Entr\u00E9e
+OptionPane.inputDialog.titleAndMnemonic=Entr\u00E9e
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Message
+OptionPane.messageDialog.titleAndMnemonic=Message
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Impression
-PrintingDialog.titleAbortingText=Impression (abandon)
+PrintingDialog.titleProgress.textAndMnemonic=Impression
+PrintingDialog.titleAborting.textAndMnemonic=Impression (abandon)
 
-PrintingDialog.contentInitialText=Impression en cours...
+PrintingDialog.contentInitial.textAndMnemonic=Impression en cours...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Page {0} imprim\u00E9e...
+PrintingDialog.contentProgress.textAndMnemonic=Page {0} imprim\u00E9e...
 
-PrintingDialog.contentAbortingText=Abandon de l'impression...
+PrintingDialog.contentAborting.textAndMnemonic=Abandon de l'impression...
 
-PrintingDialog.abortButtonText=Abandonner
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Abandonner l'impression
+PrintingDialog.abortButton.textAndMnemonic=&Abandonner
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abandonner l'impression
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=R\u00E9duire
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=Fermer
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Restaurer
-InternalFrameTitlePane.moveButtonText=D\u00E9placer
-InternalFrameTitlePane.sizeButtonText=Taille
-InternalFrameTitlePane.minimizeButtonText=R\u00E9duire
-InternalFrameTitlePane.maximizeButtonText=Agrandir
-InternalFrameTitlePane.closeButtonText=Fermer
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurer
+InternalFrameTitlePane.moveButton.textAndMnemonic=D\u00E9placer
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Taille
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=R\u00E9duire
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Agrandir
+InternalFrameTitlePane.closeButton.textAndMnemonic=Fermer
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Soumettre la requ\u00EAte
-FormView.resetButtonText=R\u00E9initialiser
-FormView.browseFileButtonText=Parcourir...
+FormView.submitButton.textAndMnemonic=Soumettre la requ\u00EAte
+FormView.resetButton.textAndMnemonic=R\u00E9initialiser
+FormView.browseFileButton.textAndMnemonic=Parcourir...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=modification de style
-AbstractDocument.additionText=ajout
-AbstractDocument.deletionText=suppression
-AbstractDocument.undoText=Annuler
-AbstractDocument.redoText=R\u00E9tablir
+AbstractDocument.styleChange.textAndMnemonic=modification de style
+AbstractDocument.addition.textAndMnemonic=ajout
+AbstractDocument.deletion.textAndMnemonic=suppression
+AbstractDocument.undo.textAndMnemonic=Annuler
+AbstractDocument.redo.textAndMnemonic=R\u00E9tablir
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=cliquer
+AbstractButton.click.textAndMnemonic=cliquer
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Annuler
-AbstractUndoableEdit.redoText=R\u00E9tablir
+AbstractUndoableEdit.undo.textAndMnemonic=Annuler
+AbstractUndoableEdit.redo.textAndMnemonic=R\u00E9tablir
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Progression...
+ProgressMonitor.progress.textAndMnemonic=Progression...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=bouton gauche
-SplitPane.rightButtonText=bouton droit
+SplitPane.leftButton.textAndMnemonic=bouton gauche
+SplitPane.rightButton.textAndMnemonic=bouton droit
 # Used for Isindex
 IsindexView.prompt=Ceci est un index de recherche. Tapez des mots-cl\u00E9s pour la recherche :
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=R\u00E9duire
 InternalFrameTitlePane.maximizeButtonAccessibleName=Agrandir
 InternalFrameTitlePane.closeButtonAccessibleName=Fermer
-
--- a/src/macosx/classes/com/apple/laf/resources/aqua_it.properties	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/macosx/classes/com/apple/laf/resources/aqua_it.properties	Sun Aug 12 15:29:21 2012 -0700
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=File generico
-FileChooser.directoryDescriptionText=Directory
-FileChooser.newFolderErrorText=Si \u00E8 verificato un errore durante la creazione della cartella
+FileChooser.fileDescription.textAndMnemonic=File generico
+FileChooser.directoryDescription.textAndMnemonic=Directory
+FileChooser.newFolderError.textAndMnemonic=Si \u00E8 verificato un errore durante la creazione della cartella
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=Tutti i file
-FileChooser.cancelButtonText=Annulla
-FileChooser.saveButtonText=Salva
-FileChooser.openButtonText=Apri
-FileChooser.saveDialogTitleText=Salva
-FileChooser.openDialogTitleText=Apri
-FileChooser.updateButtonText=Aggiorna
-FileChooser.helpButtonText=?
-FileChooser.directoryOpenButtonText=Apri
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file
+FileChooser.cancelButton.textAndMnemonic=Annulla
+FileChooser.saveButton.textAndMnemonic=Salva
+FileChooser.openButton.textAndMnemonic=Apri
+FileChooser.saveDialogTitle.textAndMnemonic=Salva
+FileChooser.openDialogTitle.textAndMnemonic=Apri
+FileChooser.updateButton.textAndMnemonic=Aggiorna
+FileChooser.helpButton.textAndMnemonic=?
+FileChooser.directoryOpenButton.textAndMnemonic=Apri
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Salva
-FileChooser.openTitleText=Apri
-FileChooser.newFolderExistsErrorText=Il nome \u00E8 gi\u00E0 stato assegnato
-FileChooser.chooseButtonText=Scegli
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Salva
+FileChooser.openTitle.textAndMnemonic=Apri
+FileChooser.newFolderExistsError.textAndMnemonic=Il nome \u00E8 gi\u00E0 stato assegnato
+FileChooser.chooseButton.textAndMnemonic=Scegli
 
-FileChooser.newFolderButtonText=Nuova cartella
-FileChooser.newFolderTitleText=Nuova cartella
-FileChooser.fileNameLabelText=File:
-FileChooser.saveDialogFileNameLabelText=Salva con nome:
-FileChooser.filesOfTypeLabelText=Formato file:
+FileChooser.newFolderButton.textAndMnemonic=Nuova cartella
+FileChooser.newFolderTitle.textAndMnemonic=Nuova cartella
+FileChooser.fileNameLabel.textAndMnemonic=File:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Salva con nome:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Formato file:
 
 FileChooser.desktopName=Desktop
-FileChooser.newFolderPromptText=Nome nuova cartella:
+FileChooser.newFolderPrompt.textAndMnemonic=Nome nuova cartella:
 FileChooser.untitledFolderName=cartella senza titolo
 FileChooser.untitledFileName=senza titolo
-FileChooser.createButtonText=Crea
+FileChooser.createButton.textAndMnemonic=Crea
 
-FileChooser.byDateText=Data modifica
-FileChooser.byNameText=Nome
+FileChooser.byDate.textAndMnemonic=Data modifica
+FileChooser.by.textAndMnemonic=Nome
 FileChooser.newFolderAccessibleName=Nuova cartella
 
 FileChooser.mac.newFolder=cartella senza titolo
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Anteprima
-ColorChooser.okText=OK
-ColorChooser.cancelText=Annulla
-ColorChooser.resetText=Reimposta
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=69
-ColorChooser.sampleText=Testo di prova          Testo di prova
-ColorChooser.swatchesNameText=Colori campione
-ColorChooser.swatchesMnemonic=77
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Recenti:
-ColorChooser.hsbNameText=HSB
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=Rosso
-ColorChooser.rgbRedMnemonic=82
-ColorChooser.rgbGreenText=Verde
-ColorChooser.rgbGreenMnemonic=68
-ColorChooser.rgbBlueText=Blu
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=Anteprima
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Annulla
+ColorChooser.reset.textAndMnemonic=R&eimposta
+ColorChooser.sample.textAndMnemonic=Testo di prova          Testo di prova
+ColorChooser.swatches.textAndMnemonic=Colori ca&mpione
+ColorChooser.swatchesRecent.textAndMnemonic=Recenti:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=&Rosso
+ColorChooser.rgbGreen.textAndMnemonic=Ver&de
+ColorChooser.rgbBlue.textAndMnemonic=&Blu
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=S\u00EC
-OptionPane.yesButtonMnemonic=83
-OptionPane.noButtonText=No
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Annulla
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=Selezionare una opzione
+OptionPane.yesButton.textAndMnemonic=&S\u00EC
+OptionPane.noButton.textAndMnemonic=&No
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Annulla
+OptionPane.title.textAndMnemonic=Selezionare una opzione
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Input
+OptionPane.inputDialog.titleAndMnemonic=Input
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Messaggio
+OptionPane.messageDialog.titleAndMnemonic=Messaggio
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Stampa in corso
-PrintingDialog.titleAbortingText=Stampa in corso (operazione interrotta)
+PrintingDialog.titleProgress.textAndMnemonic=Stampa in corso
+PrintingDialog.titleAborting.textAndMnemonic=Stampa in corso (operazione interrotta)
 
-PrintingDialog.contentInitialText=Stampa in corso...
+PrintingDialog.contentInitial.textAndMnemonic=Stampa in corso...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Pagina stampata {0}...
+PrintingDialog.contentProgress.textAndMnemonic=Pagina stampata {0}...
 
-PrintingDialog.contentAbortingText=Interruzione della stampa in corso...
+PrintingDialog.contentAborting.textAndMnemonic=Interruzione della stampa in corso...
 
-PrintingDialog.abortButtonText=Interrompi
-PrintingDialog.abortButtonMnemonic=73
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Interrompe la stampa
+PrintingDialog.abortButton.textAndMnemonic=&Interrompi
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Interrompe la stampa
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Riduce a icona
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=Chiude
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Ripristina
-InternalFrameTitlePane.moveButtonText=Sposta
-InternalFrameTitlePane.sizeButtonText=Dimensiona
-InternalFrameTitlePane.minimizeButtonText=Riduci a icona
-InternalFrameTitlePane.maximizeButtonText=Ingrandisci
-InternalFrameTitlePane.closeButtonText=Chiudi
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Ripristina
+InternalFrameTitlePane.moveButton.textAndMnemonic=Sposta
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Dimensiona
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Riduci a icona
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Ingrandisci
+InternalFrameTitlePane.closeButton.textAndMnemonic=Chiudi
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Sottometti query
-FormView.resetButtonText=Reimposta
-FormView.browseFileButtonText=Sfoglia...
+FormView.submitButton.textAndMnemonic=Sottometti query
+FormView.resetButton.textAndMnemonic=Reimposta
+FormView.browseFileButton.textAndMnemonic=Sfoglia...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=modifica di stile
-AbstractDocument.additionText=aggiunta
-AbstractDocument.deletionText=eliminazione
-AbstractDocument.undoText=Annulla
-AbstractDocument.redoText=Ripeti
+AbstractDocument.styleChange.textAndMnemonic=modifica di stile
+AbstractDocument.addition.textAndMnemonic=aggiunta
+AbstractDocument.deletion.textAndMnemonic=eliminazione
+AbstractDocument.undo.textAndMnemonic=Annulla
+AbstractDocument.redo.textAndMnemonic=Ripeti
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=fare clic
+AbstractButton.click.textAndMnemonic=fare clic
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Annulla
-AbstractUndoableEdit.redoText=Ripeti
+AbstractUndoableEdit.undo.textAndMnemonic=Annulla
+AbstractUndoableEdit.redo.textAndMnemonic=Ripeti
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=In corso...
+ProgressMonitor.progress.textAndMnemonic=In corso...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=pulsante sinistro
-SplitPane.rightButtonText=pulsante destro
+SplitPane.leftButton.textAndMnemonic=pulsante sinistro
+SplitPane.rightButton.textAndMnemonic=pulsante destro
 # Used for Isindex
 IsindexView.prompt=Questo \u00E8 un indice di ricerca. Immettere le parole chiave:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Riduci a icona
 InternalFrameTitlePane.maximizeButtonAccessibleName=Ingrandisci
 InternalFrameTitlePane.closeButtonAccessibleName=Chiudi
-
--- a/src/macosx/classes/com/apple/laf/resources/aqua_ja.properties	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/macosx/classes/com/apple/laf/resources/aqua_ja.properties	Sun Aug 12 15:29:21 2012 -0700
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB
-FileChooser.directoryDescriptionText=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
-FileChooser.newFolderErrorText=\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+FileChooser.fileDescription.textAndMnemonic=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB
+FileChooser.directoryDescription.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
+FileChooser.newFolderError.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
-FileChooser.cancelButtonText=\u53D6\u6D88
-FileChooser.saveButtonText=\u4FDD\u5B58
-FileChooser.openButtonText=\u958B\u304F
-FileChooser.saveDialogTitleText=\u4FDD\u5B58
-FileChooser.openDialogTitleText=\u958B\u304F
-FileChooser.updateButtonText=\u66F4\u65B0
-FileChooser.helpButtonText=\u30D8\u30EB\u30D7
-FileChooser.directoryOpenButtonText=\u958B\u304F
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
+FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openButton.textAndMnemonic=\u958B\u304F
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
+FileChooser.helpButton.textAndMnemonic=\u30D8\u30EB\u30D7
+FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u304F
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=\u4FDD\u5B58
-FileChooser.openTitleText=\u958B\u304F
-FileChooser.newFolderExistsErrorText=\u305D\u306E\u540D\u524D\u306F\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
-FileChooser.chooseButtonText=\u9078\u629E
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openTitle.textAndMnemonic=\u958B\u304F
+FileChooser.newFolderExistsError.textAndMnemonic=\u305D\u306E\u540D\u524D\u306F\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
+FileChooser.chooseButton.textAndMnemonic=\u9078\u629E
 
-FileChooser.newFolderButtonText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.newFolderTitleText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.fileNameLabelText=\u30D5\u30A1\u30A4\u30EB:
-FileChooser.saveDialogFileNameLabelText=\u5225\u540D\u4FDD\u5B58:
-FileChooser.filesOfTypeLabelText=\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F:
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.newFolderTitle.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=\u5225\u540D\u4FDD\u5B58:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F:
 
 FileChooser.desktopName=\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7
-FileChooser.newFolderPromptText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D:
+FileChooser.newFolderPrompt.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D:
 FileChooser.untitledFolderName=\u7121\u984C\u306E\u30D5\u30A9\u30EB\u30C0
 FileChooser.untitledFileName=\u7121\u984C
-FileChooser.createButtonText=\u4F5C\u6210
+FileChooser.createButton.textAndMnemonic=\u4F5C\u6210
 
-FileChooser.byDateText=\u5909\u66F4\u65E5
-FileChooser.byNameText=\u540D\u524D
+FileChooser.byDate.textAndMnemonic=\u5909\u66F4\u65E5
+FileChooser.by.textAndMnemonic=\u540D\u524D
 FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
 
 FileChooser.mac.newFolder=\u7121\u984C\u306E\u30D5\u30A9\u30EB\u30C0
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=\u30D7\u30EC\u30D3\u30E5\u30FC
-ColorChooser.okText=OK
-ColorChooser.cancelText=\u53D6\u6D88
-ColorChooser.resetText=\u30EA\u30BB\u30C3\u30C8(R)
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8  \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8
-ColorChooser.swatchesNameText=\u30B5\u30F3\u30D7\u30EB(S)
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=\u6700\u65B0:
-ColorChooser.hsbNameText=HSB(H)
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB(G)
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=\u8D64(D)
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7DD1(N)
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u9752(B)
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=\u30D7\u30EC\u30D3\u30E5\u30FC
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8(&R)
+ColorChooser.sample.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8  \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8
+ColorChooser.swatches.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0:
+ColorChooser.hsb.textAndMnemonic=HSB(&H)
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\u8D64(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7DD1(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u9752(&B)
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=\u306F\u3044(Y)
-OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\u3044\u3044\u3048(N)
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=\u53D6\u6D88
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
+OptionPane.yesButton.textAndMnemonic=\u306F\u3044(&Y)
+OptionPane.noButton.textAndMnemonic=\u3044\u3044\u3048(&N)
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.title.textAndMnemonic=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=\u5165\u529B
+OptionPane.inputDialog.titleAndMnemonic=\u5165\u529B
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=\u30E1\u30C3\u30BB\u30FC\u30B8
+OptionPane.messageDialog.titleAndMnemonic=\u30E1\u30C3\u30BB\u30FC\u30B8
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=\u5370\u5237\u3057\u3066\u3044\u307E\u3059
-PrintingDialog.titleAbortingText=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059
+PrintingDialog.titleProgress.textAndMnemonic=\u5370\u5237\u3057\u3066\u3044\u307E\u3059
+PrintingDialog.titleAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059
 
-PrintingDialog.contentInitialText=\u5370\u5237\u4E2D...
+PrintingDialog.contentInitial.textAndMnemonic=\u5370\u5237\u4E2D...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F...
+PrintingDialog.contentProgress.textAndMnemonic=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F...
 
-PrintingDialog.contentAbortingText=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059...
+PrintingDialog.contentAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059...
 
-PrintingDialog.abortButtonText=\u4E2D\u6B62(A)
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=\u5370\u5237\u306E\u4E2D\u6B62
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u5370\u5237\u306E\u4E2D\u6B62
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=\u9589\u3058\u308B
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=\u5FA9\u5143
-InternalFrameTitlePane.moveButtonText=\u79FB\u52D5
-InternalFrameTitlePane.sizeButtonText=\u30B5\u30A4\u30BA
-InternalFrameTitlePane.minimizeButtonText=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButtonText=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonText=\u9589\u3058\u308B
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u5143
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u30B5\u30A4\u30BA
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u9589\u3058\u308B
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=\u554F\u5408\u305B\u306E\u5B9F\u884C
-FormView.resetButtonText=\u30EA\u30BB\u30C3\u30C8
-FormView.browseFileButtonText=\u53C2\u7167...
+FormView.submitButton.textAndMnemonic=\u554F\u5408\u305B\u306E\u5B9F\u884C
+FormView.resetButton.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8
+FormView.browseFileButton.textAndMnemonic=\u53C2\u7167...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4
-AbstractDocument.additionText=\u8FFD\u52A0
-AbstractDocument.deletionText=\u524A\u9664
-AbstractDocument.undoText=\u5143\u306B\u623B\u3059
-AbstractDocument.redoText=\u3084\u308A\u76F4\u3057
+AbstractDocument.styleChange.textAndMnemonic=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4
+AbstractDocument.addition.textAndMnemonic=\u8FFD\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u524A\u9664
+AbstractDocument.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
+AbstractDocument.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=\u30AF\u30EA\u30C3\u30AF
+AbstractButton.click.textAndMnemonic=\u30AF\u30EA\u30C3\u30AF
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=\u5143\u306B\u623B\u3059
-AbstractUndoableEdit.redoText=\u3084\u308A\u76F4\u3057
+AbstractUndoableEdit.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
+AbstractUndoableEdit.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7
+ComboBox.togglePopup.textAndMnemonic=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=\u9032\u884C\u4E2D...
+ProgressMonitor.progress.textAndMnemonic=\u9032\u884C\u4E2D...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=\u5DE6\u30DC\u30BF\u30F3
-SplitPane.rightButtonText=\u53F3\u30DC\u30BF\u30F3
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u30DC\u30BF\u30F3
+SplitPane.rightButton.textAndMnemonic=\u53F3\u30DC\u30BF\u30F3
 # Used for Isindex
 IsindexView.prompt=\u691C\u7D22\u7528\u306E\u7D22\u5F15\u3067\u3059\u3002\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=\u30A2\u30A4\u30B3\u30F3\u5316
 InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
 InternalFrameTitlePane.closeButtonAccessibleName=\u9589\u3058\u308B
-
--- a/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties	Sun Aug 12 15:29:21 2012 -0700
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=\uC77C\uBC18 \uD30C\uC77C
-FileChooser.directoryDescriptionText=\uB514\uB809\uD1A0\uB9AC
-FileChooser.newFolderErrorText=\uD3F4\uB354 \uC0DD\uC131 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+FileChooser.fileDescription.textAndMnemonic=\uC77C\uBC18 \uD30C\uC77C
+FileChooser.directoryDescription.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC
+FileChooser.newFolderError.textAndMnemonic=\uD3F4\uB354 \uC0DD\uC131 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C
-FileChooser.cancelButtonText=\uCDE8\uC18C
-FileChooser.saveButtonText=\uC800\uC7A5
-FileChooser.openButtonText=\uC5F4\uAE30
-FileChooser.saveDialogTitleText=\uC800\uC7A5
-FileChooser.openDialogTitleText=\uC5F4\uAE30
-FileChooser.updateButtonText=\uAC31\uC2E0
-FileChooser.helpButtonText=\uB3C4\uC6C0\uB9D0
-FileChooser.directoryOpenButtonText=\uC5F4\uAE30
+FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C
+FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C
+FileChooser.saveButton.textAndMnemonic=\uC800\uC7A5
+FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30
+FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
+FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
+FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0
+FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0
+FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=\uC800\uC7A5
-FileChooser.openTitleText=\uC5F4\uAE30
-FileChooser.newFolderExistsErrorText=\uD574\uB2F9 \uC774\uB984\uC740 \uC774\uBBF8 \uC0AC\uC6A9 \uC911\uC785\uB2C8\uB2E4.
-FileChooser.chooseButtonText=\uC120\uD0DD
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=\uC800\uC7A5
+FileChooser.openTitle.textAndMnemonic=\uC5F4\uAE30
+FileChooser.newFolderExistsError.textAndMnemonic=\uD574\uB2F9 \uC774\uB984\uC740 \uC774\uBBF8 \uC0AC\uC6A9 \uC911\uC785\uB2C8\uB2E4.
+FileChooser.chooseButton.textAndMnemonic=\uC120\uD0DD
 
-FileChooser.newFolderButtonText=\uC0C8 \uD3F4\uB354
-FileChooser.newFolderTitleText=\uC0C8 \uD3F4\uB354
-FileChooser.fileNameLabelText=\uD30C\uC77C:
-FileChooser.saveDialogFileNameLabelText=\uB2E4\uB978 \uC774\uB984\uC73C\uB85C \uC800\uC7A5:
-FileChooser.filesOfTypeLabelText=\uD30C\uC77C \uD615\uC2DD:
+FileChooser.newFolderButton.textAndMnemonic=\uC0C8 \uD3F4\uB354
+FileChooser.newFolderTitle.textAndMnemonic=\uC0C8 \uD3F4\uB354
+FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=\uB2E4\uB978 \uC774\uB984\uC73C\uB85C \uC800\uC7A5:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uD615\uC2DD:
 
 FileChooser.desktopName=\uB370\uC2A4\uD06C\uD1B1
-FileChooser.newFolderPromptText=\uC0C8 \uD3F4\uB354\uC758 \uC774\uB984:
+FileChooser.newFolderPrompt.textAndMnemonic=\uC0C8 \uD3F4\uB354\uC758 \uC774\uB984:
 FileChooser.untitledFolderName=\uC81C\uBAA9 \uC5C6\uB294 \uD3F4\uB354
 FileChooser.untitledFileName=\uC81C\uBAA9 \uC5C6\uC74C
-FileChooser.createButtonText=\uC0DD\uC131
+FileChooser.createButton.textAndMnemonic=\uC0DD\uC131
 
-FileChooser.byDateText=\uC218\uC815\uB41C \uB0A0\uC9DC
-FileChooser.byNameText=\uC774\uB984
+FileChooser.byDate.textAndMnemonic=\uC218\uC815\uB41C \uB0A0\uC9DC
+FileChooser.by.textAndMnemonic=\uC774\uB984
 FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
 
 FileChooser.mac.newFolder=\uC81C\uBAA9 \uC5C6\uB294 \uD3F4\uB354
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=\uBBF8\uB9AC\uBCF4\uAE30
-ColorChooser.okText=\uD655\uC778
-ColorChooser.cancelText=\uCDE8\uC18C
-ColorChooser.resetText=\uC7AC\uC124\uC815(R)
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=\uC0D8\uD50C \uD14D\uC2A4\uD2B8  \uC0D8\uD50C \uD14D\uC2A4\uD2B8
-ColorChooser.swatchesNameText=\uACAC\uBCF8(S)
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=\uCD5C\uADFC \uBAA9\uB85D:
-ColorChooser.hsbNameText=HSB(H)
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB(G)
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=\uBE68\uAC04\uC0C9(D)
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\uB179\uC0C9(N)
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\uD30C\uB780\uC0C9(B)
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=\uBBF8\uB9AC\uBCF4\uAE30
+ColorChooser.ok.textAndMnemonic=\uD655\uC778
+ColorChooser.cancel.textAndMnemonic=\uCDE8\uC18C
+ColorChooser.reset.textAndMnemonic=\uC7AC\uC124\uC815(&R)
+ColorChooser.sample.textAndMnemonic=\uC0D8\uD50C \uD14D\uC2A4\uD2B8  \uC0D8\uD50C \uD14D\uC2A4\uD2B8
+ColorChooser.swatches.textAndMnemonic=\uACAC\uBCF8(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\uCD5C\uADFC \uBAA9\uB85D:
+ColorChooser.hsb.textAndMnemonic=HSB(&H)
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\uBE68\uAC04\uC0C9(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\uB179\uC0C9(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\uD30C\uB780\uC0C9(&B)
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=\uC608(Y)
-OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\uC544\uB2C8\uC624(N)
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=\uCDE8\uC18C
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=\uC635\uC158 \uC120\uD0DD
+OptionPane.yesButton.textAndMnemonic=\uC608(&Y)
+OptionPane.noButton.textAndMnemonic=\uC544\uB2C8\uC624(&N)
+OptionPane.okButton.textAndMnemonic=\uD655\uC778
+OptionPane.cancelButton.textAndMnemonic=\uCDE8\uC18C
+OptionPane.title.textAndMnemonic=\uC635\uC158 \uC120\uD0DD
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=\uC785\uB825
+OptionPane.inputDialog.titleAndMnemonic=\uC785\uB825
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=\uBA54\uC2DC\uC9C0
+OptionPane.messageDialog.titleAndMnemonic=\uBA54\uC2DC\uC9C0
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=\uC778\uC1C4
-PrintingDialog.titleAbortingText=\uC778\uC1C4(\uC911\uB2E8 \uC911)
+PrintingDialog.titleProgress.textAndMnemonic=\uC778\uC1C4
+PrintingDialog.titleAborting.textAndMnemonic=\uC778\uC1C4(\uC911\uB2E8 \uC911)
 
-PrintingDialog.contentInitialText=\uC778\uC1C4 \uC9C4\uD589 \uC911...
+PrintingDialog.contentInitial.textAndMnemonic=\uC778\uC1C4 \uC9C4\uD589 \uC911...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}...
+PrintingDialog.contentProgress.textAndMnemonic=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}...
 
-PrintingDialog.contentAbortingText=\uC778\uC1C4 \uC911\uB2E8 \uC911...
+PrintingDialog.contentAborting.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8 \uC911...
 
-PrintingDialog.abortButtonText=\uC911\uB2E8(A)
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=\uC778\uC1C4 \uC911\uB2E8
+PrintingDialog.abortButton.textAndMnemonic=\uC911\uB2E8(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=\uCD5C\uC18C\uD654
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=\uB2EB\uAE30
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=\uBCF5\uC6D0
-InternalFrameTitlePane.moveButtonText=\uC774\uB3D9
-InternalFrameTitlePane.sizeButtonText=\uD06C\uAE30
-InternalFrameTitlePane.minimizeButtonText=\uCD5C\uC18C\uD654
-InternalFrameTitlePane.maximizeButtonText=\uCD5C\uB300\uD654
-InternalFrameTitlePane.closeButtonText=\uB2EB\uAE30
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\uBCF5\uC6D0
+InternalFrameTitlePane.moveButton.textAndMnemonic=\uC774\uB3D9
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\uD06C\uAE30
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\uCD5C\uC18C\uD654
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\uCD5C\uB300\uD654
+InternalFrameTitlePane.closeButton.textAndMnemonic=\uB2EB\uAE30
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=\uC9C8\uC758 \uC81C\uCD9C
-FormView.resetButtonText=\uC7AC\uC124\uC815
-FormView.browseFileButtonText=\uCC3E\uC544\uBCF4\uAE30...
+FormView.submitButton.textAndMnemonic=\uC9C8\uC758 \uC81C\uCD9C
+FormView.resetButton.textAndMnemonic=\uC7AC\uC124\uC815
+FormView.browseFileButton.textAndMnemonic=\uCC3E\uC544\uBCF4\uAE30...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=\uC2A4\uD0C0\uC77C \uBCC0\uACBD
-AbstractDocument.additionText=\uCD94\uAC00
-AbstractDocument.deletionText=\uC0AD\uC81C
-AbstractDocument.undoText=\uC2E4\uD589 \uCDE8\uC18C
-AbstractDocument.redoText=\uC7AC\uC2E4\uD589
+AbstractDocument.styleChange.textAndMnemonic=\uC2A4\uD0C0\uC77C \uBCC0\uACBD
+AbstractDocument.addition.textAndMnemonic=\uCD94\uAC00
+AbstractDocument.deletion.textAndMnemonic=\uC0AD\uC81C
+AbstractDocument.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
+AbstractDocument.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=\uB204\uB974\uAE30
+AbstractButton.click.textAndMnemonic=\uB204\uB974\uAE30
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=\uC2E4\uD589 \uCDE8\uC18C
-AbstractUndoableEdit.redoText=\uC7AC\uC2E4\uD589
+AbstractUndoableEdit.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
+AbstractUndoableEdit.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=\uC9C4\uD589...
+ProgressMonitor.progress.textAndMnemonic=\uC9C4\uD589...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=\uC67C\uCABD \uB2E8\uCD94
-SplitPane.rightButtonText=\uC624\uB978\uCABD \uB2E8\uCD94
+SplitPane.leftButton.textAndMnemonic=\uC67C\uCABD \uB2E8\uCD94
+SplitPane.rightButton.textAndMnemonic=\uC624\uB978\uCABD \uB2E8\uCD94
 # Used for Isindex
 IsindexView.prompt=\uB2E4\uC74C\uC740 \uAC80\uC0C9 \uAC00\uB2A5\uD55C \uC778\uB371\uC2A4\uC785\uB2C8\uB2E4. \uAC80\uC0C9 \uD0A4\uC6CC\uB4DC \uC785\uB825:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=\uC544\uC774\uCF58\uD654
 InternalFrameTitlePane.maximizeButtonAccessibleName=\uCD5C\uB300\uD654
 InternalFrameTitlePane.closeButtonAccessibleName=\uB2EB\uAE30
-
--- a/src/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties	Sun Aug 12 15:29:21 2012 -0700
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Arquivo Gen\u00E9rico
-FileChooser.directoryDescriptionText=Diret\u00F3rio
-FileChooser.newFolderErrorText=Ocorreu um erro durante a cria\u00E7\u00E3o da pasta
+FileChooser.fileDescription.textAndMnemonic=Arquivo Gen\u00E9rico
+FileChooser.directoryDescription.textAndMnemonic=Diret\u00F3rio
+FileChooser.newFolderError.textAndMnemonic=Ocorreu um erro durante a cria\u00E7\u00E3o da pasta
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=Todos os Arquivos
-FileChooser.cancelButtonText=Cancelar
-FileChooser.saveButtonText=Salvar
-FileChooser.openButtonText=Abrir
-FileChooser.saveDialogTitleText=Salvar
-FileChooser.openDialogTitleText=Abrir
-FileChooser.updateButtonText=Atualizar
-FileChooser.helpButtonText=Ajuda
-FileChooser.directoryOpenButtonText=Abrir
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos
+FileChooser.cancelButton.textAndMnemonic=Cancelar
+FileChooser.saveButton.textAndMnemonic=Salvar
+FileChooser.openButton.textAndMnemonic=Abrir
+FileChooser.saveDialogTitle.textAndMnemonic=Salvar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.updateButton.textAndMnemonic=Atualizar
+FileChooser.helpButton.textAndMnemonic=Ajuda
+FileChooser.directoryOpenButton.textAndMnemonic=Abrir
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Salvar
-FileChooser.openTitleText=Abrir
-FileChooser.newFolderExistsErrorText=Este nome j\u00E1 foi utilizado
-FileChooser.chooseButtonText=Escolher
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Salvar
+FileChooser.openTitle.textAndMnemonic=Abrir
+FileChooser.newFolderExistsError.textAndMnemonic=Este nome j\u00E1 foi utilizado
+FileChooser.chooseButton.textAndMnemonic=Escolher
 
-FileChooser.newFolderButtonText=Nova Pasta
-FileChooser.newFolderTitleText=Nova Pasta
-FileChooser.fileNameLabelText=Arquivo:
-FileChooser.saveDialogFileNameLabelText=Salvar como:
-FileChooser.filesOfTypeLabelText=Formato do Arquivo:
+FileChooser.newFolderButton.textAndMnemonic=Nova Pasta
+FileChooser.newFolderTitle.textAndMnemonic=Nova Pasta
+FileChooser.fileNameLabel.textAndMnemonic=Arquivo:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Salvar como:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Formato do Arquivo:
 
 FileChooser.desktopName=\u00C1rea de Trabalho
-FileChooser.newFolderPromptText=Nome da nova pasta:
+FileChooser.newFolderPrompt.textAndMnemonic=Nome da nova pasta:
 FileChooser.untitledFolderName=pasta sem t\u00EDtulo
 FileChooser.untitledFileName=sem t\u00EDtulo
-FileChooser.createButtonText=Criar
+FileChooser.createButton.textAndMnemonic=Criar
 
-FileChooser.byDateText=Data da Modifica\u00E7\u00E3o
-FileChooser.byNameText=Nome
+FileChooser.byDate.textAndMnemonic=Data da Modifica\u00E7\u00E3o
+FileChooser.by.textAndMnemonic=Nome
 FileChooser.newFolderAccessibleName=Nova Pasta
 
 FileChooser.mac.newFolder=pasta sem t\u00EDtulo
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Visualizar
-ColorChooser.okText=OK
-ColorChooser.cancelText=Cancelar
-ColorChooser.resetText=Redefinir
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=Texto de Amostra Texto de Amostra
-ColorChooser.swatchesNameText=Amostras
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Recente:
-ColorChooser.hsbNameText=HSB
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=Vermelho
-ColorChooser.rgbRedMnemonic=86
-ColorChooser.rgbGreenText=Verde
-ColorChooser.rgbGreenMnemonic=86
-ColorChooser.rgbBlueText=Azul
-ColorChooser.rgbBlueMnemonic=65
+ColorChooser.preview.textAndMnemonic=Visualizar
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Cancelar
+ColorChooser.reset.textAndMnemonic=&Redefinir
+ColorChooser.sample.textAndMnemonic=Texto de Amostra Texto de Amostra
+ColorChooser.swatches.textAndMnemonic=Amo&stras
+ColorChooser.swatchesRecent.textAndMnemonic=Recente:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=&Vermelho
+ColorChooser.rgbGreen.textAndMnemonic=&Verde
+ColorChooser.rgbBlue.textAndMnemonic=&Azul
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=Sim
-OptionPane.yesButtonMnemonic=83
-OptionPane.noButtonText=N\u00E3o
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Cancelar
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=Selecionar uma Op\u00E7\u00E3o
+OptionPane.yesButton.textAndMnemonic=&Sim
+OptionPane.noButton.textAndMnemonic=&N\u00E3o
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Cancelar
+OptionPane.title.textAndMnemonic=Selecionar uma Op\u00E7\u00E3o
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Entrada
+OptionPane.inputDialog.titleAndMnemonic=Entrada
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Mensagem
+OptionPane.messageDialog.titleAndMnemonic=Mensagem
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Impress\u00E3o
-PrintingDialog.titleAbortingText=Impress\u00E3o (Abortando)
+PrintingDialog.titleProgress.textAndMnemonic=Impress\u00E3o
+PrintingDialog.titleAborting.textAndMnemonic=Impress\u00E3o (Abortando)
 
-PrintingDialog.contentInitialText=Impress\u00E3o em andamento...
+PrintingDialog.contentInitial.textAndMnemonic=Impress\u00E3o em andamento...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=P\u00E1gina impressa {0}...
+PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impressa {0}...
 
-PrintingDialog.contentAbortingText=Abortando impress\u00E3o...
+PrintingDialog.contentAborting.textAndMnemonic=Abortando impress\u00E3o...
 
-PrintingDialog.abortButtonText=Abortar
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Abortar Impress\u00E3o
+PrintingDialog.abortButton.textAndMnemonic=&Abortar
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impress\u00E3o
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimizar
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=Fechar
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Restaurar
-InternalFrameTitlePane.moveButtonText=Mover
-InternalFrameTitlePane.sizeButtonText=Tamanho
-InternalFrameTitlePane.minimizeButtonText=Minimizar
-InternalFrameTitlePane.maximizeButtonText=Maximizar
-InternalFrameTitlePane.closeButtonText=Fechar
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
+InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Tamanho
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
+InternalFrameTitlePane.closeButton.textAndMnemonic=Fechar
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Submeter Consulta
-FormView.resetButtonText=Redefinir
-FormView.browseFileButtonText=Procurar...
+FormView.submitButton.textAndMnemonic=Submeter Consulta
+FormView.resetButton.textAndMnemonic=Redefinir
+FormView.browseFileButton.textAndMnemonic=Procurar...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=altera\u00E7\u00E3o de estilo
-AbstractDocument.additionText=adi\u00E7\u00E3o
-AbstractDocument.deletionText=dele\u00E7\u00E3o
-AbstractDocument.undoText=Desfazer
-AbstractDocument.redoText=Refazer
+AbstractDocument.styleChange.textAndMnemonic=altera\u00E7\u00E3o de estilo
+AbstractDocument.addition.textAndMnemonic=adi\u00E7\u00E3o
+AbstractDocument.deletion.textAndMnemonic=dele\u00E7\u00E3o
+AbstractDocument.undo.textAndMnemonic=Desfazer
+AbstractDocument.redo.textAndMnemonic=Refazer
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=clicar
+AbstractButton.click.textAndMnemonic=clicar
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Desfazer
-AbstractUndoableEdit.redoText=Refazer
+AbstractUndoableEdit.undo.textAndMnemonic=Desfazer
+AbstractUndoableEdit.redo.textAndMnemonic=Refazer
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Andamento...
+ProgressMonitor.progress.textAndMnemonic=Andamento...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=bot\u00E3o esquerdo
-SplitPane.rightButtonText=bot\u00E3o direito
+SplitPane.leftButton.textAndMnemonic=bot\u00E3o esquerdo
+SplitPane.rightButton.textAndMnemonic=bot\u00E3o direito
 # Used for Isindex
 IsindexView.prompt=Trata-se de um \u00EDndice pesquis\u00E1vel. Informe as palavras-chave de pesquisa:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Iconizar
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
 InternalFrameTitlePane.closeButtonAccessibleName=Fechar
-
--- a/src/macosx/classes/com/apple/laf/resources/aqua_sv.properties	Sat Aug 04 10:32:21 2012 -0700
+++ b/src/macosx/classes/com/apple/laf/resources/aqua_sv.properties	Sun Aug 12 15:29:21 2012 -0700
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Generisk fil
-FileChooser.directoryDescriptionText=Katalog
-FileChooser.newFolderErrorText=Ett fel intr\u00E4ffade n\u00E4r en mapp skulle skapas
+FileChooser.fileDescription.textAndMnemonic=Generisk fil
+FileChooser.directoryDescription.textAndMnemonic=Katalog
+FileChooser.newFolderError.textAndMnemonic=Ett fel intr\u00E4ffade n\u00E4r en mapp skulle skapas
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=Alla filer
-FileChooser.cancelButtonText=Avbryt
-FileChooser.saveButtonText=Spara
-FileChooser.openButtonText=\u00D6ppna
-FileChooser.saveDialogTitleText=Spara
-FileChooser.openDialogTitleText=\u00D6ppna
-FileChooser.updateButtonText=Uppdatera
-FileChooser.helpButtonText=Hj\u00E4lp
-FileChooser.directoryOpenButtonText=\u00D6ppna
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
+FileChooser.cancelButton.textAndMnemonic=Avbryt
+FileChooser.saveButton.textAndMnemonic=Spara
+FileChooser.openButton.textAndMnemonic=\u00D6ppna
+FileChooser.saveDialogTitle.textAndMnemonic=Spara
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
+FileChooser.updateButton.textAndMnemonic=Uppdatera
+FileChooser.helpButton.textAndMnemonic=Hj\u00E4lp
+FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ppna
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Spara
-FileChooser.openTitleText=\u00D6ppna
-FileChooser.newFolderExistsErrorText=Namnet finns redan
-FileChooser.chooseButtonText=V\u00E4lj
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Spara
+FileChooser.openTitle.textAndMnemonic=\u00D6ppna
+FileChooser.newFolderExistsError.textAndMnemonic=Namnet finns redan
+FileChooser.chooseButton.textAndMnemonic=V\u00E4lj
 
-FileChooser.newFolderButtonText=Ny mapp
-FileChooser.newFolderTitleText=Ny mapp
-FileChooser.fileNameLabelText=Fil:
-FileChooser.saveDialogFileNameLabelText=Spara som:
-FileChooser.filesOfTypeLabelText=Filformat:
+FileChooser.newFolderButton.textAndMnemonic=Ny mapp
+FileChooser.newFolderTitle.textAndMnemonic=Ny mapp
+FileChooser.fileNameLabel.textAndMnemonic=Fil:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Spara som:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Filformat:
 
 FileChooser.desktopName=Klientdator
-FileChooser.newFolderPromptText=Namn p\u00E5 ny mapp:
+FileChooser.newFolderPrompt.textAndMnemonic=Namn p\u00E5 ny mapp:
 FileChooser.untitledFolderName=namnl\u00F6s mapp
 FileChooser.untitledFileName=namnl\u00F6s
-FileChooser.createButtonText=Skapa
+FileChooser.createButton.textAndMnemonic=Skapa
 
-FileChooser.byDateText=\u00C4ndringsdatum
-FileChooser.byNameText=Namn
+FileChooser.byDate.textAndMnemonic=\u00C4ndringsdatum
+FileChooser.by.textAndMnemonic=Namn
 FileChooser.newFolderAccessibleName=Ny mapp
 
 FileChooser.mac.newFolder=namnl\u00F6s mapp
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=F\u00F6rhandsgranska
-ColorChooser.okText=OK
-ColorChooser.cancelText=Avbryt
-ColorChooser.resetText=\u00C5terst\u00E4ll
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=84
-ColorChooser.sampleText=Exempeltext  Exempeltext
-ColorChooser.swatchesNameText=Prov
-ColorChooser.swatchesMnemonic=80
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Senaste:
-ColorChooser.hsbNameText=HSB
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=R\u00F6d
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=Gr\u00F6n
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=Bl\u00E5
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=F\u00F6rhandsgranska
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Avbryt
+ColorChooser.reset.textAndMnemonic=&\u00C5terst\u00E4ll
+ColorChooser.sample.textAndMnemonic=Exempeltext  Exempeltext
+ColorChooser.swatches.textAndMnemonic=&Prov
+ColorChooser.swatchesRecent.textAndMnemonic=Senaste:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B