Merge

THIRD_PARTY_README

@@ -2905,55 +2905,6 @@ contained herein or direct, indirect, special, incidental or
 consequential damages in connection with the furnishing,
 performance, or use of this material.
 
-*/
-_____________________________________
-Copyright notice in keysym2ucs.h:
-
-Copyright 1987, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
 */
 
 --- end of LICENSE ---

src/solaris/classes/sun/awt/X11/XKeysym.java

-// This is a generated file: do not edit! Edit keysym2ucs.h if necessary.
-
 /*
  * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,6 +23,19 @@
  * questions.
  */
 
+/*
+ * This file was originally generated by a tool that embedded much of
+ * an X11 keysym header file, keysym2ucs.h, turned into a Java program,
+ * and which also consumed an UnicodeData.txt database file.
+ * keysym2ucs.h and a genhash.awk script were checked in alongside this
+ * source file. Maintaining the Java program to match updated versions
+ * of keysym2ucs.h is too burdensome, since it is rarely, needed and any
+ * updates will be minimal, so they have been removed and
+ * this file can now be hand maintained. If it ever becomes necessary
+ * to re-generate it, then the deleted files can be recovered from
+ * the history.
+ */
+
 package sun.awt.X11;
 import java.util.Hashtable;
 import sun.misc.Unsafe;
@@ -33,15 +44,6 @@ import sun.util.logging.PlatformLogger;
 
 public class XKeysym {
 
-    public static void main( String args[] ) {
-       System.out.println( "Cyrillc zhe:"+convertKeysym(0x06d6, 0));
-       System.out.println( "Arabic sheen:"+convertKeysym(0x05d4, 0));
-       System.out.println( "Latin a breve:"+convertKeysym(0x01e3, 0));
-       System.out.println( "Latin f:"+convertKeysym(0x066, 0));
-       System.out.println( "Backspace:"+Integer.toHexString(convertKeysym(0xff08, 0)));
-       System.out.println( "Ctrl+f:"+Integer.toHexString(convertKeysym(0x066, XConstants.ControlMask)));
-    }
-
     private XKeysym() {}
 
     static class Keysym2JavaKeycode  {
@@ -71,7 +73,7 @@ public class XKeysym {
     static long keysym_uppercase = unsafe.allocateMemory(Native.getLongSize());
     static Keysym2JavaKeycode kanaLock = new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_KANA_LOCK,
                                                                 java.awt.event.KeyEvent.KEY_LOCATION_STANDARD);
-    private static PlatformLogger keyEventLog = PlatformLogger.getLogger("sun.awt.X11.kye.XKeysym");
+    private static PlatformLogger keyEventLog = PlatformLogger.getLogger("sun.awt.X11.key.XKeysym");
     public static char convertKeysym( long ks, int state ) {
 
         /* First check for Latin-1 characters (1:1 mapping) */

src/solaris/classes/sun/awt/X11/genhash.awk

-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#  With this script one can generate a new version XKeysym.java file out
-#  of keysym2ucs.h prototype and UnicodeData.txt database.
-#  Latter file should be fetched from a unicode.org site, most
-#  probably http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
-#
-BEGIN {   FS=";";
-          while((getline < "UnicodeData.txt")){
-              unic[$1]=$2;
-          }
-          FS=" ";
-          print("// This is a generated file: do not edit! Edit keysym2ucs.h if necessary.\n");          
-      }
-
-/^0x/{
-         if( $1 != "0x0000" ) {
-             ndx =  toupper($1);
-             sub(/0X/, "", ndx);
-             printf("        keysym2UCSHash.put( (long)%s, (char)%s); // %s -->%s\n",
-                        $4, $1, $3, (unic[ndx]=="" ? "" : " " unic[ndx]));
-         }
-     }
-/tojava/ { sub(/tojava /, ""); sub(/tojava$/, ""); print}    

test/sun/security/lib/cacerts/VerifyCACerts.java

@@ -25,7 +25,7 @@
 /**
  * @test
  * @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779
- *      8209452 8209506 8210432 8195793 8216577 8222089 8222133 8222137
+ *      8209452 8209506 8210432 8195793 8216577 8222089 8222133 8222137 8222136
  * @summary Check root CA entries in cacerts file
  */
 import java.io.File;
@@ -49,7 +49,7 @@ public class VerifyCACerts {
             + File.separator + "security" + File.separator + "cacerts";
 
     // The numbers of certs now.
-    private static final int COUNT = 92;
+    private static final int COUNT = 90;
 
     // map of cert alias to SHA-256 fingerprint
     @SuppressWarnings("serial")
@@ -86,10 +86,6 @@ public class VerifyCACerts {
                     "4F:F4:60:D5:4B:9C:86:DA:BF:BC:FC:57:12:E0:40:0D:2B:ED:3F:BC:4D:4F:BD:AA:86:E0:6A:DC:D2:A9:AD:7A");
             put("utnuserfirstobjectca [jdk]",
                     "6F:FF:78:E4:00:A7:0C:11:01:1C:D8:59:77:C4:59:FB:5A:F9:6A:3D:F0:54:08:20:D0:F4:B8:60:78:75:E5:8F");
-            put("utnuserfirstclientauthemailca [jdk]",
-                    "43:F2:57:41:2D:44:0D:62:74:76:97:4F:87:7D:A8:F1:FC:24:44:56:5A:36:7A:E6:0E:DD:C2:7A:41:25:31:AE");
-            put("utnuserfirsthardwareca [jdk]",
-                    "6E:A5:47:41:D0:04:66:7E:ED:1B:48:16:63:4A:A3:A7:9E:6E:4B:96:95:0F:82:79:DA:FC:8D:9B:D8:81:21:37");
             put("addtrustclass1ca [jdk]",
                     "8C:72:09:27:9A:C0:4E:27:5E:16:D0:7F:D3:B7:75:E8:01:54:B5:96:80:46:E3:1F:52:DD:25:76:63:24:E9:A7");
             put("addtrustexternalca [jdk]",
@@ -254,10 +250,6 @@ public class VerifyCACerts {
             add("certplusclass3pprimaryca [jdk]");
             // Valid until: Tue Jul 09 14:40:36 EDT 2019
             add("utnuserfirstobjectca [jdk]");
-            // Valid until: Tue Jul 09 13:36:58 EDT 2019
-            add("utnuserfirstclientauthemailca [jdk]");
-            // Valid until: Tue Jul 09 14:19:22 EDT 2019
-            add("utnuserfirsthardwareca [jdk]");
         }
     };