Mercurial > hg > icedtea9-forest > jdk

changeset 5885:aa2c9ce06632 icedtea-4-branchpoint

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8-b52
author andrew
date Fri, 24 Aug 2012 09:29:17 +0100
parents d15095dfd348 (diff) 2c6933c5106b (current diff)
children 53c79766f8f0
files .hgtags make/common/Program.gmk make/common/Release.gmk make/java/jli/Makefile make/sunw/Makefile src/share/classes/java/beans/Introspector.java src/share/classes/java/lang/invoke/AdapterMethodHandle.java src/share/classes/java/lang/invoke/CountingMethodHandle.java src/share/classes/java/util/zip/Deflater.java src/share/classes/java/util/zip/Inflater.java src/share/classes/sun/nio/cs/SingleByteDecoder.java src/share/classes/sun/nio/cs/SingleByteEncoder.java src/share/classes/sun/nio/cs/ext/DoubleByteDecoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0201.java src/share/classes/sun/nio/cs/ext/JIS_X_0208.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_Encoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS5022X_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS5022X_Encoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS932_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS932_Encoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Encoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0212.java src/share/classes/sun/nio/cs/ext/JIS_X_0212_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0212_Encoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0212_MS5022X_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0212_MS5022X_Encoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Encoder.java src/share/classes/sun/nio/cs/ext/PCK.java src/share/classes/sun/nio/cs/ext/SJIS.java src/share/classes/sun/security/provider/certpath/OCSPResponse.java src/share/classes/sun/security/x509/X509CRLImpl.java src/share/classes/sun/security/x509/X509CertImpl.java src/share/classes/sunw/io/Serializable.java src/share/classes/sunw/util/EventListener.java src/share/classes/sunw/util/EventObject.java src/share/native/java/util/zip/Deflater.c src/share/native/java/util/zip/Inflater.c src/solaris/bin/java_md.c
diffstat 84 files changed, 349 insertions(+), 1997 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Aug 16 11:43:24 2012 -0700
+++ b/.hgtags	Fri Aug 24 09:29:17 2012 +0100
@@ -50,6 +50,7 @@
 f708138c9aca4b389872838fe6773872fce3609e jdk7-b73
 eacb36e30327e7ae33baa068e82ddccbd91eaae2 jdk7-b74
 8885b22565077236a927e824ef450742e434a230 jdk7-b75
+fb2ee5e96b171ae9db67274d87ffaba941e8bfa6 icedtea7-1.12
 8fb602395be0f7d5af4e7e93b7df2d960faf9d17 jdk7-b76
 e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77
 1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78
@@ -63,6 +64,7 @@
 eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86
 2cafbbe9825e911a6ca6c17d9a18eb1f0bf0873c jdk7-b87
 b3c69282f6d3c90ec21056cd1ab70dc0c895b069 jdk7-b88
+2017795af50aebc00f500e58f708980b49bc7cd1 icedtea7-1.13
 4a6abb7e224cc8d9a583c23c5782e4668739a119 jdk7-b89
 7f90d0b9dbb7ab4c60d0b0233e4e77fb4fac597c jdk7-b90
 08a31cab971fcad4695e913d0f3be7bde3a90747 jdk7-b91
@@ -111,6 +113,7 @@
 554adcfb615e63e62af530b1c10fcf7813a75b26 jdk7-b134
 d8ced728159fbb2caa8b6adb477fd8efdbbdf179 jdk7-b135
 aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136
+1571aa7abe47a54510c62a5b59a8c343cdaf67cb icedtea-1.14
 29296ea6529a418037ccce95903249665ef31c11 jdk7-b137
 60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138
 d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139
--- a/make/com/sun/java/pack/Makefile	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/com/sun/java/pack/Makefile	Fri Aug 24 09:29:17 2012 +0100
@@ -77,8 +77,8 @@
   OTHER_CXXFLAGS += $(ZINCLUDE)
   LDDFLAGS += $(ZIPOBJS)
  else
-  LDDFLAGS += -lz
-  OTHER_CXXFLAGS += -DSYSTEM_ZLIB
+  LDDFLAGS += $(ZLIB_LIBS)
+  OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB
  endif
 else
   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
--- a/make/common/Program.gmk	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/common/Program.gmk	Fri Aug 24 09:29:17 2012 +0100
@@ -62,12 +62,14 @@
 program: $(ACTUAL_PROGRAM)
 
 # Work-around for missing processor specific mapfiles
+ifneq (,$(filter $(ARCH), amd64 i586 sparc sparcv9))
 ifndef CROSS_COMPILE_ARCH
   # reuse the mapfiles in the launcher's directory, the same should
   # be applicable to the tool launchers as well.
   FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH)
   include $(BUILDDIR)/common/Mapfile-vers.gmk
 endif
+endif
 
 include $(JDK_TOPDIR)/make/common/Rules.gmk
 
@@ -91,7 +93,7 @@
   LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
 
   ifeq ($(SYSTEM_ZLIB),true)
-    OTHER_LDLIBS += -lz
+    OTHER_LDLIBS += $(ZLIB_LIBS)
   endif
 endif
 
--- a/make/common/Release.gmk	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/common/Release.gmk	Fri Aug 24 09:29:17 2012 +0100
@@ -1069,13 +1069,9 @@
 	for d in $(SOURCE_DIRS); do \
 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \
 	  ($(CD) $$d &&  \
-	    for sd in $(SOURCES) ; do \
-              if [ -d $$sd ] ; then \
-	        $(FIND) $$sd $(SOURCE_FILES_filter) \
-		        -name '*.java' -print \
-		        >> $(ABS_TEMPDIR)/src-files.list ; \
-	      fi; \
-	    done ; \
+	    $(FIND) . $(SOURCE_FILES_filter) \
+	    -name '*.java' -print \
+	    >> $(ABS_TEMPDIR)/src-files.list ; \
 	  ) ; \
 	  if [ -f  $(ABS_TEMPDIR)/src-files.list ] ; then \
 	    ($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \
@@ -1085,14 +1081,10 @@
   else
 	for d in $(SOURCE_DIRS); do \
 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \
-	  ($(CD) $$d && \
-	    for sd in $(SOURCES) ; do \
-              if [ -d $$sd ] ; then \
-	        $(FIND) $$sd $(SOURCE_FILES_filter) \
-		        -name '*.java' -print \
-		        >> $(ABS_TEMPDIR)/src-files.list ; \
-	      fi; \
-	    done ; \
+	  ($(CD) $$d &&  \
+	    $(FIND) . $(SOURCE_FILES_filter) \
+	    -name '*.java' -print \
+	    >> $(ABS_TEMPDIR)/src-files.list ; \
 	  ) ; \
 	  if [ -f  $(ABS_TEMPDIR)/src-files.list ] ; then \
 	    ($(CD) $$d && $(TAR) cf - `$(CAT) $(ABS_TEMPDIR)/src-files.list`) \
--- a/make/common/shared/Compiler-gcc.gmk	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/common/shared/Compiler-gcc.gmk	Fri Aug 24 09:29:17 2012 +0100
@@ -57,7 +57,9 @@
   CC             = $(COMPILER_PATH)gcc
   CPP            = $(COMPILER_PATH)gcc -E
   # statically link libstdc++ before C++ ABI is stablized on Linux
-  STATIC_CXX     = true
+  ifneq ($(STATIC_CXX),false)
+    STATIC_CXX     = true
+  endif
   ifeq ($(STATIC_CXX),true)
     # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
     # We need to use gcc to statically link the C++ runtime. gcc and g++ use
--- a/make/common/shared/Defs-linux.gmk	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/common/shared/Defs-linux.gmk	Fri Aug 24 09:29:17 2012 +0100
@@ -129,6 +129,11 @@
 BUILD_HEADLESS = true
 LIBM=-lm
 
+# Set ZLIB_LIBS if not already set
+ifeq ("$(ZLIB_LIBS)", "")
+  ZLIB_LIBS=-lz
+endif
+
 # GCC29_COMPILER_PATH: is the path to where the gcc 2.9 compiler is installed
 #  NOTE: Must end with / so that it could be empty, allowing PATH usage.
 ifdef ALT_GCC29_COMPILER_PATH
--- a/make/common/shared/Defs-macosx.gmk	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/common/shared/Defs-macosx.gmk	Fri Aug 24 09:29:17 2012 +0100
@@ -143,6 +143,11 @@
   _CUPS_HEADERS_PATH=$(PACKAGE_PATH)/include
 endif
 
+# Set ZLIB_LIBS if not already set
+ifeq ("$(ZLIB_LIBS)", "")
+  ZLIB_LIBS=-lz
+endif
+
 # Import JDK images allow for partial builds, components not built are
 #    imported (or copied from) these import areas when needed.
 
--- a/make/common/shared/Defs-solaris.gmk	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/common/shared/Defs-solaris.gmk	Fri Aug 24 09:29:17 2012 +0100
@@ -140,6 +140,11 @@
 
 _CUPS_HEADERS_PATH=/opt/sfw/cups/include
 
+# Set ZLIB_LIBS if not already set
+ifeq ("$(ZLIB_LIBS)", "")
+  ZLIB_LIBS=-lz
+endif
+
 # Import JDK images allow for partial builds, components not built are
 #    imported (or copied from) these import areas when needed.
 
--- a/make/common/shared/Defs.gmk	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/common/shared/Defs.gmk	Fri Aug 24 09:29:17 2012 +0100
@@ -223,7 +223,7 @@
 
 # Default names
 ifdef OPENJDK
-  LAUNCHER_NAME = openjdk
+  LAUNCHER_NAME = java
   PRODUCT_NAME = OpenJDK
   PRODUCT_SUFFIX = Runtime Environment
   JDK_RC_PLATFORM_NAME = Platform
--- a/make/common/shared/Sanity.gmk	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/common/shared/Sanity.gmk	Fri Aug 24 09:29:17 2012 +0100
@@ -95,6 +95,10 @@
       echo "RedHat"; \
     elif [ -f /etc/SuSE-release ] ; then \
       echo "SuSE"; \
+    elif [ -f /etc/gentoo-release ] ; then \
+      echo "Gentoo"; \
+    elif [ -f /etc/debian_version ] ; then \
+      echo "Debian"; \
     elif [ -f /etc/lsb-release ] ; then \
       $(EGREP) DISTRIB_ID /etc/lsb-release | $(SED) -e 's@.*DISTRIB_ID=\(.*\)@\1@'; \
     else \
@@ -103,6 +107,10 @@
   OS_VARIANT_VERSION := $(shell \
     if [ "$(OS_VARIANT_NAME)" = "Fedora" ] ; then \
       $(CAT) /etc/fedora-release | $(HEAD) -1 | $(NAWK) '{ print $$3; }' ; \
+    elif [ "$(OS_VARIANT_NAME)" = "Gentoo" ] ; then \
+      $(CAT) /etc/gentoo-release | $(HEAD) -1 | $(NAWK) '{ print $$5; }' ; \
+    elif [ "$(OS_VARIANT_NAME)" = "Debian" ] ; then \
+      $(CAT) /etc/debian_version ; \
     elif [ -f /etc/lsb-release ] ; then \
       $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \
     fi)
--- a/make/java/jli/Makefile	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/java/jli/Makefile	Fri Aug 24 09:29:17 2012 +0100
@@ -46,6 +46,8 @@
 
 ifneq ($(SYSTEM_ZLIB),true)
   ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+else # SYSTEM_ZLIB
+  OTHER_CFLAGS += $(ZLIB_CFLAGS)
 endif #SYSTEM_ZLIB
 LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
 
@@ -162,7 +164,7 @@
 ifneq ($(SYSTEM_ZLIB),true)
   OTHER_INCLUDES += -I$(ZIP_SRC)
 else # !SYSTEM_ZLIB
-  LDLIBS += -lz
+  LDLIBS += $(ZLIB_LIBS)
 endif # SYSTEM_ZLIB
 
 #
--- a/make/java/version/Makefile	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/java/version/Makefile	Fri Aug 24 09:29:17 2012 +0100
@@ -39,7 +39,12 @@
 	$(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \
 	    -e 's/@@java_version@@/$(RELEASE)/g' \
 	    -e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
+	    -e 's/@@jdk_derivative_name@@/$(JDK_DERIVATIVE_NAME)/g' \
+	    -e 's/@@distro_name@@/$(DISTRO_NAME)/g' \
+	    -e 's/@@distro_package_version@@/$(DISTRO_PACKAGE_VERSION)/g' \
 	    -e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
+	    -e 's/@@jdk_revid@@/$(JDK_REVID)/g' \
+	    -e 's/@@hotspot_revid@@/$(HOTSPOT_REVID)/g' \
 	$< > $@.temp
 	@$(MV) $@.temp $@
 
--- a/make/java/zip/Makefile	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/java/zip/Makefile	Fri Aug 24 09:29:17 2012 +0100
@@ -56,6 +56,10 @@
   endif
 endif
 
+ifeq ($(SYSTEM_ZLIB),true)
+  OTHER_CFLAGS += $(ZLIB_CFLAGS)
+endif
+
 #
 # Library to compile.
 #
@@ -90,7 +94,7 @@
 # Link to JVM library for JVM_Zip* functions
 #
 ifeq ($(SYSTEM_ZLIB),true)
-OTHER_LDLIBS = -lz
+OTHER_LDLIBS = $(ZLIB_LIBS)
 else
 OTHER_LDLIBS = $(JVMLIB)
 endif
--- a/make/jdk_generic_profile.sh	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/jdk_generic_profile.sh	Fri Aug 24 09:29:17 2012 +0100
@@ -2,6 +2,7 @@
 
 #
 # Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2011 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -378,3 +379,43 @@
     export LLVM_LIBS
   fi
 fi
+
+# Export variables for system zlib
+# ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
+# link against zlib
+pkgconfig=$(which pkg-config 2>/dev/null)
+if [ -x "${pkgconfig}" ] ; then
+  if [ "${ZLIB_CFLAGS}" = "" ] ; then
+    ZLIB_CFLAGS=$("${pkgconfig}" --cflags zlib)
+  fi
+  if [ "${ZLIB_LIBS}" = "" ] ; then
+    ZLIB_LIBS=$("${pkgconfig}" --libs zlib)
+  fi
+fi
+if [ "${ZLIB_LIBS}" = "" ] ; then
+    ZLIB_LIBS="-lz"
+fi
+export ZLIB_CFLAGS
+export ZLIB_LIBS
+
+# Export variables for system LCMS
+# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
+# link against lcms2
+pkgconfig=$(which pkg-config 2>/dev/null)
+if [ -x "${pkgconfig}" ] ; then
+  if [ "${LCMS_CFLAGS}" = "" ] ; then
+    LCMS_CFLAGS=$("${pkgconfig}" --cflags lcms2)
+  fi
+  if [ "${LCMS_LIBS}" = "" ] ; then
+    LCMS_LIBS=$("${pkgconfig}" --libs lcms2)
+  fi
+fi
+if [ "${LCMS_LIBS}" = "" ] ; then
+    LIBFFI_LIBS="-llcms2"
+fi
+export LCMS_CFLAGS
+export LCMS_LIBS
+
+# IcedTea defaults; use system libraries
+export USE_SYSTEM_LCMS=true
+export SYSTEM_ZLIB=true
--- a/make/sun/cmm/lcms/FILES_c_unix.gmk	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/sun/cmm/lcms/FILES_c_unix.gmk	Fri Aug 24 09:29:17 2012 +0100
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2011 Red Hat, Inc.
 # 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 +24,7 @@
 # questions.
 #
 
+ifndef USE_SYSTEM_LCMS
 FILES_c = \
     cmscam02.c \
     cmscgats.c \
@@ -47,5 +49,8 @@
     cmstypes.c \
     cmsvirt.c \
     cmswtpnt.c \
-    cmsxform.c \
+    cmsxform.c
+endif
+
+FILES_c += \
     LCMS.c
--- a/make/sun/cmm/lcms/Makefile	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/sun/cmm/lcms/Makefile	Fri Aug 24 09:29:17 2012 +0100
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2011 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,7 +26,7 @@
 
 BUILDDIR = ../../..
 PACKAGE = sun.java2d.cmm.lcms
-LIBRARY = lcms
+LIBRARY = javalcms
 PRODUCT = sun
 
 include $(BUILDDIR)/common/Defs.gmk
@@ -94,11 +95,12 @@
 
 else
 ifeq ($(PLATFORM), macosx)
-OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/xawt
+OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/xawt $(LCMS_LIBS)
 else
-OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt
+OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt $(LCMS_LIBS)
 endif
 CPPFLAGS += -I$(SHARE_SRC)/native/sun/java2d \
-            -I$(SHARE_SRC)/native/sun/awt/debug
+            -I$(SHARE_SRC)/native/sun/awt/debug \
+	    $(LCMS_CFLAGS)
 endif
 
--- a/make/sun/net/FILES_java.gmk	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/sun/net/FILES_java.gmk	Fri Aug 24 09:29:17 2012 +0100
@@ -24,6 +24,7 @@
 #
 
 FILES_java = \
+	sun/net/ApplicationProxy.java \
 	sun/net/InetAddressCachePolicy.java \
 	sun/net/URLCanonicalizer.java \
 	sun/net/NetworkClient.java \
--- a/make/sun/splashscreen/Makefile	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/sun/splashscreen/Makefile	Fri Aug 24 09:29:17 2012 +0100
@@ -126,7 +126,8 @@
 ifneq ($(SYSTEM_ZLIB),true)
   CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 else
-  OTHER_LDLIBS += -lz
+  OTHER_CFLAGS += $(ZLIB_CFLAGS)
+  OTHER_LDLIBS += $(ZLIB_LIBS)
 endif
 
 # Shun the less than portable MMX assembly code in pnggccrd.c,
--- a/make/tools/generate_nimbus/Makefile	Thu Aug 16 11:43:24 2012 -0700
+++ b/make/tools/generate_nimbus/Makefile	Fri Aug 24 09:29:17 2012 +0100
@@ -44,6 +44,7 @@
 SOURCE_FILES    = Generator.java \
                   ObjectFactory.java \
                   Paint.java \
+		  Shape.java \
                   SynthModel.java \
                   UIDefault.java \
                   UIStyle.java
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java	Fri Aug 24 09:29:17 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2009, 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,7 +27,6 @@
 
 import java.awt.*;
 import java.lang.reflect.*;
-import java.security.*;
 import java.util.*;
 import javax.swing.*;
 import javax.swing.plaf.*;
@@ -908,7 +907,7 @@
 
     static class GTKStockIconInfo {
         private static Map<String,Integer> ICON_TYPE_MAP;
-        private static final Object ICON_SIZE_KEY = new StringBuffer("IconSize");
+        private static final Object ICON_SIZE_KEY = new Object(); // IconSize
 
         private static Dimension[] getIconSizesMap() {
             AppContext appContext = AppContext.getAppContext();
--- a/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java	Fri Aug 24 09:29:17 2012 +0100
@@ -295,6 +295,8 @@
         try {
             Properties p = new Properties();
             p.load(fin);
+	    // Properties.load does a buffered read so we don't need to wrap
+	    // the FileInputStream in a BufferedInputStream.
             return p;
         } finally {
             fin.close();
--- a/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java	Fri Aug 24 09:29:17 2012 +0100
@@ -84,7 +84,7 @@
         if (tmp != null) {
             version = Integer.parseInt((String)tmp);
         } else {
-            version = Context.VERSION_1_8;
+            version = Context.VERSION_DEFAULT;
         }
         return version;
     }
--- a/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java	Fri Aug 24 09:29:17 2012 +0100
@@ -53,16 +53,18 @@
     }
 
     public Object getParameter(String key) {
+        String implVer = ScriptRuntime.getMessage0("implementation.version");
+        String[] parts = implVer.split(" ");
         if (key.equals(ScriptEngine.NAME)) {
             return "javascript";
         } else if (key.equals(ScriptEngine.ENGINE)) {
-            return "Mozilla Rhino";
+            return parts[0];
         } else if (key.equals(ScriptEngine.ENGINE_VERSION)) {
-            return "1.7 release 3 PRERELEASE";
+            return implVer;
         } else if (key.equals(ScriptEngine.LANGUAGE)) {
             return "ECMAScript";
         } else if (key.equals(ScriptEngine.LANGUAGE_VERSION)) {
-            return "1.8";
+            return parts[1];
         } else if (key.equals("THREADING")) {
             return "MULTITHREADED";
         } else {
--- a/src/share/classes/java/awt/color/ICC_Profile.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/java/awt/color/ICC_Profile.java	Fri Aug 24 09:29:17 2012 +0100
@@ -1822,7 +1822,7 @@
                     new StringTokenizer(path, File.pathSeparator);
                 while (st.hasMoreTokens() && ((f == null) || (!f.isFile()))) {
                     dir = st.nextToken();
-                        fullPath = dir + File.separatorChar + fileName;
+                    fullPath = dir + File.separatorChar + fileName;
                     f = new File(fullPath);
                     if (!isChildOf(f, dir)) {
                         f = null;
@@ -1837,7 +1837,7 @@
                     new StringTokenizer(path, File.pathSeparator);
                 while (st.hasMoreTokens() && ((f == null) || (!f.isFile()))) {
                     dir = st.nextToken();
-                        fullPath = dir + File.separatorChar + fileName;
+                    fullPath = dir + File.separatorChar + fileName;
                     f = new File(fullPath);
                 }
             }
--- a/src/share/classes/java/net/SocksSocketImpl.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/java/net/SocksSocketImpl.java	Fri Aug 24 09:29:17 2012 +0100
@@ -67,6 +67,7 @@
             // Use getHostString() to avoid reverse lookups
             server = ad.getHostString();
             serverPort = ad.getPort();
+            applicationSetProxy = true;
         }
     }
 
@@ -166,8 +167,7 @@
                 userName = pw.getUserName();
                 password = new String(pw.getPassword());
             } else {
-                userName = java.security.AccessController.doPrivileged(
-                        new sun.security.action.GetPropertyAction("user.name"));
+                userName = getUserName();
             }
             if (userName == null)
                 return false;
--- a/src/share/classes/java/security/Policy.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/java/security/Policy.java	Fri Aug 24 09:29:17 2012 +0100
@@ -33,7 +33,6 @@
 import sun.security.util.Debug;
 import sun.security.util.SecurityConstants;
 
-
 /**
  * A Policy object is responsible for determining whether code executing
  * in the Java runtime environment has permission to perform a
--- a/src/share/classes/javax/swing/JComponent.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/JComponent.java	Fri Aug 24 09:29:17 2012 +0100
@@ -27,22 +27,15 @@
 
 import java.util.HashSet;
 import java.util.Hashtable;
-import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Vector;
 import java.util.EventListener;
 import java.util.Set;
-import java.util.Map;
-import java.util.HashMap;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.awt.image.VolatileImage;
-import java.awt.Graphics2D;
 import java.awt.peer.LightweightPeer;
-import java.awt.dnd.DropTarget;
-import java.awt.font.FontRenderContext;
 import java.beans.PropertyChangeListener;
 import java.beans.VetoableChangeListener;
 import java.beans.VetoableChangeSupport;
@@ -224,8 +217,7 @@
      * indicates the EDT is calling into the InputVerifier from the
      * returned component.
      */
-    private static final Object INPUT_VERIFIER_SOURCE_KEY =
-            new StringBuilder("InputVerifierSourceKey");
+    private static final Object INPUT_VERIFIER_SOURCE_KEY = new Object(); // InputVerifierSourceKey
 
     /* The following fields support set methods for the corresponding
      * java.awt.Component properties.
@@ -373,8 +365,7 @@
     private static final String defaultLocale = "JComponent.defaultLocale";
 
     private static Component componentObtainingGraphicsFrom;
-    private static Object componentObtainingGraphicsFromLock = new
-            StringBuilder("componentObtainingGraphicsFrom");
+    private static Object componentObtainingGraphicsFromLock = new Object(); // componentObtainingGraphicsFrom
 
     /**
      * AA text hints.
--- a/src/share/classes/javax/swing/JDialog.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/JDialog.java	Fri Aug 24 09:29:17 2012 +0100
@@ -103,8 +103,7 @@
      * Key into the AppContext, used to check if should provide decorations
      * by default.
      */
-    private static final Object defaultLookAndFeelDecoratedKey =
-            new StringBuffer("JDialog.defaultLookAndFeelDecorated");
+    private static final Object defaultLookAndFeelDecoratedKey = new Object(); // JDialog.defaultLookAndFeelDecorated
 
     private int defaultCloseOperation = HIDE_ON_CLOSE;
 
--- a/src/share/classes/javax/swing/JEditorPane.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/JEditorPane.java	Fri Aug 24 09:29:17 2012 +0100
@@ -27,12 +27,10 @@
 import sun.swing.SwingUtilities2;
 
 import java.awt.*;
-import java.awt.event.*;
 import java.lang.reflect.*;
 import java.net.*;
 import java.util.*;
 import java.io.*;
-import java.util.*;
 
 import javax.swing.plaf.*;
 import javax.swing.text.*;
@@ -1533,12 +1531,9 @@
     /*
      * Private AppContext keys for this class's static variables.
      */
-    private static final Object kitRegistryKey =
-        new StringBuffer("JEditorPane.kitRegistry");
-    private static final Object kitTypeRegistryKey =
-        new StringBuffer("JEditorPane.kitTypeRegistry");
-    private static final Object kitLoaderRegistryKey =
-        new StringBuffer("JEditorPane.kitLoaderRegistry");
+    private static final Object kitRegistryKey = new Object(); // JEditorPane.kitRegistry
+    private static final Object kitTypeRegistryKey = new Object(); // JEditorPane.kitTypeRegistry
+    private static final Object kitLoaderRegistryKey = new Object(); // JEditorPane.kitLoaderRegistry
 
     /**
      * @see #getUIClassID
--- a/src/share/classes/javax/swing/JFrame.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/JFrame.java	Fri Aug 24 09:29:17 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2009, 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,11 +26,6 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.beans.PropertyChangeListener;
-import java.util.Locale;
-import java.util.Vector;
-import java.io.Serializable;
-
 import javax.accessibility.*;
 
 
@@ -130,8 +125,7 @@
      * Key into the AppContext, used to check if should provide decorations
      * by default.
      */
-    private static final Object defaultLookAndFeelDecoratedKey =
-            new StringBuffer("JFrame.defaultLookAndFeelDecorated");
+    private static final Object defaultLookAndFeelDecoratedKey = new Object(); // JFrame.defaultLookAndFeelDecorated
 
     private int defaultCloseOperation = HIDE_ON_CLOSE;
 
--- a/src/share/classes/javax/swing/JInternalFrame.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/JInternalFrame.java	Fri Aug 24 09:29:17 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2009, 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
@@ -38,7 +38,6 @@
 
 import java.io.ObjectOutputStream;
 import java.io.IOException;
-import java.lang.StringBuilder;
 import java.beans.PropertyChangeListener;
 import sun.awt.AppContext;
 import sun.swing.SwingUtilities2;
@@ -222,8 +221,7 @@
     /** Constrained property name indicating that the internal frame is iconified. */
     public final static String IS_ICON_PROPERTY = "icon";
 
-    private static final Object PROPERTY_CHANGE_LISTENER_KEY =
-        new StringBuilder("InternalFramePropertyChangeListener");
+    private static final Object PROPERTY_CHANGE_LISTENER_KEY = new Object(); // InternalFramePropertyChangeListener
 
     private static void addPropertyChangeListenerIfNecessary() {
         if (AppContext.getAppContext().get(PROPERTY_CHANGE_LISTENER_KEY) ==
--- a/src/share/classes/javax/swing/JPopupMenu.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/JPopupMenu.java	Fri Aug 24 09:29:17 2012 +0100
@@ -33,20 +33,15 @@
 import java.io.Serializable;
 import java.beans.*;
 
-import java.util.Locale;
 import java.util.Vector;
-import java.util.Hashtable;
 import javax.accessibility.*;
 import javax.swing.plaf.PopupMenuUI;
-import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicComboPopup;
 import javax.swing.event.*;
 
 import sun.awt.SunToolkit;
 import sun.security.util.SecurityConstants;
 
-import java.applet.Applet;
-
 /**
  * An implementation of a popup menu -- a small window that pops up
  * and displays a series of choices. A <code>JPopupMenu</code> is used for the
@@ -95,8 +90,7 @@
     /**
      * Key used in AppContext to determine if light way popups are the default.
      */
-    private static final Object defaultLWPopupEnabledKey =
-        new StringBuffer("JPopupMenu.defaultLWPopupEnabledKey");
+    private static final Object defaultLWPopupEnabledKey = new Object(); // JPopupMenu.defaultLWPopupEnabledKey
 
     /** Bug#4425878-Property javax.swing.adjustPopupLocationToFit introduced */
     static boolean popupPostionFixDisabled = false;
--- a/src/share/classes/javax/swing/MenuSelectionManager.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/MenuSelectionManager.java	Fri Aug 24 09:29:17 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2009, 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
@@ -44,8 +44,7 @@
     private static final boolean VERBOSE = false; // show reuse hits/misses
     private static final boolean DEBUG =   false;  // show bad params, misc.
 
-    private static final StringBuilder MENU_SELECTION_MANAGER_KEY =
-                       new StringBuilder("javax.swing.MenuSelectionManager");
+    private static final Object MENU_SELECTION_MANAGER_KEY = new Object(); // javax.swing.MenuSelectionManager
 
     /**
      * Returns the default menu selection manager.
--- a/src/share/classes/javax/swing/PopupFactory.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/PopupFactory.java	Fri Aug 24 09:29:17 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2009, 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,8 +61,7 @@
      * <code>AppContext</code>. This is the key used in the
      * <code>AppContext</code> to locate the <code>PopupFactory</code>.
      */
-    private static final Object SharedInstanceKey =
-        new StringBuffer("PopupFactory.SharedInstanceKey");
+    private static final Object SharedInstanceKey = new Object(); // PopupFactory.SharedInstanceKey
 
     /**
      * Max number of items to store in any one particular cache.
@@ -291,8 +290,7 @@
      * Popup implementation that uses a Window as the popup.
      */
     private static class HeavyWeightPopup extends Popup {
-        private static final Object heavyWeightPopupCacheKey =
-                 new StringBuffer("PopupFactory.heavyWeightPopupCache");
+        private static final Object heavyWeightPopupCacheKey = new Object(); // PopupFactory.heavyWeightPopupCache
 
         /**
          * Returns either a new or recycled <code>Popup</code> containing
@@ -638,8 +636,7 @@
      * Popup implementation that uses a JPanel as the popup.
      */
     private static class LightWeightPopup extends ContainerPopup {
-        private static final Object lightWeightPopupCacheKey =
-                         new StringBuffer("PopupFactory.lightPopupCache");
+        private static final Object lightWeightPopupCacheKey = new Object(); // PopupFactory.lightPopupCache
 
         /**
          * Returns a light weight <code>Popup</code> implementation. If
@@ -790,8 +787,7 @@
      * Popup implementation that uses a Panel as the popup.
      */
     private static class MediumWeightPopup extends ContainerPopup {
-        private static final Object mediumWeightPopupCacheKey =
-                             new StringBuffer("PopupFactory.mediumPopupCache");
+        private static final Object mediumWeightPopupCacheKey = new Object(); // PopupFactory.mediumPopupCache
 
         /** Child of the panel. The contents are added to this. */
         private JRootPane rootPane;
--- a/src/share/classes/javax/swing/SwingUtilities.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/SwingUtilities.java	Fri Aug 24 09:29:17 2012 +0100
@@ -33,9 +33,6 @@
 import java.awt.event.*;
 import java.awt.dnd.DropTarget;
 
-import java.util.Vector;
-import java.util.Hashtable;
-
 import java.lang.reflect.*;
 
 import javax.accessibility.*;
@@ -1754,8 +1751,7 @@
 
 
     // Don't use String, as it's not guaranteed to be unique in a Hashtable.
-    private static final Object sharedOwnerFrameKey =
-       new StringBuffer("SwingUtilities.sharedOwnerFrame");
+    private static final Object sharedOwnerFrameKey = new Object(); // SwingUtilities.sharedOwnerFrame
 
     static class SharedOwnerFrame extends Frame implements WindowListener {
         public void addNotify() {
--- a/src/share/classes/javax/swing/SwingWorker.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/SwingWorker.java	Fri Aug 24 09:29:17 2012 +0100
@@ -811,7 +811,7 @@
         return executorService;
     }
 
-    private static final Object DO_SUBMIT_KEY = new StringBuilder("doSubmit");
+    private static final Object DO_SUBMIT_KEY = new Object(); // doSubmit
     private static AccumulativeRunnable<Runnable> getDoSubmit() {
         synchronized (DO_SUBMIT_KEY) {
             final AppContext appContext = AppContext.getAppContext();
--- a/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java	Fri Aug 24 09:29:17 2012 +0100
@@ -174,11 +174,9 @@
     private Dimension cachedDisplaySize = new Dimension( 0, 0 );
 
     // Key used for lookup of the DefaultListCellRenderer in the AppContext.
-    private static final Object COMBO_UI_LIST_CELL_RENDERER_KEY =
-                        new StringBuffer("DefaultListCellRendererKey");
+    private static final Object COMBO_UI_LIST_CELL_RENDERER_KEY = new Object(); // DefaultListCellRendererKey
 
-    static final StringBuffer HIDE_POPUP_KEY
-                  = new StringBuffer("HidePopupKey");
+    static final Object HIDE_POPUP_KEY = new Object(); // HidePopupKey
 
     /**
      * Whether or not all cells have the same baseline.
--- a/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Fri Aug 24 09:29:17 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2009, 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,8 +56,7 @@
  */
 public class BasicListUI extends ListUI
 {
-    private static final StringBuilder BASELINE_COMPONENT_KEY =
-        new StringBuilder("List.baselineComponent");
+    private static final Object BASELINE_COMPONENT_KEY = new Object(); // List.baselineComponent
 
     protected JList list = null;
     protected CellRendererPane rendererPane;
--- a/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java	Fri Aug 24 09:29:17 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2009, 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
@@ -28,26 +28,18 @@
 import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-import javax.swing.border.*;
 
 import java.applet.Applet;
 
 import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
 import java.awt.KeyboardFocusManager;
 import java.awt.Window;
 import java.awt.event.*;
 import java.awt.AWTEvent;
 import java.awt.Toolkit;
 
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
-
 import java.util.*;
 
-import sun.swing.DefaultLookup;
 import sun.swing.UIAction;
 
 import sun.awt.AppContext;
@@ -61,10 +53,8 @@
  * @author Arnaud Weber
  */
 public class BasicPopupMenuUI extends PopupMenuUI {
-    static final StringBuilder MOUSE_GRABBER_KEY = new StringBuilder(
-                   "javax.swing.plaf.basic.BasicPopupMenuUI.MouseGrabber");
-    static final StringBuilder MENU_KEYBOARD_HELPER_KEY = new StringBuilder(
-                   "javax.swing.plaf.basic.BasicPopupMenuUI.MenuKeyboardHelper");
+    static final Object MOUSE_GRABBER_KEY = new Object(); // javax.swing.plaf.basic.BasicPopupMenuUI.MouseGrabber
+    static final Object MENU_KEYBOARD_HELPER_KEY = new Object(); // javax.swing.plaf.basic.BasicPopupMenuUI.MenuKeyboardHelper
 
     protected JPopupMenu popupMenu = null;
     private transient PopupMenuListener popupMenuListener = null;
--- a/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Fri Aug 24 09:29:17 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2009, 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,16 +27,11 @@
 
 import java.awt.*;
 import java.awt.datatransfer.*;
-import java.awt.dnd.*;
 import java.awt.event.*;
 import java.util.Enumeration;
-import java.util.EventObject;
-import java.util.Hashtable;
-import java.util.TooManyListenersException;
 import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.plaf.*;
-import javax.swing.text.*;
 import javax.swing.table.*;
 import javax.swing.plaf.basic.DragRecognitionSupport.BeforeDrag;
 import sun.swing.SwingUtilities2;
@@ -56,8 +51,7 @@
  */
 public class BasicTableUI extends TableUI
 {
-    private static final StringBuilder BASELINE_COMPONENT_KEY =
-        new StringBuilder("Table.baselineComponent");
+    private static final Object BASELINE_COMPONENT_KEY = new Object(); // Table.baselineComponent
 
 //
 // Instance Variables
--- a/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Fri Aug 24 09:29:17 2012 +0100
@@ -57,8 +57,7 @@
 
 public class BasicTreeUI extends TreeUI
 {
-    private static final StringBuilder BASELINE_COMPONENT_KEY =
-        new StringBuilder("Tree.baselineComponent");
+    private static final Object BASELINE_COMPONENT_KEY = new Object(); // Tree.baselineComponent
 
     // Old actions forward to an instance of this.
     static private final Actions SHARED_ACTION = new Actions();
--- a/src/share/classes/javax/swing/plaf/synth/ImagePainter.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/plaf/synth/ImagePainter.java	Fri Aug 24 09:29:17 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2009, 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
@@ -41,8 +41,7 @@
  * @author Scott Violet
  */
 class ImagePainter extends SynthPainter {
-    private static final StringBuffer CACHE_KEY =
-                               new StringBuffer("SynthCacheKey");
+    private static final Object CACHE_KEY = new Object(); // SynthCacheKey
 
     private Image image;
     private Insets sInsets;
--- a/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java	Fri Aug 24 09:29:17 2012 +0100
@@ -73,8 +73,7 @@
     /**
      * AppContext key to get the current SynthStyleFactory.
      */
-    private static final Object STYLE_FACTORY_KEY =
-                  new StringBuffer("com.sun.java.swing.plaf.gtk.StyleCache");
+    private static final Object STYLE_FACTORY_KEY = new Object(); // com.sun.java.swing.plaf.gtk.StyleCache
 
     /**
      * AppContext key to get selectedUI.
--- a/src/share/classes/javax/swing/text/JTextComponent.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/javax/swing/text/JTextComponent.java	Fri Aug 24 09:29:17 2012 +0100
@@ -4053,8 +4053,7 @@
         return modifiers;
     }
 
-    private static final Object KEYMAP_TABLE =
-        new StringBuilder("JTextComponent_KeymapTable");
+    private static final Object KEYMAP_TABLE = new Object(); // JTextComponent_KeymapTable
 
     //
     // member variables used for on-the-spot input method
@@ -4387,8 +4386,7 @@
         }
     }
 
-    private static final Object FOCUSED_COMPONENT =
-        new StringBuilder("JTextComponent_FocusedComponent");
+    private static final Object FOCUSED_COMPONENT = new Object(); // JTextComponent_FocusedComponent
 
     /**
      * The default keymap that will be shared by all
--- a/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java	Fri Aug 24 09:29:17 2012 +0100
@@ -94,8 +94,6 @@
                     "Setting outputLength from HMACParameterSpec to: "
                     + outputLength);
             }
-        } else {
-            outputLength = -1;
         }
     }
 
--- a/src/share/classes/sun/applet/AppletPanel.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/sun/applet/AppletPanel.java	Fri Aug 24 09:29:17 2012 +0100
@@ -67,7 +67,7 @@
     /**
      * The applet (if loaded).
      */
-    Applet applet;
+    protected Applet applet;
 
     /**
      * Applet will allow initialization.  Should be
@@ -161,7 +161,8 @@
      * Creates a thread to run the applet. This method is called
      * each time an applet is loaded and reloaded.
      */
-    synchronized void createAppletThread() {
+	//Overridden by NetxPanel.
+    protected synchronized void createAppletThread() {
         // Create a thread group for the applet, and start a new
         // thread to load the applet.
         String nm = "applet-" + getCode();
@@ -305,7 +306,7 @@
     /**
      * Get an event from the queue.
      */
-    synchronized AppletEvent getNextEvent() throws InterruptedException {
+    protected synchronized AppletEvent getNextEvent() throws InterruptedException {
         while (queue == null || queue.isEmpty()) {
             wait();
         }
@@ -694,7 +695,8 @@
      * applet event processing so that it can be gracefully interrupted from
      * things like HotJava.
      */
-    private void runLoader() {
+	//Overridden by NetxPanel.
+    protected void runLoader() {
         if (status != APPLET_DISPOSE) {
             showAppletStatus("notdisposed");
             return;
--- a/src/share/classes/sun/applet/AppletViewerPanel.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/sun/applet/AppletViewerPanel.java	Fri Aug 24 09:29:17 2012 +0100
@@ -42,25 +42,25 @@
  *
  * @author      Arthur van Hoff
  */
-class AppletViewerPanel extends AppletPanel {
+public class AppletViewerPanel extends AppletPanel {
 
     /* Are we debugging? */
-    static boolean debug = false;
+    protected static boolean debug = false;
 
     /**
      * The document url.
      */
-    URL documentURL;
+    protected URL documentURL;
 
     /**
      * The base url.
      */
-    URL baseURL;
+    protected URL baseURL;
 
     /**
      * The attributes of the applet.
      */
-    Hashtable atts;
+    protected Hashtable<String,String> atts;
 
     /*
      * JDK 1.1 serialVersionUID
@@ -70,7 +70,7 @@
     /**
      * Construct an applet viewer and start the applet.
      */
-    AppletViewerPanel(URL documentURL, Hashtable atts) {
+    protected AppletViewerPanel(URL documentURL, Hashtable<String,String> atts) {
         this.documentURL = documentURL;
         this.atts = atts;
 
@@ -106,7 +106,7 @@
      * Get an applet parameter.
      */
     public String getParameter(String name) {
-        return (String)atts.get(name.toLowerCase());
+        return atts.get(name.toLowerCase());
     }
 
     /**
@@ -202,12 +202,12 @@
         return (AppletContext)getParent();
     }
 
-    static void debug(String s) {
+    protected static void debug(String s) {
         if(debug)
             System.err.println("AppletViewerPanel:::" + s);
     }
 
-    static void debug(String s, Throwable t) {
+    protected static void debug(String s, Throwable t) {
         if(debug) {
             t.printStackTrace();
             debug(s);
--- a/src/share/classes/sun/java2d/cmm/lcms/LCMS.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/sun/java2d/cmm/lcms/LCMS.java	Fri Aug 24 09:29:17 2012 +0100
@@ -93,7 +93,7 @@
                      * disposer frameworks
                      */
                     System.loadLibrary("awt");
-                    System.loadLibrary("lcms");
+                    System.loadLibrary("javalcms");
                     return null;
                 }
             }
--- a/src/share/classes/sun/misc/SharedSecrets.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/sun/misc/SharedSecrets.java	Fri Aug 24 09:29:17 2012 +0100
@@ -136,9 +136,10 @@
 
     public static JavaSecurityProtectionDomainAccess
         getJavaSecurityProtectionDomainAccess() {
-            if (javaSecurityProtectionDomainAccess == null)
-                unsafe.ensureClassInitialized(ProtectionDomain.class);
-            return javaSecurityProtectionDomainAccess;
+        if (javaSecurityProtectionDomainAccess == null)
+            unsafe.ensureClassInitialized(ProtectionDomain.class);
+
+        return javaSecurityProtectionDomainAccess;
     }
 
     public static void setJavaSecurityAccess(JavaSecurityAccess jsa) {
--- a/src/share/classes/sun/misc/Version.java.template	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/sun/misc/Version.java.template	Fri Aug 24 09:29:17 2012 +0100
@@ -36,11 +36,23 @@
         "@@java_version@@";
 
     private static final String java_runtime_name =
-	"@@java_runtime_name@@";
- 
+        "@@java_runtime_name@@";
+
     private static final String java_runtime_version =
         "@@java_runtime_version@@";
 
+    private static final String jdk_derivative_name =
+        "@@jdk_derivative_name@@";
+
+    private static final String distro_name =
+        "@@distro_name@@";
+
+    private static final String distro_package_version =
+        "@@distro_package_version@@";
+
+    private static final String jdk_revid =
+        "@@jdk_revid@@";
+
     static {
         init();
     }
@@ -90,26 +102,44 @@
         boolean isHeadless = false;
 
         /* Report that we're running headless if the property is true */
-	String headless = System.getProperty("java.awt.headless");
-	if ( (headless != null) && (headless.equalsIgnoreCase("true")) ) {
+        String headless = System.getProperty("java.awt.headless");
+        if ( (headless != null) && (headless.equalsIgnoreCase("true")) ) {
             isHeadless = true;
-	} 
+        }
 
         /* First line: platform version. */
         ps.println(launcher_name + " version \"" + java_version + "\"");
 
-        /* Second line: runtime version (ie, libraries). */
-
-	ps.print(java_runtime_name + " (build " + java_runtime_version);
+        String java_vm_name    = System.getProperty("java.vm.name");
 
-	if (java_runtime_name.indexOf("Embedded") != -1 && isHeadless) {
-	    // embedded builds report headless state
-	    ps.print(", headless");
-	}
-	ps.println(')');
+        /* Second line: runtime version (ie, libraries). */
+        StringBuilder sb = new StringBuilder();
+        if (java_vm_name.toLowerCase().startsWith("cacao")) {
+            sb.append("IcedTea Runtime Environment");
+        } else {
+            sb.append(java_runtime_name);
+        }
+        if (jdk_derivative_name.length() > 0) {
+            sb.append(" (").append(jdk_derivative_name).append(")");
+        }
+        if (distro_package_version.length() > 0) {
+            sb.append(" (").append(distro_package_version).append(")");
+        } else {
+            sb.append(" (");
+            if (distro_name.length() > 0)
+                sb.append(distro_name).append(" ");
+            sb.append("build ").append(java_runtime_version);
+            if (jdk_revid.length() > 0)
+                sb.append("+").append(jdk_revid);
+            if (java_runtime_name.indexOf("Embedded") != -1 && isHeadless) {
+              // embedded builds report headless state
+              sb.append(", headless");
+            }
+            sb.append(")");
+        }
+        ps.println(sb.toString());
 
         /* Third line: JVM information. */
-        String java_vm_name    = System.getProperty("java.vm.name");
         String java_vm_version = System.getProperty("java.vm.version");
         String java_vm_info    = System.getProperty("java.vm.info");
         ps.println(java_vm_name + " (build " + java_vm_version + ", " +
--- a/src/share/classes/sun/security/provider/certpath/OCSP.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/sun/security/provider/certpath/OCSP.java	Fri Aug 24 09:29:17 2012 +0100
@@ -42,6 +42,7 @@
 import java.util.Map;
 
 import static sun.security.provider.certpath.OCSPResponse.*;
+import sun.misc.IOUtils;
 import sun.security.util.Debug;
 import sun.security.util.ObjectIdentifier;
 import sun.security.x509.AccessDescription;
--- a/src/share/classes/sun/security/util/ObjectIdentifier.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/sun/security/util/ObjectIdentifier.java	Fri Aug 24 09:29:17 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2009, 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
--- a/src/share/classes/sun/swing/DefaultLookup.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/sun/swing/DefaultLookup.java	Fri Aug 24 09:29:17 2012 +0100
@@ -47,8 +47,7 @@
     /**
      * Key used to store DefaultLookup for AppContext.
      */
-    private static final Object DEFAULT_LOOKUP_KEY = new
-                                        StringBuffer("DefaultLookup");
+    private static final Object DEFAULT_LOOKUP_KEY = new Object(); // DefaultLookup
     /**
      * Thread that last asked for a default.
      */
--- a/src/share/classes/sun/swing/SwingUtilities2.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/sun/swing/SwingUtilities2.java	Fri Aug 24 09:29:17 2012 +0100
@@ -31,14 +31,11 @@
 import static java.awt.RenderingHints.*;
 import java.awt.event.*;
 import java.awt.font.*;
-import java.awt.geom.*;
 import java.awt.print.PrinterGraphics;
-import java.text.Bidi;
 import java.text.AttributedCharacterIterator;
 import java.text.AttributedString;
 
 import javax.swing.*;
-import javax.swing.plaf.*;
 import javax.swing.text.Highlighter;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.DefaultHighlighter;
@@ -50,8 +47,6 @@
 import sun.swing.ImageIconUIResource;
 import sun.print.ProxyPrintGraphics;
 import sun.awt.*;
-import sun.security.action.GetPropertyAction;
-import sun.security.util.SecurityConstants;
 import java.io.*;
 import java.util.*;
 import sun.font.FontDesignMetrics;
@@ -76,8 +71,7 @@
      * The <code>AppContext</code> key for our one <code>LAFState</code>
      * instance.
      */
-    public static final Object LAF_STATE_KEY =
-            new StringBuffer("LookAndFeel State");
+    public static final Object LAF_STATE_KEY = new Object(); // LookAndFeel State
 
     // Maintain a cache of CACHE_SIZE fonts and the left side bearing
      // of the characters falling into the range MIN_CHAR_INDEX to
@@ -105,8 +99,7 @@
      * To avoid having this property persist between look and feels changes
      * the value of the property is set to null in JComponent.setUI
      */
-    public static final Object AA_TEXT_PROPERTY_KEY =
-                          new StringBuffer("AATextInfoPropertyKey");
+    public static final Object AA_TEXT_PROPERTY_KEY = new Object(); // AATextInfoPropertyKey
 
     /**
      * Attribute key for the content elements.  If it is set on an element, the
@@ -118,8 +111,7 @@
      * Used to tell a text component, being used as an editor for table
      * or tree, how many clicks it took to start editing.
      */
-    private static final StringBuilder SKIP_CLICK_COUNT =
-        new StringBuilder("skipClickCount");
+    private static final Object SKIP_CLICK_COUNT = new Object(); // skipClickCount
 
     /* Presently this class assumes default fractional metrics.
      * This may need to change to emulate future platform L&Fs.
@@ -179,8 +171,7 @@
      * Key used in client properties used to indicate that the
      * <code>ComponentUI</code> of the JComponent instance should be returned.
      */
-    public static final Object COMPONENT_UI_PROPERTY_KEY =
-                            new StringBuffer("ComponentUIPropertyKey");
+    public static final Object COMPONENT_UI_PROPERTY_KEY = new Object(); // ComponentUIPropertyKey
 
     /** Client Property key for the text maximal offsets for BasicMenuItemUI */
     public static final StringUIClientPropertyKey BASICMENUITEMUI_MAX_TEXT_OFFSET =
--- a/src/share/classes/sun/util/calendar/ZoneInfoFile.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/classes/sun/util/calendar/ZoneInfoFile.java	Fri Aug 24 09:29:17 2012 +0100
@@ -25,10 +25,12 @@
 
 package sun.util.calendar;
 
+import  java.io.BufferedInputStream;
 import  java.io.File;
 import  java.io.FileInputStream;
 import  java.io.FileNotFoundException;
 import  java.io.IOException;
+import  java.io.InputStream;
 import  java.lang.ref.SoftReference;
 import  java.nio.file.FileSystems;
 import  java.security.AccessController;
@@ -39,6 +41,7 @@
 import  java.util.HashMap;
 import  java.util.List;
 import  java.util.Map;
+import  java.util.Properties;
 
 /**
  * <code>ZoneInfoFile</code> reads Zone information files in the
@@ -478,9 +481,13 @@
     private static final String ziDir = AccessController.doPrivileged(
         new PrivilegedAction<String>() {
             public String run() {
-                String zi = System.getProperty("java.home") +
-                    File.separator + "lib" + File.separator + "zi";
+                String homeDir = System.getProperty("java.home");
+                String zi = homeDir + File.separator + "lib" +
+                  File.separator + "zi";
                 try {
+                    String otherDir = getZoneInfoDir(homeDir);
+                    if (otherDir != null)
+                        zi = otherDir;
                     zi = FileSystems.getDefault().getPath(zi).toRealPath().toString();
                 } catch(Exception e) {
                 }
@@ -488,6 +495,32 @@
             }
         });
 
+    private static String getZoneInfoDir(final String homeDir) {
+        try {
+            return AccessController.doPrivileged
+                (new PrivilegedExceptionAction<String>() {
+                    public String run() throws IOException {
+                        File f = new File(homeDir + File.separator + "lib" +
+                                          File.separator + "tz.properties");
+                        InputStream in = new FileInputStream(f);
+                        BufferedInputStream bin = new BufferedInputStream(in);
+                        Properties props = new Properties();
+                        props.load(bin);
+                        bin.close();
+                        String dir = props.getProperty("sun.zoneinfo.dir");
+                        if (dir == null)
+                            return null;
+                        File zim = new File(dir, "ZoneInfoMappings");
+                        if (zim.exists())
+                            return dir;
+                        return null;
+                    }
+                });
+        } catch (PrivilegedActionException e) {
+            return null;
+        }
+    }
+
     /**
      * Converts the given time zone ID to a platform dependent path
      * name. For example, "America/Los_Angeles" is converted to
--- a/src/share/lib/security/java.security-macosx	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/lib/security/java.security-macosx	Fri Aug 24 09:29:17 2012 +0100
@@ -146,7 +146,7 @@
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,apple.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,apple.
 
 #
 # List of comma-separated packages that start with or equal this string
--- a/src/share/native/com/sun/java/util/jar/pack/defines.h	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/native/com/sun/java/util/jar/pack/defines.h	Fri Aug 24 09:29:17 2012 +0100
@@ -93,7 +93,7 @@
 // bytes and byte arrays
 
 typedef unsigned int uint;
-#if !defined(MACOSX) || (defined(MACOSX) && defined(NO_ZLIB))
+#if defined(NO_ZLIB)
 #ifdef _LP64
 typedef unsigned int uLong; // Historical zlib, should be 32-bit.
 #else
--- a/src/share/native/com/sun/java/util/jar/pack/unpack.cpp	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/native/com/sun/java/util/jar/pack/unpack.cpp	Fri Aug 24 09:29:17 2012 +0100
@@ -2306,7 +2306,6 @@
 
   method_descr.readData(method_count);
   read_attrs(ATTR_CONTEXT_METHOD, method_count);
-
   CHECK;
 
   read_attrs(ATTR_CONTEXT_CLASS, class_count);
--- a/src/share/native/java/util/zip/Adler32.c	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/native/java/util/zip/Adler32.c	Fri Aug 24 09:29:17 2012 +0100
@@ -29,8 +29,8 @@
 
 #include "jni.h"
 #include "jni_util.h"
-#include "zlib.h"
 #include "jlong.h"
+#include <zlib.h>
 
 #include "java_util_zip_Adler32.h"
 
--- a/src/share/native/java/util/zip/CRC32.c	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/native/java/util/zip/CRC32.c	Fri Aug 24 09:29:17 2012 +0100
@@ -29,7 +29,7 @@
 
 #include "jni.h"
 #include "jni_util.h"
-#include "zlib.h"
+#include <zlib.h>
 
 #include "java_util_zip_CRC32.h"
 
--- a/src/share/native/java/util/zip/Deflater.c	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/native/java/util/zip/Deflater.c	Fri Aug 24 09:29:17 2012 +0100
@@ -32,7 +32,7 @@
 #include "jlong.h"
 #include "jni.h"
 #include "jni_util.h"
-#include "zlib.h"
+#include <zlib.h>
 
 #include "java_util_zip_Deflater.h"
 
@@ -60,34 +60,34 @@
 
 JNIEXPORT jlong JNICALL
 Java_java_util_zip_Deflater_init(JNIEnv *env, jclass cls, jint level,
-                                 jint strategy, jboolean nowrap)
+				 jint strategy, jboolean nowrap)
 {
     z_stream *strm = calloc(1, sizeof(z_stream));
 
     if (strm == 0) {
-        JNU_ThrowOutOfMemoryError(env, 0);
-        return jlong_zero;
+	JNU_ThrowOutOfMemoryError(env, 0);
+	return jlong_zero;
     } else {
-        char *msg;
-        switch (deflateInit2(strm, level, Z_DEFLATED,
-                             nowrap ? -MAX_WBITS : MAX_WBITS,
-                             DEF_MEM_LEVEL, strategy)) {
-          case Z_OK:
-            return ptr_to_jlong(strm);
-          case Z_MEM_ERROR:
-            free(strm);
-            JNU_ThrowOutOfMemoryError(env, 0);
-            return jlong_zero;
-          case Z_STREAM_ERROR:
-            free(strm);
-            JNU_ThrowIllegalArgumentException(env, 0);
-            return jlong_zero;
-          default:
-            msg = strm->msg;
-            free(strm);
-            JNU_ThrowInternalError(env, msg);
-            return jlong_zero;
-        }
+	char *msg;
+	switch (deflateInit2(strm, level, Z_DEFLATED,
+			     nowrap ? -MAX_WBITS : MAX_WBITS,
+			     DEF_MEM_LEVEL, strategy)) {
+	  case Z_OK:
+	    return ptr_to_jlong(strm);
+	  case Z_MEM_ERROR:
+	    free(strm);
+	    JNU_ThrowOutOfMemoryError(env, 0);
+	    return jlong_zero;
+	  case Z_STREAM_ERROR:
+	    free(strm);
+	    JNU_ThrowIllegalArgumentException(env, 0);
+	    return jlong_zero;
+	  default:
+	    msg = strm->msg;
+	    free(strm);
+	    JNU_ThrowInternalError(env, msg);
+	    return jlong_zero;
+	}
     }
 }
 
--- a/src/share/native/java/util/zip/Inflater.c	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/native/java/util/zip/Inflater.c	Fri Aug 24 09:29:17 2012 +0100
@@ -35,11 +35,11 @@
 #include "jni.h"
 #include "jvm.h"
 #include "jni_util.h"
-#include "zlib.h"
+#include <zlib.h>
 #include "java_util_zip_Inflater.h"
 
 #define ThrowDataFormatException(env, msg) \
-        JNU_ThrowByName(env, "java/util/zip/DataFormatException", msg)
+	JNU_ThrowByName(env, "java/util/zip/DataFormatException", msg)
 
 static jfieldID needDictID;
 static jfieldID finishedID;
@@ -61,8 +61,8 @@
     z_stream *strm = calloc(1, sizeof(z_stream));
 
     if (strm == 0) {
-        JNU_ThrowOutOfMemoryError(env, 0);
-        return jlong_zero;
+	JNU_ThrowOutOfMemoryError(env, 0);
+	return jlong_zero;
     } else {
         char *msg;
         switch (inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS)) {
--- a/src/share/native/java/util/zip/zip_util.c	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/native/java/util/zip/zip_util.c	Fri Aug 24 09:29:17 2012 +0100
@@ -44,7 +44,7 @@
 #include "io_util.h"
 #include "io_util_md.h"
 #include "zip_util.h"
-#include "zlib.h"
+#include <zlib.h>
 
 #ifdef _ALLBSD_SOURCE
 #define off64_t off_t
--- a/src/share/native/sun/awt/image/awt_ImageRep.c	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/share/native/sun/awt/image/awt_ImageRep.c	Fri Aug 24 09:29:17 2012 +0100
@@ -189,7 +189,7 @@
     mapSize = (*env)->GetIntField(env, jicm, g_ICMmapSizeID);
 
     if (numLut < 0 || numLut > 256 || mapSize < 0 || mapSize > 256) {
-        /* Ether old or new ICM has a palette that exceeds capacity
+        /* Either old or new ICM has a palette that exceeds capacity
            of byte data type, so we have to convert the image data
            to default representation.
         */
--- a/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java	Fri Aug 24 09:29:17 2012 +0100
@@ -731,8 +731,8 @@
                 case XWM.CDE_WM:
                 case XWM.MOTIF_WM:
                 case XWM.METACITY_WM:
+                case XWM.SAWFISH_WM:
                 case XWM.MUTTER_WM:
-                case XWM.SAWFISH_WM:
                 {
                     Point xlocation = queryXLocation();
                     if (log.isLoggable(PlatformLogger.FINE)) log.fine("New X location: {0}", xlocation);
--- a/src/solaris/classes/sun/awt/X11/XWM.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/solaris/classes/sun/awt/X11/XWM.java	Fri Aug 24 09:29:17 2012 +0100
@@ -754,7 +754,7 @@
             } else if (isSawfish()) {
                 awt_wmgr = XWM.SAWFISH_WM;
             } else if (isKDE2()) {
-                awt_wmgr =XWM.KDE2_WM;
+                awt_wmgr = XWM.KDE2_WM;
             } else if (isCompiz()) {
                 awt_wmgr = XWM.COMPIZ_WM;
             } else if (isLookingGlass()) {
@@ -1054,6 +1054,8 @@
 
     boolean supportsDynamicLayout() {
         int wm = getWMID();
+        // TODO: does mutter support this? It's a fancy new WM, so it probably
+        // does. Confirm and fix this.
         switch (wm) {
           case XWM.ENLIGHTEN_WM:
           case XWM.KDE2_WM:
@@ -1378,6 +1380,7 @@
                 return insets;
             }
         }
+        // TODO: figure out if Mutter implements the insets property.
         switch(getWMID()) {
           case XWM.KDE2_WM:
               return getInsetsFromProp(window, XA_KDE_NET_WM_FRAME_STRUT);
@@ -1572,6 +1575,9 @@
                       correctWM.bottom = correctWM.left;
                       break;
                   }
+                  case XWM.MUTTER_WM:
+                      // TODO: Figure out if Mutter is double reparenting.
+                      // For now the fallback code is good enough.
                   case XWM.OTHER_WM:
                   default: {                /* this is very similar to the E! case above */
                       insLog.finest("Getting correct insets for OTHER_WM/default, parent: {0}", parent);
--- a/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Fri Aug 24 09:29:17 2012 +0100
@@ -446,7 +446,7 @@
         if (xrenderLibHandle != NULL) {
             xrenderFindVisualFormat =
                 (XRenderFindVisualFormatFunc*)dlsym(xrenderLibHandle,
-                                                    "XRenderFindVisualFormat");
+						    "XRenderFindVisualFormat");
         }
     }
 
--- a/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c	Thu Aug 16 11:43:24 2012 -0700
+++ b/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c	Fri Aug 24 09:29:17 2012 +0100
@@ -23,6 +23,13 @@
  * questions.
  */
 
+/**
+ * fstatat in glibc requires _ATFILE_SOURCE to be defined.
+ */
+#if defined(__linux__)
+#define _ATFILE_SOURCE
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
@@ -126,34 +133,6 @@
 static fdopendir_func* my_fdopendir_func = NULL;
 
 /**
- * fstatat missing from glibc on Linux. Temporary workaround
- * for x86/x64.
- */
-#if defined(__linux__) && defined(__i386)
-#define FSTATAT64_SYSCALL_AVAILABLE
-static int fstatat64_wrapper(int dfd, const char *path,
-                             struct stat64 *statbuf, int flag)
-{
-    #ifndef __NR_fstatat64
-    #define __NR_fstatat64  300
-    #endif
-    return syscall(__NR_fstatat64, dfd, path, statbuf, flag);
-}
-#endif
-
-#if defined(__linux__) && defined(__x86_64__)
-#define FSTATAT64_SYSCALL_AVAILABLE
-static int fstatat64_wrapper(int dfd, const char *path,
-                             struct stat64 *statbuf, int flag)
-{
-    #ifndef __NR_newfstatat
-    #define __NR_newfstatat  262
-    #endif
-    return syscall(__NR_newfstatat, dfd, path, statbuf, flag);
-}
-#endif
-
-/**
  * Call this to throw an internal UnixException when a system/library
  * call fails
  */
@@ -224,10 +203,10 @@
     my_futimesat_func = (futimesat_func*) dlsym(RTLD_DEFAULT, "futimesat");
     my_fdopendir_func = (fdopendir_func*) dlsym(RTLD_DEFAULT, "fdopendir");
 
-#if defined(FSTATAT64_SYSCALL_AVAILABLE)
-    /* fstatat64 missing from glibc */
+#if defined(_ATFILE_SOURCE)
+    /* fstatat64 from glibc requires a define */
     if (my_fstatat64_func == NULL)
-        my_fstatat64_func = (fstatat64_func*)&fstatat64_wrapper;
+        my_fstatat64_func = (fstatat64_func*)&fstatat64;
 #endif
 
     if (my_openat64_func != NULL &&  my_fstatat64_func != NULL &&
--- a/test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java	Fri Aug 24 09:29:17 2012 +0100
@@ -39,6 +39,15 @@
         Frame frame = new Frame();
         frame.setVisible(true);
 
+        // wait until frame is really displayed
+        while (frame.getWidth() == 0 || frame.getHeight() == 0) {
+            System.out.println("Still not displayed...");
+            try {
+                Thread.currentThread().sleep(1);
+            }
+            catch (InterruptedException ie) {}
+        }
+
         BufferedImage img = new BufferedImage(frame.getWidth(),
                                               frame.getHeight(),
                                               BufferedImage.TYPE_INT_RGB);
--- a/test/java/awt/regtesthelpers/Util.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/test/java/awt/regtesthelpers/Util.java	Fri Aug 24 09:29:17 2012 +0100
@@ -140,6 +140,13 @@
         robot.mouseMove(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2);
     }
 
+    public static Point getTitlePoint(Window decoratedWindow) {
+        Point p = decoratedWindow.getLocationOnScreen();
+        Dimension d = decoratedWindow.getSize();
+        return new Point(p.x + (int)(d.getWidth()/2),
+                         p.y + (int)decoratedWindow.getInsets().top/2);
+    }
+
     /**
      * Moves mouse pointer in the center of a given {@code comp} component
      * and performs a left mouse button click using the {@code robot} parameter
--- a/test/java/nio/channels/SocketChannel/LocalAddress.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/test/java/nio/channels/SocketChannel/LocalAddress.java	Fri Aug 24 09:29:17 2012 +0100
@@ -39,7 +39,7 @@
     static void test1() throws Exception {
         InetAddress bogus = InetAddress.getByName("0.0.0.0");
         InetSocketAddress saddr = new InetSocketAddress(
-            InetAddress.getByName(TestUtil.HOST), 23);
+            InetAddress.getByName(TestUtil.HOST), 7);
 
         //Test1: connect only
         SocketChannel sc = SocketChannel.open();
--- a/test/java/nio/channels/TestUtil.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/test/java/nio/channels/TestUtil.java	Fri Aug 24 09:29:17 2012 +0100
@@ -36,9 +36,9 @@
 
     // Test hosts used by the channels tests - change these when
     // executing in a different network.
-    public static final String HOST = "javaweb.sfbay.sun.com";
-    public static final String REFUSING_HOST = "jano1.sfbay.sun.com";
-    public static final String FAR_HOST = "irejano.ireland.sun.com";
+    public static final String HOST = "icedtea.classpath.org";
+    public static final String REFUSING_HOST = "ns1.gnu.org";
+    public static final String FAR_HOST = "developer.classpath.org";
     public static final String UNRESOLVABLE_HOST = "blah-blah.blah-blah.blah";
 
     private TestUtil() { }
Binary file test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so has changed
Binary file test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so has changed
Binary file test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so has changed
Binary file test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so has changed
--- a/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java	Fri Aug 24 09:29:17 2012 +0100
@@ -35,6 +35,7 @@
  */
 
 import java.io.IOException;
+import java.net.ProtocolFamily;
 import java.net.Socket;
 import java.net.ProtocolFamily;
 import java.nio.channels.Channel;
@@ -138,11 +139,9 @@
             return provider.openDatagramChannel();
         }
 
-        public DatagramChannel openDatagramChannel(ProtocolFamily family)
-            throws IOException
-        {
-            return provider.openDatagramChannel(family);
-        }
+        public DatagramChannel openDatagramChannel(ProtocolFamily family) throws IOException {
+	    return provider.openDatagramChannel(family);
+	}
 
         public Pipe openPipe() throws IOException {
             return provider.openPipe();
--- a/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java	Thu Aug 16 11:43:24 2012 -0700
+++ b/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java	Fri Aug 24 09:29:17 2012 +0100
@@ -36,6 +36,7 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.ProtocolFamily;
 import java.net.ServerSocket;
 import java.net.ProtocolFamily;
 import java.nio.channels.*;
@@ -129,11 +130,9 @@
             return provider.openDatagramChannel();
         }
 
-        public DatagramChannel openDatagramChannel(ProtocolFamily family)
-            throws IOException
-        {
-            return provider.openDatagramChannel(family);
-        }
+        public DatagramChannel openDatagramChannel(ProtocolFamily family) throws IOException {
+	    return provider.openDatagramChannel(family);
+	}
 
         public Pipe openPipe()
             throws IOException
--- a/test/java/util/Locale/data/deflocale.sol10	Thu Aug 16 11:43:24 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1725 +0,0 @@
-                         Solaris 10 3/05 s10_74L2a SPARC
-
-                      (copyright from `uname -a` goes here)
-
-SunOS deltas4 5.10 Generic_142900-03 sun4u sparc SUNW,Sun-Blade-2500
-Testing all available locales
-
-OS Locale:  C
-default locale: ID: en, Name: English
-display locale: ID: en, Name: English
-format locale: ID: en, Name: English
-default charset: US-ASCII
-
-OS Locale:  POSIX
-default locale: ID: en, Name: English
-display locale: ID: en, Name: English
-format locale: ID: en, Name: English
-default charset: US-ASCII
-
-OS Locale:  ar
-default locale: ID: ar_EG, Name: Arabic (Egypt)
-display locale: ID: ar_EG, Name: Arabic (Egypt)
-format locale: ID: ar_EG, Name: Arabic (Egypt)
-default charset: ISO-8859-6
-
-OS Locale:  ar_EG.UTF-8
-default locale: ID: ar_EG, Name: Arabic (Egypt)
-display locale: ID: ar_EG, Name: Arabic (Egypt)
-format locale: ID: ar_EG, Name: Arabic (Egypt)
-default charset: UTF-8
-
-OS Locale:  ar_SA.UTF-8
-default locale: ID: ar_SA, Name: Arabic (Saudi Arabia)
-display locale: ID: ar_SA, Name: Arabic (Saudi Arabia)
-format locale: ID: ar_SA, Name: Arabic (Saudi Arabia)
-default charset: UTF-8
-
-OS Locale:  bg_BG
-default locale: ID: bg_BG, Name: Bulgarian (Bulgaria)
-display locale: ID: bg_BG, Name: Bulgarian (Bulgaria)
-format locale: ID: bg_BG, Name: Bulgarian (Bulgaria)
-default charset: ISO-8859-5
-
-OS Locale:  bg_BG.ISO8859-5
-default locale: ID: bg_BG, Name: Bulgarian (Bulgaria)
-display locale: ID: bg_BG, Name: Bulgarian (Bulgaria)
-format locale: ID: bg_BG, Name: Bulgarian (Bulgaria)
-default charset: ISO-8859-5
-
-OS Locale:  ca
-default locale: ID: ca_ES, Name: Catalan (Spain)
-display locale: ID: ca_ES, Name: Catalan (Spain)
-format locale: ID: ca_ES, Name: Catalan (Spain)
-default charset: ISO-8859-1
-
-OS Locale:  ca_ES
-default locale: ID: ca_ES, Name: Catalan (Spain)
-display locale: ID: ca_ES, Name: Catalan (Spain)
-format locale: ID: ca_ES, Name: Catalan (Spain)
-default charset: ISO-8859-1
-
-OS Locale:  ca_ES.ISO8859-1
-default locale: ID: ca_ES, Name: Catalan (Spain)
-display locale: ID: ca_ES, Name: Catalan (Spain)
-format locale: ID: ca_ES, Name: Catalan (Spain)
-default charset: ISO-8859-1
-
-OS Locale:  ca_ES.ISO8859-15
-default locale: ID: ca_ES, Name: Catalan (Spain)
-display locale: ID: ca_ES, Name: Catalan (Spain)
-format locale: ID: ca_ES, Name: Catalan (Spain)
-default charset: ISO-8859-15
-
-OS Locale:  ca_ES.ISO8859-15@euro
-default locale: ID: ca_ES, Name: Catalan (Spain)
-display locale: ID: ca_ES, Name: Catalan (Spain)
-format locale: ID: ca_ES, Name: Catalan (Spain)
-default charset: ISO-8859-15
-
-OS Locale:  cs_CZ
-default locale: ID: cs_CZ, Name: Czech (Czech Republic)
-display locale: ID: cs_CZ, Name: Czech (Czech Republic)
-format locale: ID: cs_CZ, Name: Czech (Czech Republic)
-default charset: ISO-8859-2
-
-OS Locale:  cs_CZ.ISO8859-2
-default locale: ID: cs_CZ, Name: Czech (Czech Republic)
-display locale: ID: cs_CZ, Name: Czech (Czech Republic)
-format locale: ID: cs_CZ, Name: Czech (Czech Republic)
-default charset: ISO-8859-2
-
-OS Locale:  cs_CZ.UTF-8
-default locale: ID: cs_CZ, Name: Czech (Czech Republic)
-display locale: ID: cs_CZ, Name: Czech (Czech Republic)
-format locale: ID: cs_CZ, Name: Czech (Czech Republic)
-default charset: UTF-8
-
-OS Locale:  cs_CZ.UTF-8@euro
-default locale: ID: cs_CZ, Name: Czech (Czech Republic)
-display locale: ID: cs_CZ, Name: Czech (Czech Republic)
-format locale: ID: cs_CZ, Name: Czech (Czech Republic)
-default charset: UTF-8
-
-OS Locale:  cz
-default locale: ID: cs_CZ, Name: Czech (Czech Republic)
-display locale: ID: cs_CZ, Name: Czech (Czech Republic)
-format locale: ID: cs_CZ, Name: Czech (Czech Republic)
-default charset: ISO-8859-2
-
-OS Locale:  da
-default locale: ID: da_DK, Name: Danish (Denmark)
-display locale: ID: da_DK, Name: Danish (Denmark)
-format locale: ID: da_DK, Name: Danish (Denmark)
-default charset: ISO-8859-1
-
-OS Locale:  da.ISO8859-15
-default locale: ID: da_DK, Name: Danish (Denmark)
-display locale: ID: da_DK, Name: Danish (Denmark)
-format locale: ID: da_DK, Name: Danish (Denmark)
-default charset: ISO-8859-15
-
-OS Locale:  da_DK
-default locale: ID: da_DK, Name: Danish (Denmark)
-display locale: ID: da_DK, Name: Danish (Denmark)
-format locale: ID: da_DK, Name: Danish (Denmark)
-default charset: ISO-8859-1
-
-OS Locale:  da_DK.ISO8859-1
-default locale: ID: da_DK, Name: Danish (Denmark)
-display locale: ID: da_DK, Name: Danish (Denmark)
-format locale: ID: da_DK, Name: Danish (Denmark)
-default charset: ISO-8859-1
-
-OS Locale:  da_DK.ISO8859-15
-default locale: ID: da_DK, Name: Danish (Denmark)
-display locale: ID: da_DK, Name: Danish (Denmark)
-format locale: ID: da_DK, Name: Danish (Denmark)
-default charset: ISO-8859-15
-
-OS Locale:  da_DK.ISO8859-15@euro
-default locale: ID: da_DK, Name: Danish (Denmark)
-display locale: ID: da_DK, Name: Danish (Denmark)
-format locale: ID: da_DK, Name: Danish (Denmark)
-default charset: ISO-8859-15
-
-OS Locale:  de
-default locale: ID: de_DE, Name: German (Germany)
-display locale: ID: de_DE, Name: German (Germany)
-format locale: ID: de_DE, Name: German (Germany)
-default charset: ISO-8859-1
-
-OS Locale:  de.ISO8859-15
-default locale: ID: de_DE, Name: German (Germany)
-display locale: ID: de_DE, Name: German (Germany)
-format locale: ID: de_DE, Name: German (Germany)
-default charset: ISO-8859-15
-
-OS Locale:  de.UTF-8
-default locale: ID: de_DE, Name: German (Germany)
-display locale: ID: de_DE, Name: German (Germany)
-format locale: ID: de_DE, Name: German (Germany)
-default charset: UTF-8
-
-OS Locale:  de_AT
-default locale: ID: de_AT, Name: German (Austria)
-display locale: ID: de_AT, Name: German (Austria)
-format locale: ID: de_AT, Name: German (Austria)
-default charset: ISO-8859-1
-
-OS Locale:  de_AT.ISO8859-1
-default locale: ID: de_AT, Name: German (Austria)
-display locale: ID: de_AT, Name: German (Austria)
-format locale: ID: de_AT, Name: German (Austria)
-default charset: ISO-8859-1
-
-OS Locale:  de_AT.ISO8859-15
-default locale: ID: de_AT, Name: German (Austria)
-display locale: ID: de_AT, Name: German (Austria)
-format locale: ID: de_AT, Name: German (Austria)
-default charset: ISO-8859-15
-
-OS Locale:  de_AT.ISO8859-15@euro
-default locale: ID: de_AT, Name: German (Austria)
-display locale: ID: de_AT, Name: German (Austria)
-format locale: ID: de_AT, Name: German (Austria)
-default charset: ISO-8859-15
-
-OS Locale:  de_CH
-default locale: ID: de_CH, Name: German (Switzerland)
-display locale: ID: de_CH, Name: German (Switzerland)
-format locale: ID: de_CH, Name: German (Switzerland)
-default charset: ISO-8859-1
-
-OS Locale:  de_CH.ISO8859-1
-default locale: ID: de_CH, Name: German (Switzerland)
-display locale: ID: de_CH, Name: German (Switzerland)
-format locale: ID: de_CH, Name: German (Switzerland)
-default charset: ISO-8859-1
-
-OS Locale:  de_DE
-default locale: ID: de_DE, Name: German (Germany)
-display locale: ID: de_DE, Name: German (Germany)
-format locale: ID: de_DE, Name: German (Germany)
-default charset: ISO-8859-1
-
-OS Locale:  de_DE.ISO8859-1
-default locale: ID: de_DE, Name: German (Germany)
-display locale: ID: de_DE, Name: German (Germany)
-format locale: ID: de_DE, Name: German (Germany)
-default charset: ISO-8859-1
-
-OS Locale:  de_DE.ISO8859-15
-default locale: ID: de_DE, Name: German (Germany)
-display locale: ID: de_DE, Name: German (Germany)
-format locale: ID: de_DE, Name: German (Germany)
-default charset: ISO-8859-15
-
-OS Locale:  de_DE.ISO8859-15@euro
-default locale: ID: de_DE, Name: German (Germany)
-display locale: ID: de_DE, Name: German (Germany)
-format locale: ID: de_DE, Name: German (Germany)
-default charset: ISO-8859-15
-
-OS Locale:  de_DE.UTF-8
-default locale: ID: de_DE, Name: German (Germany)
-display locale: ID: de_DE, Name: German (Germany)
-format locale: ID: de_DE, Name: German (Germany)
-default charset: UTF-8
-
-OS Locale:  de_DE.UTF-8@euro
-default locale: ID: de_DE, Name: German (Germany)
-display locale: ID: de_DE, Name: German (Germany)
-format locale: ID: de_DE, Name: German (Germany)
-default charset: UTF-8
-
-OS Locale:  el
-default locale: ID: el_GR, Name: Greek (Greece)
-display locale: ID: el_GR, Name: Greek (Greece)
-format locale: ID: el_GR, Name: Greek (Greece)
-default charset: ISO-8859-7
-
-OS Locale:  el.sun_eu_greek
-default locale: ID: el_GR, Name: Greek (Greece)
-display locale: ID: el_GR, Name: Greek (Greece)
-format locale: ID: el_GR, Name: Greek (Greece)
-default charset: ISO-8859-7
-
-OS Locale:  el_GR
-default locale: ID: el_GR, Name: Greek (Greece)
-display locale: ID: el_GR, Name: Greek (Greece)
-format locale: ID: el_GR, Name: Greek (Greece)
-default charset: ISO-8859-7
-
-OS Locale:  el_GR.ISO8859-7
-default locale: ID: el_GR, Name: Greek (Greece)
-display locale: ID: el_GR, Name: Greek (Greece)
-format locale: ID: el_GR, Name: Greek (Greece)
-default charset: ISO-8859-7
-
-OS Locale:  el_GR.ISO8859-7@euro
-default locale: ID: el_GR, Name: Greek (Greece)
-display locale: ID: el_GR, Name: Greek (Greece)
-format locale: ID: el_GR, Name: Greek (Greece)
-default charset: ISO-8859-7
-
-OS Locale:  en_AU
-default locale: ID: en_AU, Name: English (Australia)
-display locale: ID: en_AU, Name: English (Australia)
-format locale: ID: en_AU, Name: English (Australia)
-default charset: ISO-8859-1
-
-OS Locale:  en_AU.ISO8859-1
-default locale: ID: en_AU, Name: English (Australia)
-display locale: ID: en_AU, Name: English (Australia)
-format locale: ID: en_AU, Name: English (Australia)
-default charset: ISO-8859-1
-
-OS Locale:  en_CA
-default locale: ID: en_CA, Name: English (Canada)
-display locale: ID: en_CA, Name: English (Canada)
-format locale: ID: en_CA, Name: English (Canada)
-default charset: ISO-8859-1
-
-OS Locale:  en_CA.ISO8859-1
-default locale: ID: en_CA, Name: English (Canada)
-display locale: ID: en_CA, Name: English (Canada)
-format locale: ID: en_CA, Name: English (Canada)
-default charset: ISO-8859-1
-
-OS Locale:  en_CA.UTF-8
-default locale: ID: en_CA, Name: English (Canada)
-display locale: ID: en_CA, Name: English (Canada)
-format locale: ID: en_CA, Name: English (Canada)
-default charset: UTF-8
-
-OS Locale:  en_GB
-default locale: ID: en_GB, Name: English (United Kingdom)
-display locale: ID: en_GB, Name: English (United Kingdom)
-format locale: ID: en_GB, Name: English (United Kingdom)
-default charset: ISO-8859-1
-
-OS Locale:  en_GB.ISO8859-1
-default locale: ID: en_GB, Name: English (United Kingdom)
-display locale: ID: en_GB, Name: English (United Kingdom)
-format locale: ID: en_GB, Name: English (United Kingdom)
-default charset: ISO-8859-1
-
-OS Locale:  en_GB.ISO8859-15
-default locale: ID: en_GB, Name: English (United Kingdom)
-display locale: ID: en_GB, Name: English (United Kingdom)
-format locale: ID: en_GB, Name: English (United Kingdom)
-default charset: ISO-8859-15
-
-OS Locale:  en_GB.ISO8859-15@euro
-default locale: ID: en_GB, Name: English (United Kingdom)
-display locale: ID: en_GB, Name: English (United Kingdom)
-format locale: ID: en_GB, Name: English (United Kingdom)
-default charset: ISO-8859-15
-
-OS Locale:  en_IE
-default locale: ID: en_IE, Name: English (Ireland)
-display locale: ID: en_IE, Name: English (Ireland)
-format locale: ID: en_IE, Name: English (Ireland)
-default charset: ISO-8859-1
-
-OS Locale:  en_IE.ISO8859-1
-default locale: ID: en_IE, Name: English (Ireland)
-display locale: ID: en_IE, Name: English (Ireland)
-format locale: ID: en_IE, Name: English (Ireland)
-default charset: ISO-8859-1
-
-OS Locale:  en_IE.ISO8859-15
-default locale: ID: en_IE, Name: English (Ireland)
-display locale: ID: en_IE, Name: English (Ireland)
-format locale: ID: en_IE, Name: English (Ireland)
-default charset: ISO-8859-15
-
-OS Locale:  en_IE.ISO8859-15@euro
-default locale: ID: en_IE, Name: English (Ireland)
-display locale: ID: en_IE, Name: English (Ireland)
-format locale: ID: en_IE, Name: English (Ireland)
-default charset: ISO-8859-15
-
-OS Locale:  en_NZ
-default locale: ID: en_NZ, Name: English (New Zealand)
-display locale: ID: en_NZ, Name: English (New Zealand)
-format locale: ID: en_NZ, Name: English (New Zealand)
-default charset: ISO-8859-1
-
-OS Locale:  en_NZ.ISO8859-1
-default locale: ID: en_NZ, Name: English (New Zealand)
-display locale: ID: en_NZ, Name: English (New Zealand)
-format locale: ID: en_NZ, Name: English (New Zealand)
-default charset: ISO-8859-1
-
-OS Locale:  en_US
-default locale: ID: en_US, Name: English (United States)
-display locale: ID: en_US, Name: English (United States)
-format locale: ID: en_US, Name: English (United States)
-default charset: ISO-8859-1
-
-OS Locale:  en_US.ISO8859-1
-default locale: ID: en_US, Name: English (United States)
-display locale: ID: en_US, Name: English (United States)
-format locale: ID: en_US, Name: English (United States)
-default charset: ISO-8859-1
-
-OS Locale:  en_US.ISO8859-15
-default locale: ID: en_US, Name: English (United States)
-display locale: ID: en_US, Name: English (United States)
-format locale: ID: en_US, Name: English (United States)
-default charset: ISO-8859-15
-
-OS Locale:  en_US.ISO8859-15@euro
-default locale: ID: en_US, Name: English (United States)
-display locale: ID: en_US, Name: English (United States)
-format locale: ID: en_US, Name: English (United States)
-default charset: ISO-8859-15
-
-OS Locale:  en_US.UTF-8
-default locale: ID: en_US, Name: English (United States)
-display locale: ID: en_US, Name: English (United States)
-format locale: ID: en_US, Name: English (United States)
-default charset: UTF-8
-
-OS Locale:  es
-default locale: ID: es_ES, Name: Spanish (Spain)
-display locale: ID: es_ES, Name: Spanish (Spain)
-format locale: ID: es_ES, Name: Spanish (Spain)
-default charset: ISO-8859-1
-
-OS Locale:  es.ISO8859-15
-default locale: ID: es_ES, Name: Spanish (Spain)
-display locale: ID: es_ES, Name: Spanish (Spain)
-format locale: ID: es_ES, Name: Spanish (Spain)
-default charset: ISO-8859-15
-
-OS Locale:  es.UTF-8
-default locale: ID: es_ES, Name: Spanish (Spain)
-display locale: ID: es_ES, Name: Spanish (Spain)
-format locale: ID: es_ES, Name: Spanish (Spain)
-default charset: UTF-8
-
-OS Locale:  es_AR
-default locale: ID: es_AR, Name: Spanish (Argentina)
-display locale: ID: es_AR, Name: Spanish (Argentina)
-format locale: ID: es_AR, Name: Spanish (Argentina)
-default charset: ISO-8859-1
-
-OS Locale:  es_AR.ISO8859-1
-default locale: ID: es_AR, Name: Spanish (Argentina)
-display locale: ID: es_AR, Name: Spanish (Argentina)
-format locale: ID: es_AR, Name: Spanish (Argentina)
-default charset: ISO-8859-1
-
-OS Locale:  es_BO
-default locale: ID: es_BO, Name: Spanish (Bolivia)
-display locale: ID: es_BO, Name: Spanish (Bolivia)
-format locale: ID: es_BO, Name: Spanish (Bolivia)
-default charset: ISO-8859-1
-
-OS Locale:  es_BO.ISO8859-1
-default locale: ID: es_BO, Name: Spanish (Bolivia)
-display locale: ID: es_BO, Name: Spanish (Bolivia)
-format locale: ID: es_BO, Name: Spanish (Bolivia)
-default charset: ISO-8859-1
-
-OS Locale:  es_CL
-default locale: ID: es_CL, Name: Spanish (Chile)
-display locale: ID: es_CL, Name: Spanish (Chile)
-format locale: ID: es_CL, Name: Spanish (Chile)
-default charset: ISO-8859-1
-
-OS Locale:  es_CL.ISO8859-1
-default locale: ID: es_CL, Name: Spanish (Chile)
-display locale: ID: es_CL, Name: Spanish (Chile)
-format locale: ID: es_CL, Name: Spanish (Chile)
-default charset: ISO-8859-1
-
-OS Locale:  es_CO
-default locale: ID: es_CO, Name: Spanish (Colombia)
-display locale: ID: es_CO, Name: Spanish (Colombia)
-format locale: ID: es_CO, Name: Spanish (Colombia)
-default charset: ISO-8859-1
-
-OS Locale:  es_CO.ISO8859-1
-default locale: ID: es_CO, Name: Spanish (Colombia)
-display locale: ID: es_CO, Name: Spanish (Colombia)
-format locale: ID: es_CO, Name: Spanish (Colombia)
-default charset: ISO-8859-1
-
-OS Locale:  es_CR
-default locale: ID: es_CR, Name: Spanish (Costa Rica)
-display locale: ID: es_CR, Name: Spanish (Costa Rica)
-format locale: ID: es_CR, Name: Spanish (Costa Rica)
-default charset: ISO-8859-1
-
-OS Locale:  es_CR.ISO8859-1
-default locale: ID: es_CR, Name: Spanish (Costa Rica)
-display locale: ID: es_CR, Name: Spanish (Costa Rica)
-format locale: ID: es_CR, Name: Spanish (Costa Rica)
-default charset: ISO-8859-1
-
-OS Locale:  es_EC
-default locale: ID: es_EC, Name: Spanish (Ecuador)
-display locale: ID: es_EC, Name: Spanish (Ecuador)
-format locale: ID: es_EC, Name: Spanish (Ecuador)
-default charset: ISO-8859-1
-
-OS Locale:  es_EC.ISO8859-1
-default locale: ID: es_EC, Name: Spanish (Ecuador)
-display locale: ID: es_EC, Name: Spanish (Ecuador)
-format locale: ID: es_EC, Name: Spanish (Ecuador)
-default charset: ISO-8859-1
-
-OS Locale:  es_ES
-default locale: ID: es_ES, Name: Spanish (Spain)
-display locale: ID: es_ES, Name: Spanish (Spain)
-format locale: ID: es_ES, Name: Spanish (Spain)
-default charset: ISO-8859-1
-
-OS Locale:  es_ES.ISO8859-1
-default locale: ID: es_ES, Name: Spanish (Spain)
-display locale: ID: es_ES, Name: Spanish (Spain)
-format locale: ID: es_ES, Name: Spanish (Spain)
-default charset: ISO-8859-1
-
-OS Locale:  es_ES.ISO8859-15
-default locale: ID: es_ES, Name: Spanish (Spain)
-display locale: ID: es_ES, Name: Spanish (Spain)
-format locale: ID: es_ES, Name: Spanish (Spain)
-default charset: ISO-8859-15
-
-OS Locale:  es_ES.ISO8859-15@euro
-default locale: ID: es_ES, Name: Spanish (Spain)
-display locale: ID: es_ES, Name: Spanish (Spain)
-format locale: ID: es_ES, Name: Spanish (Spain)
-default charset: ISO-8859-15
-
-OS Locale:  es_ES.UTF-8
-default locale: ID: es_ES, Name: Spanish (Spain)
-display locale: ID: es_ES, Name: Spanish (Spain)
-format locale: ID: es_ES, Name: Spanish (Spain)
-default charset: UTF-8
-
-OS Locale:  es_ES.UTF-8@euro
-default locale: ID: es_ES, Name: Spanish (Spain)
-display locale: ID: es_ES, Name: Spanish (Spain)
-format locale: ID: es_ES, Name: Spanish (Spain)
-default charset: UTF-8
-
-OS Locale:  es_GT
-default locale: ID: es_GT, Name: Spanish (Guatemala)
-display locale: ID: es_GT, Name: Spanish (Guatemala)
-format locale: ID: es_GT, Name: Spanish (Guatemala)
-default charset: ISO-8859-1
-
-OS Locale:  es_GT.ISO8859-1
-default locale: ID: es_GT, Name: Spanish (Guatemala)
-display locale: ID: es_GT, Name: Spanish (Guatemala)
-format locale: ID: es_GT, Name: Spanish (Guatemala)
-default charset: ISO-8859-1
-
-OS Locale:  es_MX
-default locale: ID: es_MX, Name: Spanish (Mexico)
-display locale: ID: es_MX, Name: Spanish (Mexico)
-format locale: ID: es_MX, Name: Spanish (Mexico)
-default charset: ISO-8859-1
-
-OS Locale:  es_MX.ISO8859-1
-default locale: ID: es_MX, Name: Spanish (Mexico)
-display locale: ID: es_MX, Name: Spanish (Mexico)
-format locale: ID: es_MX, Name: Spanish (Mexico)
-default charset: ISO-8859-1
-
-OS Locale:  es_MX.UTF-8
-default locale: ID: es_MX, Name: Spanish (Mexico)
-display locale: ID: es_MX, Name: Spanish (Mexico)
-format locale: ID: es_MX, Name: Spanish (Mexico)
-default charset: UTF-8
-
-OS Locale:  es_NI
-default locale: ID: es_NI, Name: Spanish (Nicaragua)
-display locale: ID: es_NI, Name: Spanish (Nicaragua)
-format locale: ID: es_NI, Name: Spanish (Nicaragua)
-default charset: ISO-8859-1
-
-OS Locale:  es_NI.ISO8859-1
-default locale: ID: es_NI, Name: Spanish (Nicaragua)
-display locale: ID: es_NI, Name: Spanish (Nicaragua)
-format locale: ID: es_NI, Name: Spanish (Nicaragua)
-default charset: ISO-8859-1
-
-OS Locale:  es_PA
-default locale: ID: es_PA, Name: Spanish (Panama)
-display locale: ID: es_PA, Name: Spanish (Panama)
-format locale: ID: es_PA, Name: Spanish (Panama)
-default charset: ISO-8859-1
-
-OS Locale:  es_PA.ISO8859-1
-default locale: ID: es_PA, Name: Spanish (Panama)
-display locale: ID: es_PA, Name: Spanish (Panama)
-format locale: ID: es_PA, Name: Spanish (Panama)
-default charset: ISO-8859-1
-
-OS Locale:  es_PE
-default locale: ID: es_PE, Name: Spanish (Peru)
-display locale: ID: es_PE, Name: Spanish (Peru)
-format locale: ID: es_PE, Name: Spanish (Peru)
-default charset: ISO-8859-1
-
-OS Locale:  es_PE.ISO8859-1
-default locale: ID: es_PE, Name: Spanish (Peru)
-display locale: ID: es_PE, Name: Spanish (Peru)
-format locale: ID: es_PE, Name: Spanish (Peru)
-default charset: ISO-8859-1
-
-OS Locale:  es_PY
-default locale: ID: es_PY, Name: Spanish (Paraguay)
-display locale: ID: es_PY, Name: Spanish (Paraguay)
-format locale: ID: es_PY, Name: Spanish (Paraguay)
-default charset: ISO-8859-1
-
-OS Locale:  es_PY.ISO8859-1
-default locale: ID: es_PY, Name: Spanish (Paraguay)
-display locale: ID: es_PY, Name: Spanish (Paraguay)
-format locale: ID: es_PY, Name: Spanish (Paraguay)
-default charset: ISO-8859-1
-
-OS Locale:  es_SV
-default locale: ID: es_SV, Name: Spanish (El Salvador)
-display locale: ID: es_SV, Name: Spanish (El Salvador)
-format locale: ID: es_SV, Name: Spanish (El Salvador)
-default charset: ISO-8859-1
-
-OS Locale:  es_SV.ISO8859-1
-default locale: ID: es_SV, Name: Spanish (El Salvador)
-display locale: ID: es_SV, Name: Spanish (El Salvador)
-format locale: ID: es_SV, Name: Spanish (El Salvador)
-default charset: ISO-8859-1
-
-OS Locale:  es_UY
-default locale: ID: es_UY, Name: Spanish (Uruguay)
-display locale: ID: es_UY, Name: Spanish (Uruguay)
-format locale: ID: es_UY, Name: Spanish (Uruguay)
-default charset: ISO-8859-1
-
-OS Locale:  es_UY.ISO8859-1
-default locale: ID: es_UY, Name: Spanish (Uruguay)
-display locale: ID: es_UY, Name: Spanish (Uruguay)
-format locale: ID: es_UY, Name: Spanish (Uruguay)
-default charset: ISO-8859-1
-
-OS Locale:  es_VE
-default locale: ID: es_VE, Name: Spanish (Venezuela)
-display locale: ID: es_VE, Name: Spanish (Venezuela)
-format locale: ID: es_VE, Name: Spanish (Venezuela)
-default charset: ISO-8859-1
-
-OS Locale:  es_VE.ISO8859-1
-default locale: ID: es_VE, Name: Spanish (Venezuela)
-display locale: ID: es_VE, Name: Spanish (Venezuela)
-format locale: ID: es_VE, Name: Spanish (Venezuela)
-default charset: ISO-8859-1
-
-OS Locale:  et
-default locale: ID: et_EE, Name: Estonian (Estonia)
-display locale: ID: et_EE, Name: Estonian (Estonia)
-format locale: ID: et_EE, Name: Estonian (Estonia)
-default charset: ISO-8859-15
-
-OS Locale:  et_EE
-default locale: ID: et_EE, Name: Estonian (Estonia)
-display locale: ID: et_EE, Name: Estonian (Estonia)
-format locale: ID: et_EE, Name: Estonian (Estonia)
-default charset: ISO-8859-15
-
-OS Locale:  et_EE.ISO8859-15
-default locale: ID: et_EE, Name: Estonian (Estonia)
-display locale: ID: et_EE, Name: Estonian (Estonia)
-format locale: ID: et_EE, Name: Estonian (Estonia)
-default charset: ISO-8859-15
-
-OS Locale:  fi
-default locale: ID: fi_FI, Name: Finnish (Finland)
-display locale: ID: fi_FI, Name: Finnish (Finland)
-format locale: ID: fi_FI, Name: Finnish (Finland)
-default charset: ISO-8859-1
-
-OS Locale:  fi.ISO8859-15
-default locale: ID: fi_FI, Name: Finnish (Finland)
-display locale: ID: fi_FI, Name: Finnish (Finland)
-format locale: ID: fi_FI, Name: Finnish (Finland)
-default charset: ISO-8859-15
-
-OS Locale:  fi_FI
-default locale: ID: fi_FI, Name: Finnish (Finland)
-display locale: ID: fi_FI, Name: Finnish (Finland)
-format locale: ID: fi_FI, Name: Finnish (Finland)
-default charset: ISO-8859-1
-
-OS Locale:  fi_FI.ISO8859-1
-default locale: ID: fi_FI, Name: Finnish (Finland)
-display locale: ID: fi_FI, Name: Finnish (Finland)
-format locale: ID: fi_FI, Name: Finnish (Finland)
-default charset: ISO-8859-1
-
-OS Locale:  fi_FI.ISO8859-15
-default locale: ID: fi_FI, Name: Finnish (Finland)
-display locale: ID: fi_FI, Name: Finnish (Finland)
-format locale: ID: fi_FI, Name: Finnish (Finland)
-default charset: ISO-8859-15
-
-OS Locale:  fi_FI.ISO8859-15@euro
-default locale: ID: fi_FI, Name: Finnish (Finland)
-display locale: ID: fi_FI, Name: Finnish (Finland)
-format locale: ID: fi_FI, Name: Finnish (Finland)
-default charset: ISO-8859-15
-
-OS Locale:  fi_FI.UTF-8
-default locale: ID: fi_FI, Name: Finnish (Finland)
-display locale: ID: fi_FI, Name: Finnish (Finland)
-format locale: ID: fi_FI, Name: Finnish (Finland)
-default charset: UTF-8
-
-OS Locale:  fr
-default locale: ID: fr_FR, Name: French (France)
-display locale: ID: fr_FR, Name: French (France)
-format locale: ID: fr_FR, Name: French (France)
-default charset: ISO-8859-1
-
-OS Locale:  fr.ISO8859-15
-default locale: ID: fr_FR, Name: French (France)
-display locale: ID: fr_FR, Name: French (France)
-format locale: ID: fr_FR, Name: French (France)
-default charset: ISO-8859-15
-
-OS Locale:  fr.UTF-8
-default locale: ID: fr_FR, Name: French (France)
-display locale: ID: fr_FR, Name: French (France)
-format locale: ID: fr_FR, Name: French (France)
-default charset: UTF-8
-
-OS Locale:  fr_BE
-default locale: ID: fr_BE, Name: French (Belgium)
-display locale: ID: fr_BE, Name: French (Belgium)
-format locale: ID: fr_BE, Name: French (Belgium)
-default charset: ISO-8859-1
-
-OS Locale:  fr_BE.ISO8859-1
-default locale: ID: fr_BE, Name: French (Belgium)
-display locale: ID: fr_BE, Name: French (Belgium)
-format locale: ID: fr_BE, Name: French (Belgium)
-default charset: ISO-8859-1
-
-OS Locale:  fr_BE.ISO8859-15
-default locale: ID: fr_BE, Name: French (Belgium)
-display locale: ID: fr_BE, Name: French (Belgium)
-format locale: ID: fr_BE, Name: French (Belgium)
-default charset: ISO-8859-15
-
-OS Locale:  fr_BE.ISO8859-15@euro
-default locale: ID: fr_BE, Name: French (Belgium)
-display locale: ID: fr_BE, Name: French (Belgium)
-format locale: ID: fr_BE, Name: French (Belgium)
-default charset: ISO-8859-15
-
-OS Locale:  fr_BE.UTF-8
-default locale: ID: fr_BE, Name: French (Belgium)
-display locale: ID: fr_BE, Name: French (Belgium)
-format locale: ID: fr_BE, Name: French (Belgium)
-default charset: UTF-8
-
-OS Locale:  fr_BE.UTF-8@euro
-default locale: ID: fr_BE, Name: French (Belgium)
-display locale: ID: fr_BE, Name: French (Belgium)
-format locale: ID: fr_BE, Name: French (Belgium)
-default charset: UTF-8
-
-OS Locale:  fr_CA
-default locale: ID: fr_CA, Name: French (Canada)
-display locale: ID: fr_CA, Name: French (Canada)
-format locale: ID: fr_CA, Name: French (Canada)
-default charset: ISO-8859-1
-
-OS Locale:  fr_CA.ISO8859-1
-default locale: ID: fr_CA, Name: French (Canada)
-display locale: ID: fr_CA, Name: French (Canada)
-format locale: ID: fr_CA, Name: French (Canada)
-default charset: ISO-8859-1
-
-OS Locale:  fr_CA.UTF-8
-default locale: ID: fr_CA, Name: French (Canada)
-display locale: ID: fr_CA, Name: French (Canada)
-format locale: ID: fr_CA, Name: French (Canada)
-default charset: UTF-8
-
-OS Locale:  fr_CH
-default locale: ID: fr_CH, Name: French (Switzerland)
-display locale: ID: fr_CH, Name: French (Switzerland)
-format locale: ID: fr_CH, Name: French (Switzerland)
-default charset: ISO-8859-1
-
-OS Locale:  fr_CH.ISO8859-1
-default locale: ID: fr_CH, Name: French (Switzerland)
-display locale: ID: fr_CH, Name: French (Switzerland)
-format locale: ID: fr_CH, Name: French (Switzerland)
-default charset: ISO-8859-1
-
-OS Locale:  fr_FR
-default locale: ID: fr_FR, Name: French (France)
-display locale: ID: fr_FR, Name: French (France)
-format locale: ID: fr_FR, Name: French (France)
-default charset: ISO-8859-1
-
-OS Locale:  fr_FR.ISO8859-1
-default locale: ID: fr_FR, Name: French (France)
-display locale: ID: fr_FR, Name: French (France)
-format locale: ID: fr_FR, Name: French (France)
-default charset: ISO-8859-1
-
-OS Locale:  fr_FR.ISO8859-15
-default locale: ID: fr_FR, Name: French (France)
-display locale: ID: fr_FR, Name: French (France)
-format locale: ID: fr_FR, Name: French (France)
-default charset: ISO-8859-15
-
-OS Locale:  fr_FR.ISO8859-15@euro
-default locale: ID: fr_FR, Name: French (France)
-display locale: ID: fr_FR, Name: French (France)
-format locale: ID: fr_FR, Name: French (France)
-default charset: ISO-8859-15
-
-OS Locale:  fr_FR.UTF-8
-default locale: ID: fr_FR, Name: French (France)
-display locale: ID: fr_FR, Name: French (France)
-format locale: ID: fr_FR, Name: French (France)
-default charset: UTF-8
-
-OS Locale:  fr_FR.UTF-8@euro
-default locale: ID: fr_FR, Name: French (France)
-display locale: ID: fr_FR, Name: French (France)
-format locale: ID: fr_FR, Name: French (France)
-default charset: UTF-8
-
-OS Locale:  he
-default locale: ID: iw_IL, Name: Hebrew (Israel)
-display locale: ID: iw_IL, Name: Hebrew (Israel)
-format locale: ID: iw_IL, Name: Hebrew (Israel)
-default charset: ISO-8859-8
-
-OS Locale:  he_IL
-default locale: ID: iw_IL, Name: Hebrew (Israel)
-display locale: ID: iw_IL, Name: Hebrew (Israel)
-format locale: ID: iw_IL, Name: Hebrew (Israel)
-default charset: ISO-8859-8
-
-OS Locale:  he_IL.UTF-8
-default locale: ID: iw_IL, Name: Hebrew (Israel)
-display locale: ID: iw_IL, Name: Hebrew (Israel)
-format locale: ID: iw_IL, Name: Hebrew (Israel)
-default charset: UTF-8
-
-OS Locale:  hi_IN.UTF-8
-default locale: ID: hi_IN, Name: Hindi (India)
-display locale: ID: hi_IN, Name: Hindi (India)
-format locale: ID: hi_IN, Name: Hindi (India)
-default charset: UTF-8
-
-OS Locale:  hr_HR
-default locale: ID: hr_HR, Name: Croatian (Croatia)
-display locale: ID: hr_HR, Name: Croatian (Croatia)
-format locale: ID: hr_HR, Name: Croatian (Croatia)
-default charset: ISO-8859-2
-
-OS Locale:  hr_HR.ISO8859-2
-default locale: ID: hr_HR, Name: Croatian (Croatia)
-display locale: ID: hr_HR, Name: Croatian (Croatia)
-format locale: ID: hr_HR, Name: Croatian (Croatia)
-default charset: ISO-8859-2
-
-OS Locale:  hu
-default locale: ID: hu_HU, Name: Hungarian (Hungary)
-display locale: ID: hu_HU, Name: Hungarian (Hungary)
-format locale: ID: hu_HU, Name: Hungarian (Hungary)
-default charset: ISO-8859-2
-
-OS Locale:  hu_HU
-default locale: ID: hu_HU, Name: Hungarian (Hungary)
-display locale: ID: hu_HU, Name: Hungarian (Hungary)
-format locale: ID: hu_HU, Name: Hungarian (Hungary)
-default charset: ISO-8859-2
-
-OS Locale:  hu_HU.ISO8859-2
-default locale: ID: hu_HU, Name: Hungarian (Hungary)
-display locale: ID: hu_HU, Name: Hungarian (Hungary)
-format locale: ID: hu_HU, Name: Hungarian (Hungary)
-default charset: ISO-8859-2
-
-OS Locale:  hu_HU.UTF-8
-default locale: ID: hu_HU, Name: Hungarian (Hungary)
-display locale: ID: hu_HU, Name: Hungarian (Hungary)
-format locale: ID: hu_HU, Name: Hungarian (Hungary)
-default charset: UTF-8
-
-OS Locale:  is_IS
-default locale: ID: is_IS, Name: Icelandic (Iceland)
-display locale: ID: is_IS, Name: Icelandic (Iceland)
-format locale: ID: is_IS, Name: Icelandic (Iceland)
-default charset: ISO-8859-1
-
-OS Locale:  is_IS.ISO8859-1
-default locale: ID: is_IS, Name: Icelandic (Iceland)
-display locale: ID: is_IS, Name: Icelandic (Iceland)
-format locale: ID: is_IS, Name: Icelandic (Iceland)
-default charset: ISO-8859-1
-
-OS Locale:  iso_8859_1
-default locale: ID: en, Name: English
-display locale: ID: en, Name: English
-format locale: ID: en, Name: English
-default charset: US-ASCII
-
-OS Locale:  it
-default locale: ID: it_IT, Name: Italian (Italy)
-display locale: ID: it_IT, Name: Italian (Italy)
-format locale: ID: it_IT, Name: Italian (Italy)
-default charset: ISO-8859-1
-
-OS Locale:  it.ISO8859-15
-default locale: ID: it_IT, Name: Italian (Italy)
-display locale: ID: it_IT, Name: Italian (Italy)
-format locale: ID: it_IT, Name: Italian (Italy)
-default charset: ISO-8859-15
-
-OS Locale:  it.UTF-8
-default locale: ID: it_IT, Name: Italian (Italy)
-display locale: ID: it_IT, Name: Italian (Italy)
-format locale: ID: it_IT, Name: Italian (Italy)
-default charset: UTF-8
-
-OS Locale:  it_IT
-default locale: ID: it_IT, Name: Italian (Italy)
-display locale: ID: it_IT, Name: Italian (Italy)
-format locale: ID: it_IT, Name: Italian (Italy)
-default charset: ISO-8859-1
-
-OS Locale:  it_IT.ISO8859-1
-default locale: ID: it_IT, Name: Italian (Italy)
-display locale: ID: it_IT, Name: Italian (Italy)
-format locale: ID: it_IT, Name: Italian (Italy)
-default charset: ISO-8859-1
-
-OS Locale:  it_IT.ISO8859-15
-default locale: ID: it_IT, Name: Italian (Italy)
-display locale: ID: it_IT, Name: Italian (Italy)
-format locale: ID: it_IT, Name: Italian (Italy)
-default charset: ISO-8859-15
-
-OS Locale:  it_IT.ISO8859-15@euro
-default locale: ID: it_IT, Name: Italian (Italy)
-display locale: ID: it_IT, Name: Italian (Italy)
-format locale: ID: it_IT, Name: Italian (Italy)
-default charset: ISO-8859-15
-
-OS Locale:  it_IT.UTF-8
-default locale: ID: it_IT, Name: Italian (Italy)
-display locale: ID: it_IT, Name: Italian (Italy)
-format locale: ID: it_IT, Name: Italian (Italy)
-default charset: UTF-8
-
-OS Locale:  it_IT.UTF-8@euro
-default locale: ID: it_IT, Name: Italian (Italy)
-display locale: ID: it_IT, Name: Italian (Italy)
-format locale: ID: it_IT, Name: Italian (Italy)
-default charset: UTF-8
-
-OS Locale:  ja
-default locale: ID: ja_JP, Name: Japanese (Japan)
-display locale: ID: ja_JP, Name: Japanese (Japan)
-format locale: ID: ja_JP, Name: Japanese (Japan)
-default charset: x-eucJP-Open
-
-OS Locale:  ja_JP.PCK
-default locale: ID: ja_JP, Name: Japanese (Japan)
-display locale: ID: ja_JP, Name: Japanese (Japan)
-format locale: ID: ja_JP, Name: Japanese (Japan)
-default charset: x-PCK
-
-OS Locale:  ja_JP.UTF-8
-default locale: ID: ja_JP, Name: Japanese (Japan)
-display locale: ID: ja_JP, Name: Japanese (Japan)
-format locale: ID: ja_JP, Name: Japanese (Japan)
-default charset: UTF-8
-
-OS Locale:  ja_JP.eucJP
-default locale: ID: ja_JP, Name: Japanese (Japan)
-display locale: ID: ja_JP, Name: Japanese (Japan)
-format locale: ID: ja_JP, Name: Japanese (Japan)
-default charset: x-eucJP-Open
-
-OS Locale:  ko
-default locale: ID: ko_KR, Name: Korean (South Korea)
-display locale: ID: ko_KR, Name: Korean (South Korea)
-format locale: ID: ko_KR, Name: Korean (South Korea)
-default charset: EUC-KR
-
-OS Locale:  ko.UTF-8
-default locale: ID: ko_KR, Name: Korean (South Korea)
-display locale: ID: ko_KR, Name: Korean (South Korea)
-format locale: ID: ko_KR, Name: Korean (South Korea)
-default charset: UTF-8
-
-OS Locale:  ko_KR.EUC
-default locale: ID: ko_KR, Name: Korean (South Korea)
-display locale: ID: ko_KR, Name: Korean (South Korea)
-format locale: ID: ko_KR, Name: Korean (South Korea)
-default charset: EUC-KR
-
-OS Locale:  ko_KR.EUC@dict
-default locale: ID: ko_KR, Name: Korean (South Korea)
-display locale: ID: ko_KR, Name: Korean (South Korea)
-format locale: ID: ko_KR, Name: Korean (South Korea)
-default charset: EUC-KR
-
-OS Locale:  ko_KR.UTF-8
-default locale: ID: ko_KR, Name: Korean (South Korea)
-display locale: ID: ko_KR, Name: Korean (South Korea)
-format locale: ID: ko_KR, Name: Korean (South Korea)
-default charset: UTF-8
-
-OS Locale:  ko_KR.UTF-8@dict
-default locale: ID: ko_KR, Name: Korean (South Korea)
-display locale: ID: ko_KR, Name: Korean (South Korea)
-format locale: ID: ko_KR, Name: Korean (South Korea)
-default charset: UTF-8
-
-OS Locale:  lt
-default locale: ID: lt_LT, Name: Lithuanian (Lithuania)
-display locale: ID: lt_LT, Name: Lithuanian (Lithuania)
-format locale: ID: lt_LT, Name: Lithuanian (Lithuania)
-default charset: ISO-8859-13
-
-OS Locale:  lt_LT
-default locale: ID: lt_LT, Name: Lithuanian (Lithuania)
-display locale: ID: lt_LT, Name: Lithuanian (Lithuania)
-format locale: ID: lt_LT, Name: Lithuanian (Lithuania)
-default charset: ISO-8859-13
-
-OS Locale:  lt_LT.ISO8859-13
-default locale: ID: lt_LT, Name: Lithuanian (Lithuania)
-display locale: ID: lt_LT, Name: Lithuanian (Lithuania)
-format locale: ID: lt_LT, Name: Lithuanian (Lithuania)
-default charset: ISO-8859-13
-
-OS Locale:  lv
-default locale: ID: lv_LV, Name: Latvian (Latvia)
-display locale: ID: lv_LV, Name: Latvian (Latvia)
-format locale: ID: lv_LV, Name: Latvian (Latvia)
-default charset: ISO-8859-13
-
-OS Locale:  lv_LV
-default locale: ID: lv_LV, Name: Latvian (Latvia)
-display locale: ID: lv_LV, Name: Latvian (Latvia)
-format locale: ID: lv_LV, Name: Latvian (Latvia)
-default charset: ISO-8859-13
-
-OS Locale:  lv_LV.ISO8859-13
-default locale: ID: lv_LV, Name: Latvian (Latvia)
-display locale: ID: lv_LV, Name: Latvian (Latvia)
-format locale: ID: lv_LV, Name: Latvian (Latvia)
-default charset: ISO-8859-13
-
-OS Locale:  mk_MK
-default locale: ID: mk_MK, Name: Macedonian (Macedonia)
-display locale: ID: mk_MK, Name: Macedonian (Macedonia)
-format locale: ID: mk_MK, Name: Macedonian (Macedonia)
-default charset: ISO-8859-5
-
-OS Locale:  mk_MK.ISO8859-5
-default locale: ID: mk_MK, Name: Macedonian (Macedonia)
-display locale: ID: mk_MK, Name: Macedonian (Macedonia)
-format locale: ID: mk_MK, Name: Macedonian (Macedonia)
-default charset: ISO-8859-5
-
-OS Locale:  nl
-default locale: ID: nl_NL, Name: Dutch (Netherlands)
-display locale: ID: nl_NL, Name: Dutch (Netherlands)
-format locale: ID: nl_NL, Name: Dutch (Netherlands)
-default charset: ISO-8859-1
-
-OS Locale:  nl.ISO8859-15
-default locale: ID: nl_NL, Name: Dutch (Netherlands)
-display locale: ID: nl_NL, Name: Dutch (Netherlands)
-format locale: ID: nl_NL, Name: Dutch (Netherlands)
-default charset: ISO-8859-15
-
-OS Locale:  nl_BE
-default locale: ID: nl_BE, Name: Dutch (Belgium)
-display locale: ID: nl_BE, Name: Dutch (Belgium)
-format locale: ID: nl_BE, Name: Dutch (Belgium)
-default charset: ISO-8859-1
-
-OS Locale:  nl_BE.ISO8859-1
-default locale: ID: nl_BE, Name: Dutch (Belgium)
-display locale: ID: nl_BE, Name: Dutch (Belgium)
-format locale: ID: nl_BE, Name: Dutch (Belgium)
-default charset: ISO-8859-1
-
-OS Locale:  nl_BE.ISO8859-15
-default locale: ID: nl_BE, Name: Dutch (Belgium)
-display locale: ID: nl_BE, Name: Dutch (Belgium)
-format locale: ID: nl_BE, Name: Dutch (Belgium)
-default charset: ISO-8859-15
-
-OS Locale:  nl_BE.ISO8859-15@euro
-default locale: ID: nl_BE, Name: Dutch (Belgium)
-display locale: ID: nl_BE, Name: Dutch (Belgium)
-format locale: ID: nl_BE, Name: Dutch (Belgium)
-default charset: ISO-8859-15
-
-OS Locale:  nl_NL
-default locale: ID: nl_NL, Name: Dutch (Netherlands)
-display locale: ID: nl_NL, Name: Dutch (Netherlands)
-format locale: ID: nl_NL, Name: Dutch (Netherlands)
-default charset: ISO-8859-1
-
-OS Locale:  nl_NL.ISO8859-1
-default locale: ID: nl_NL, Name: Dutch (Netherlands)
-display locale: ID: nl_NL, Name: Dutch (Netherlands)
-format locale: ID: nl_NL, Name: Dutch (Netherlands)
-default charset: ISO-8859-1
-
-OS Locale:  nl_NL.ISO8859-15
-default locale: ID: nl_NL, Name: Dutch (Netherlands)
-display locale: ID: nl_NL, Name: Dutch (Netherlands)
-format locale: ID: nl_NL, Name: Dutch (Netherlands)
-default charset: ISO-8859-15
-
-OS Locale:  nl_NL.ISO8859-15@euro
-default locale: ID: nl_NL, Name: Dutch (Netherlands)
-display locale: ID: nl_NL, Name: Dutch (Netherlands)
-format locale: ID: nl_NL, Name: Dutch (Netherlands)
-default charset: ISO-8859-15
-
-OS Locale:  no
-default locale: ID: no_NO, Name: Norwegian (Norway)
-display locale: ID: no_NO, Name: Norwegian (Norway)
-format locale: ID: no_NO, Name: Norwegian (Norway)
-default charset: ISO-8859-1
-
-OS Locale:  no_NO
-default locale: ID: no_NO, Name: Norwegian (Norway)
-display locale: ID: no_NO, Name: Norwegian (Norway)
-format locale: ID: no_NO, Name: Norwegian (Norway)
-default charset: ISO-8859-1
-
-OS Locale:  no_NO.ISO8859-1@bokmal
-default locale: ID: no_NO, Name: Norwegian (Norway)
-display locale: ID: no_NO, Name: Norwegian (Norway)
-format locale: ID: no_NO, Name: Norwegian (Norway)
-default charset: ISO-8859-1
-
-OS Locale:  no_NO.ISO8859-1@nynorsk
-default locale: ID: no_NO_NY, Name: Norwegian (Norway,Nynorsk)
-display locale: ID: no_NO_NY, Name: Norwegian (Norway,Nynorsk)
-format locale: ID: no_NO_NY, Name: Norwegian (Norway,Nynorsk)
-default charset: ISO-8859-1
-
-OS Locale:  no_NY
-default locale: ID: no_NO_NY, Name: Norwegian (Norway,Nynorsk)
-display locale: ID: no_NO_NY, Name: Norwegian (Norway,Nynorsk)
-format locale: ID: no_NO_NY, Name: Norwegian (Norway,Nynorsk)
-default charset: ISO-8859-1
-
-OS Locale:  nr
-default locale: ID: nr, Name: South Ndebele
-display locale: ID: nr, Name: South Ndebele
-format locale: ID: nr, Name: South Ndebele
-default charset: ISO-8859-2
-
-OS Locale:  pl
-default locale: ID: pl_PL, Name: Polish (Poland)
-display locale: ID: pl_PL, Name: Polish (Poland)
-format locale: ID: pl_PL, Name: Polish (Poland)
-default charset: ISO-8859-2
-
-OS Locale:  pl.UTF-8
-default locale: ID: pl_PL, Name: Polish (Poland)
-display locale: ID: pl_PL, Name: Polish (Poland)
-format locale: ID: pl_PL, Name: Polish (Poland)
-default charset: UTF-8
-
-OS Locale:  pl_PL
-default locale: ID: pl_PL, Name: Polish (Poland)
-display locale: ID: pl_PL, Name: Polish (Poland)
-format locale: ID: pl_PL, Name: Polish (Poland)
-default charset: ISO-8859-2
-
-OS Locale:  pl_PL.ISO8859-2
-default locale: ID: pl_PL, Name: Polish (Poland)
-display locale: ID: pl_PL, Name: Polish (Poland)
-format locale: ID: pl_PL, Name: Polish (Poland)
-default charset: ISO-8859-2
-
-OS Locale:  pl_PL.UTF-8
-default locale: ID: pl_PL, Name: Polish (Poland)
-display locale: ID: pl_PL, Name: Polish (Poland)
-format locale: ID: pl_PL, Name: Polish (Poland)
-default charset: UTF-8
-
-OS Locale:  pt
-default locale: ID: pt_PT, Name: Portuguese (Portugal)
-display locale: ID: pt_PT, Name: Portuguese (Portugal)
-format locale: ID: pt_PT, Name: Portuguese (Portugal)
-default charset: ISO-8859-1
-
-OS Locale:  pt.ISO8859-15
-default locale: ID: pt_PT, Name: Portuguese (Portugal)
-display locale: ID: pt_PT, Name: Portuguese (Portugal)
-format locale: ID: pt_PT, Name: Portuguese (Portugal)
-default charset: ISO-8859-15
-
-OS Locale:  pt_BR
-default locale: ID: pt_BR, Name: Portuguese (Brazil)
-display locale: ID: pt_BR, Name: Portuguese (Brazil)
-format locale: ID: pt_BR, Name: Portuguese (Brazil)
-default charset: ISO-8859-1
-
-OS Locale:  pt_BR.ISO8859-1
-default locale: ID: pt_BR, Name: Portuguese (Brazil)
-display locale: ID: pt_BR, Name: Portuguese (Brazil)
-format locale: ID: pt_BR, Name: Portuguese (Brazil)
-default charset: ISO-8859-1
-
-OS Locale:  pt_BR.UTF-8
-default locale: ID: pt_BR, Name: Portuguese (Brazil)
-display locale: ID: pt_BR, Name: Portuguese (Brazil)
-format locale: ID: pt_BR, Name: Portuguese (Brazil)
-default charset: UTF-8
-
-OS Locale:  pt_PT
-default locale: ID: pt_PT, Name: Portuguese (Portugal)
-display locale: ID: pt_PT, Name: Portuguese (Portugal)
-format locale: ID: pt_PT, Name: Portuguese (Portugal)
-default charset: ISO-8859-1
-
-OS Locale:  pt_PT.ISO8859-1
-default locale: ID: pt_PT, Name: Portuguese (Portugal)
-display locale: ID: pt_PT, Name: Portuguese (Portugal)
-format locale: ID: pt_PT, Name: Portuguese (Portugal)
-default charset: ISO-8859-1
-
-OS Locale:  pt_PT.ISO8859-15
-default locale: ID: pt_PT, Name: Portuguese (Portugal)
-display locale: ID: pt_PT, Name: Portuguese (Portugal)
-format locale: ID: pt_PT, Name: Portuguese (Portugal)
-default charset: ISO-8859-15
-
-OS Locale:  pt_PT.ISO8859-15@euro
-default locale: ID: pt_PT, Name: Portuguese (Portugal)
-display locale: ID: pt_PT, Name: Portuguese (Portugal)
-format locale: ID: pt_PT, Name: Portuguese (Portugal)
-default charset: ISO-8859-15
-
-OS Locale:  ro_RO
-default locale: ID: ro_RO, Name: Romanian (Romania)
-display locale: ID: ro_RO, Name: Romanian (Romania)
-format locale: ID: ro_RO, Name: Romanian (Romania)
-default charset: ISO-8859-2
-
-OS Locale:  ro_RO.ISO8859-2
-default locale: ID: ro_RO, Name: Romanian (Romania)
-display locale: ID: ro_RO, Name: Romanian (Romania)
-format locale: ID: ro_RO, Name: Romanian (Romania)
-default charset: ISO-8859-2
-
-OS Locale:  ru
-default locale: ID: ru_RU, Name: Russian (Russia)
-display locale: ID: ru_RU, Name: Russian (Russia)
-format locale: ID: ru_RU, Name: Russian (Russia)
-default charset: ISO-8859-5
-
-OS Locale:  ru.UTF-8
-default locale: ID: ru_RU, Name: Russian (Russia)
-display locale: ID: ru_RU, Name: Russian (Russia)
-format locale: ID: ru_RU, Name: Russian (Russia)
-default charset: UTF-8
-
-OS Locale:  ru.koi8-r
-default locale: ID: ru_RU, Name: Russian (Russia)
-display locale: ID: ru_RU, Name: Russian (Russia)
-format locale: ID: ru_RU, Name: Russian (Russia)
-default charset: KOI8-R
-
-OS Locale:  ru_RU
-default locale: ID: ru_RU, Name: Russian (Russia)
-display locale: ID: ru_RU, Name: Russian (Russia)
-format locale: ID: ru_RU, Name: Russian (Russia)
-default charset: ISO-8859-5
-
-OS Locale:  ru_RU.ANSI1251
-default locale: ID: ru_RU, Name: Russian (Russia)
-display locale: ID: ru_RU, Name: Russian (Russia)
-format locale: ID: ru_RU, Name: Russian (Russia)
-default charset: windows-1251
-
-OS Locale:  ru_RU.ISO8859-5
-default locale: ID: ru_RU, Name: Russian (Russia)
-display locale: ID: ru_RU, Name: Russian (Russia)
-format locale: ID: ru_RU, Name: Russian (Russia)
-default charset: ISO-8859-5
-
-OS Locale:  ru_RU.KOI8-R
-default locale: ID: ru_RU, Name: Russian (Russia)
-display locale: ID: ru_RU, Name: Russian (Russia)
-format locale: ID: ru_RU, Name: Russian (Russia)
-default charset: KOI8-R
-
-OS Locale:  ru_RU.UTF-8
-default locale: ID: ru_RU, Name: Russian (Russia)
-display locale: ID: ru_RU, Name: Russian (Russia)
-format locale: ID: ru_RU, Name: Russian (Russia)
-default charset: UTF-8
-
-OS Locale:  sh_BA
-default locale: ID: sr_BA, Name: Serbian (Bosnia and Herzegovina)
-display locale: ID: sr_BA, Name: Serbian (Bosnia and Herzegovina)
-format locale: ID: sr_BA, Name: Serbian (Bosnia and Herzegovina)
-default charset: ISO-8859-2
-
-OS Locale:  sh_BA.ISO8859-2@bosnia
-default locale: ID: sr_BA, Name: Serbian (Bosnia and Herzegovina)
-display locale: ID: sr_BA, Name: Serbian (Bosnia and Herzegovina)
-format locale: ID: sr_BA, Name: Serbian (Bosnia and Herzegovina)
-default charset: ISO-8859-2
-
-OS Locale:  sk_SK
-default locale: ID: sk_SK, Name: Slovak (Slovakia)
-display locale: ID: sk_SK, Name: Slovak (Slovakia)
-format locale: ID: sk_SK, Name: Slovak (Slovakia)
-default charset: ISO-8859-2
-
-OS Locale:  sk_SK.ISO8859-2
-default locale: ID: sk_SK, Name: Slovak (Slovakia)
-display locale: ID: sk_SK, Name: Slovak (Slovakia)
-format locale: ID: sk_SK, Name: Slovak (Slovakia)
-default charset: ISO-8859-2
-
-OS Locale:  sl_SI
-default locale: ID: sl_SI, Name: Slovenian (Slovenia)
-display locale: ID: sl_SI, Name: Slovenian (Slovenia)
-format locale: ID: sl_SI, Name: Slovenian (Slovenia)
-default charset: ISO-8859-2
-
-OS Locale:  sl_SI.ISO8859-2
-default locale: ID: sl_SI, Name: Slovenian (Slovenia)
-display locale: ID: sl_SI, Name: Slovenian (Slovenia)
-format locale: ID: sl_SI, Name: Slovenian (Slovenia)
-default charset: ISO-8859-2
-
-OS Locale:  sq_AL
-default locale: ID: sq_AL, Name: Albanian (Albania)
-display locale: ID: sq_AL, Name: Albanian (Albania)
-format locale: ID: sq_AL, Name: Albanian (Albania)
-default charset: ISO-8859-2
-
-OS Locale:  sq_AL.ISO8859-2
-default locale: ID: sq_AL, Name: Albanian (Albania)
-display locale: ID: sq_AL, Name: Albanian (Albania)
-format locale: ID: sq_AL, Name: Albanian (Albania)
-default charset: ISO-8859-2
-
-OS Locale:  sr_SP
-default locale: ID: sr_CS, Name: Serbian (Serbia and Montenegro)
-display locale: ID: sr_CS, Name: Serbian (Serbia and Montenegro)
-format locale: ID: sr_CS, Name: Serbian (Serbia and Montenegro)
-default charset: ISO-8859-5
-
-OS Locale:  sr_YU
-default locale: ID: sr_CS, Name: Serbian (Serbia and Montenegro)
-display locale: ID: sr_CS, Name: Serbian (Serbia and Montenegro)
-format locale: ID: sr_CS, Name: Serbian (Serbia and Montenegro)
-default charset: ISO-8859-5
-
-OS Locale:  sr_YU.ISO8859-5
-default locale: ID: sr_CS, Name: Serbian (Serbia and Montenegro)
-display locale: ID: sr_CS, Name: Serbian (Serbia and Montenegro)
-format locale: ID: sr_CS, Name: Serbian (Serbia and Montenegro)
-default charset: ISO-8859-5
-
-OS Locale:  sv
-default locale: ID: sv_SE, Name: Swedish (Sweden)
-display locale: ID: sv_SE, Name: Swedish (Sweden)
-format locale: ID: sv_SE, Name: Swedish (Sweden)
-default charset: ISO-8859-1
-
-OS Locale:  sv.ISO8859-15
-default locale: ID: sv_SE, Name: Swedish (Sweden)
-display locale: ID: sv_SE, Name: Swedish (Sweden)
-format locale: ID: sv_SE, Name: Swedish (Sweden)
-default charset: ISO-8859-15
-
-OS Locale:  sv.UTF-8
-default locale: ID: sv_SE, Name: Swedish (Sweden)
-display locale: ID: sv_SE, Name: Swedish (Sweden)
-format locale: ID: sv_SE, Name: Swedish (Sweden)
-default charset: UTF-8
-
-OS Locale:  sv_SE
-default locale: ID: sv_SE, Name: Swedish (Sweden)
-display locale: ID: sv_SE, Name: Swedish (Sweden)
-format locale: ID: sv_SE, Name: Swedish (Sweden)
-default charset: ISO-8859-1
-
-OS Locale:  sv_SE.ISO8859-1
-default locale: ID: sv_SE, Name: Swedish (Sweden)
-display locale: ID: sv_SE, Name: Swedish (Sweden)
-format locale: ID: sv_SE, Name: Swedish (Sweden)
-default charset: ISO-8859-1
-
-OS Locale:  sv_SE.ISO8859-15
-default locale: ID: sv_SE, Name: Swedish (Sweden)
-display locale: ID: sv_SE, Name: Swedish (Sweden)
-format locale: ID: sv_SE, Name: Swedish (Sweden)
-default charset: ISO-8859-15
-
-OS Locale:  sv_SE.ISO8859-15@euro
-default locale: ID: sv_SE, Name: Swedish (Sweden)
-display locale: ID: sv_SE, Name: Swedish (Sweden)
-format locale: ID: sv_SE, Name: Swedish (Sweden)
-default charset: ISO-8859-15
-
-OS Locale:  sv_SE.UTF-8
-default locale: ID: sv_SE, Name: Swedish (Sweden)
-display locale: ID: sv_SE, Name: Swedish (Sweden)
-format locale: ID: sv_SE, Name: Swedish (Sweden)
-default charset: UTF-8
-
-OS Locale:  sv_SE.UTF-8@euro
-default locale: ID: sv_SE, Name: Swedish (Sweden)
-display locale: ID: sv_SE, Name: Swedish (Sweden)
-format locale: ID: sv_SE, Name: Swedish (Sweden)
-default charset: UTF-8
-
-OS Locale:  th
-default locale: ID: th_TH, Name: Thai (Thailand)
-display locale: ID: th_TH, Name: Thai (Thailand)
-format locale: ID: th_TH, Name: Thai (Thailand)
-default charset: TIS-620
-
-OS Locale:  th_TH
-default locale: ID: th_TH, Name: Thai (Thailand)
-display locale: ID: th_TH, Name: Thai (Thailand)
-format locale: ID: th_TH, Name: Thai (Thailand)
-default charset: TIS-620
-
-OS Locale:  th_TH.ISO8859-11
-default locale: ID: th_TH, Name: Thai (Thailand)
-display locale: ID: th_TH, Name: Thai (Thailand)
-format locale: ID: th_TH, Name: Thai (Thailand)
-default charset: TIS-620
-
-OS Locale:  th_TH.TIS620
-default locale: ID: th_TH, Name: Thai (Thailand)
-display locale: ID: th_TH, Name: Thai (Thailand)
-format locale: ID: th_TH, Name: Thai (Thailand)
-default charset: TIS-620
-
-OS Locale:  th_TH.UTF-8
-default locale: ID: th_TH, Name: Thai (Thailand)
-display locale: ID: th_TH, Name: Thai (Thailand)
-format locale: ID: th_TH, Name: Thai (Thailand)
-default charset: UTF-8
-
-OS Locale:  tr
-default locale: ID: tr_TR, Name: Turkish (Turkey)
-display locale: ID: tr_TR, Name: Turkish (Turkey)
-format locale: ID: tr_TR, Name: Turkish (Turkey)
-default charset: ISO-8859-9
-
-OS Locale:  tr_TR
-default locale: ID: tr_TR, Name: Turkish (Turkey)
-display locale: ID: tr_TR, Name: Turkish (Turkey)
-format locale: ID: tr_TR, Name: Turkish (Turkey)
-default charset: ISO-8859-9
-
-OS Locale:  tr_TR.ISO8859-9
-default locale: ID: tr_TR, Name: Turkish (Turkey)
-display locale: ID: tr_TR, Name: Turkish (Turkey)
-format locale: ID: tr_TR, Name: Turkish (Turkey)
-default charset: ISO-8859-9
-
-OS Locale:  tr_TR.UTF-8
-default locale: ID: tr_TR, Name: Turkish (Turkey)
-display locale: ID: tr_TR, Name: Turkish (Turkey)
-format locale: ID: tr_TR, Name: Turkish (Turkey)
-default charset: UTF-8
-
-OS Locale:  zh
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GB2312
-
-OS Locale:  zh.GBK
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GBK
-
-OS Locale:  zh.UTF-8
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: UTF-8
-
-OS Locale:  zh_CN.EUC
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GB2312
-
-OS Locale:  zh_CN.EUC@pinyin
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GB2312
-
-OS Locale:  zh_CN.EUC@radical
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GB2312
-
-OS Locale:  zh_CN.EUC@stroke
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GB2312
-
-OS Locale:  zh_CN.GB18030
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GB18030
-
-OS Locale:  zh_CN.GB18030@pinyin
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GB18030
-
-OS Locale:  zh_CN.GB18030@radical
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GB18030
-
-OS Locale:  zh_CN.GB18030@stroke
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GB18030
-
-OS Locale:  zh_CN.GBK
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GBK
-
-OS Locale:  zh_CN.GBK@pinyin
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GBK
-
-OS Locale:  zh_CN.GBK@radical
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GBK
-
-OS Locale:  zh_CN.GBK@stroke
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: GBK
-
-OS Locale:  zh_CN.UTF-8
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: UTF-8
-
-OS Locale:  zh_CN.UTF-8@pinyin
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: UTF-8
-
-OS Locale:  zh_CN.UTF-8@radical
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: UTF-8
-
-OS Locale:  zh_CN.UTF-8@stroke
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: UTF-8
-
-OS Locale:  zh_HK.BIG5HK
-default locale: ID: zh_HK, Name: Chinese (Hong Kong)
-display locale: ID: zh_HK, Name: Chinese (Hong Kong)
-format locale: ID: zh_HK, Name: Chinese (Hong Kong)
-default charset: x-Big5-HKSCS-2001
-
-OS Locale:  zh_HK.BIG5HK@radical
-default locale: ID: zh_HK, Name: Chinese (Hong Kong)
-display locale: ID: zh_HK, Name: Chinese (Hong Kong)
-format locale: ID: zh_HK, Name: Chinese (Hong Kong)
-default charset: x-Big5-HKSCS-2001
-
-OS Locale:  zh_HK.BIG5HK@stroke
-default locale: ID: zh_HK, Name: Chinese (Hong Kong)
-display locale: ID: zh_HK, Name: Chinese (Hong Kong)
-format locale: ID: zh_HK, Name: Chinese (Hong Kong)
-default charset: x-Big5-HKSCS-2001
-
-OS Locale:  zh_HK.UTF-8
-default locale: ID: zh_HK, Name: Chinese (Hong Kong)
-display locale: ID: zh_HK, Name: Chinese (Hong Kong)
-format locale: ID: zh_HK, Name: Chinese (Hong Kong)
-default charset: UTF-8
-
-OS Locale:  zh_HK.UTF-8@radical
-default locale: ID: zh_HK, Name: Chinese (Hong Kong)
-display locale: ID: zh_HK, Name: Chinese (Hong Kong)
-format locale: ID: zh_HK, Name: Chinese (Hong Kong)
-default charset: UTF-8
-
-OS Locale:  zh_HK.UTF-8@stroke
-default locale: ID: zh_HK, Name: Chinese (Hong Kong)
-display locale: ID: zh_HK, Name: Chinese (Hong Kong)
-format locale: ID: zh_HK, Name: Chinese (Hong Kong)
-default charset: UTF-8
-
-OS Locale:  zh_TW
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: x-EUC-TW
-
-OS Locale:  zh_TW.BIG5
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: x-Big5-Solaris
-
-OS Locale:  zh_TW.BIG5@pinyin
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: x-Big5-Solaris
-
-OS Locale:  zh_TW.BIG5@radical
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: x-Big5-Solaris
-
-OS Locale:  zh_TW.BIG5@stroke
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: x-Big5-Solaris
-
-OS Locale:  zh_TW.BIG5@zhuyin
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: x-Big5-Solaris
-
-OS Locale:  zh_TW.EUC
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: x-EUC-TW
-
-OS Locale:  zh_TW.EUC@pinyin
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: x-EUC-TW
-
-OS Locale:  zh_TW.EUC@radical
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: x-EUC-TW
-
-OS Locale:  zh_TW.EUC@stroke
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: x-EUC-TW
-
-OS Locale:  zh_TW.EUC@zhuyin
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: x-EUC-TW
-
-OS Locale:  zh_TW.UTF-8
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: UTF-8
-
-OS Locale:  zh_TW.UTF-8@pinyin
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: UTF-8
-
-OS Locale:  zh_TW.UTF-8@radical
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: UTF-8
-
-OS Locale:  zh_TW.UTF-8@stroke
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: UTF-8
-
-OS Locale:  zh_TW.UTF-8@zhuyin
-default locale: ID: zh_TW, Name: Chinese (Taiwan)
-display locale: ID: zh_TW, Name: Chinese (Taiwan)
-format locale: ID: zh_TW, Name: Chinese (Taiwan)
-default charset: UTF-8
-
-Testing some typical combinations
-
-
-OS Locale (LC_CTYPE: ja_JP.UTF-8, LC_MESSAGES: zh_CN.UTF-8)
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: ja_JP, Name: Japanese (Japan)
-default charset: UTF-8
-
-OS Locale (LC_CTYPE: zh_CN.UTF-8, LC_MESSAGES: en_US.UTF-8)
-default locale: ID: en_US, Name: English (United States)
-display locale: ID: en_US, Name: English (United States)
-format locale: ID: zh_CN, Name: Chinese (China)
-default charset: UTF-8
-
-OS Locale (LC_CTYPE: C, LC_MESSAGES: zh_CN.UTF-8)
-default locale: ID: zh_CN, Name: Chinese (China)
-display locale: ID: zh_CN, Name: Chinese (China)
-format locale: ID: en_CN, Name: English (China)
-default charset: US-ASCII
Binary file test/sun/management/jmxremote/bootstrap/linux-i586/launcher has changed
Binary file test/sun/management/jmxremote/bootstrap/solaris-i586/launcher has changed
Binary file test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher has changed
Binary file test/sun/management/windows/revokeall.exe has changed
--- a/test/sun/net/InetAddress/nameservice/dns/cname.sh	Thu Aug 16 11:43:24 2012 -0700
+++ b/test/sun/net/InetAddress/nameservice/dns/cname.sh	Fri Aug 24 09:29:17 2012 +0100
@@ -33,7 +33,7 @@
 
 # The host that we try to resolve
 
-HOST=www-proxy.us.oracle.com
+HOST=developer.classpath.org
 
 # fail gracefully if DNS is not configured or there
 # isn't a CNAME record.