changeset 41074:ff67d4b3c085

Merge
author amurillo
date Sat, 10 Sep 2016 12:23:52 -0700
parents ed43eecbd166 cdc9d0ff3fa2
children d60e54a9bb67
files jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorRulesProvider.java jdk/src/jdk.localedata/share/classes/sun/text/resources/thai_dict jdk/test/sun/security/krb5/auto/unreachable.krb5.conf test/lib/share/classes/jdk/test/lib/Asserts.java test/lib/share/classes/jdk/test/lib/JDKToolFinder.java test/lib/share/classes/jdk/test/lib/JDKToolLauncher.java test/lib/share/classes/jdk/test/lib/Platform.java test/lib/share/classes/jdk/test/lib/Utils.java test/lib/share/classes/jdk/test/lib/apps/LingeredApp.java test/lib/share/classes/jdk/test/lib/apps/LingeredAppWithDeadlock.java test/lib/share/classes/jdk/test/lib/hprof/HprofParser.java test/lib/share/classes/jdk/test/lib/hprof/README test/lib/share/classes/jdk/test/lib/hprof/model/AbstractJavaHeapObjectVisitor.java test/lib/share/classes/jdk/test/lib/hprof/model/ArrayTypeCodes.java test/lib/share/classes/jdk/test/lib/hprof/model/HackJavaValue.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaBoolean.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaByte.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaChar.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaClass.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaDouble.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaField.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaFloat.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaHeapObject.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaHeapObjectVisitor.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaInt.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaLazyReadObject.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaLong.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaObject.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaObjectArray.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaObjectRef.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaShort.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaStatic.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaThing.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaValue.java test/lib/share/classes/jdk/test/lib/hprof/model/JavaValueArray.java test/lib/share/classes/jdk/test/lib/hprof/model/ReachableExcludes.java test/lib/share/classes/jdk/test/lib/hprof/model/ReachableExcludesImpl.java test/lib/share/classes/jdk/test/lib/hprof/model/ReachableObjects.java test/lib/share/classes/jdk/test/lib/hprof/model/ReferenceChain.java test/lib/share/classes/jdk/test/lib/hprof/model/Root.java test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java test/lib/share/classes/jdk/test/lib/hprof/model/StackFrame.java test/lib/share/classes/jdk/test/lib/hprof/model/StackTrace.java test/lib/share/classes/jdk/test/lib/hprof/parser/FileReadBuffer.java test/lib/share/classes/jdk/test/lib/hprof/parser/HprofReader.java test/lib/share/classes/jdk/test/lib/hprof/parser/MappedReadBuffer.java test/lib/share/classes/jdk/test/lib/hprof/parser/PositionDataInputStream.java test/lib/share/classes/jdk/test/lib/hprof/parser/PositionInputStream.java test/lib/share/classes/jdk/test/lib/hprof/parser/ReadBuffer.java test/lib/share/classes/jdk/test/lib/hprof/parser/Reader.java test/lib/share/classes/jdk/test/lib/hprof/util/ArraySorter.java test/lib/share/classes/jdk/test/lib/hprof/util/Comparer.java test/lib/share/classes/jdk/test/lib/hprof/util/CompositeEnumeration.java test/lib/share/classes/jdk/test/lib/hprof/util/Misc.java test/lib/share/classes/jdk/test/lib/hprof/util/VectorSorter.java test/lib/share/classes/jdk/test/lib/process/OutputAnalyzer.java test/lib/share/classes/jdk/test/lib/process/OutputBuffer.java test/lib/share/classes/jdk/test/lib/process/ProcessTools.java test/lib/share/classes/jdk/test/lib/process/StreamPumper.java
diffstat 1226 files changed, 42579 insertions(+), 15856 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Sep 10 08:25:51 2016 -0400
+++ b/.hgtags	Sat Sep 10 12:23:52 2016 -0700
@@ -376,3 +376,5 @@
 4d2a15091124488080d65848b704e25599b2aaeb jdk-9+131
 2e83d21d78cd9c1d52e6cd2599e9c8aa36ea1f52 jdk-9+132
 e17429a7e843c4a4ed3651458d0f950970edcbcc jdk-9+133
+a71210c0d9800eb6925b61ecd6198abd554f90ee jdk-9+134
+e384420383a5b79fa0012ebcb25d8f83cff7f777 jdk-9+135
--- a/.hgtags-top-repo	Sat Sep 10 08:25:51 2016 -0400
+++ b/.hgtags-top-repo	Sat Sep 10 12:23:52 2016 -0700
@@ -376,3 +376,5 @@
 8728756c2f70a79a90188f4019cfd6b9a275765c jdk-9+131
 a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132
 be1218f792a450dfb5d4b1f82616b9d95a6a732e jdk-9+133
+065724348690eda41fc69112278d8da6dcde548c jdk-9+134
+82b94cb5f342319d2cda77f9fa59703ad7fde576 jdk-9+135
--- a/common/autoconf/generated-configure.sh	Sat Sep 10 08:25:51 2016 -0400
+++ b/common/autoconf/generated-configure.sh	Sat Sep 10 12:23:52 2016 -0700
@@ -5095,7 +5095,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1470863189
+DATE_WHEN_GENERATED=1472718471
 
 ###############################################################################
 #
@@ -15944,6 +15944,8 @@
     HOTSPOT_TARGET_CPU_DEFINE=S390
   elif test "x$OPENJDK_TARGET_CPU" = xs390x; then
     HOTSPOT_TARGET_CPU_DEFINE=S390
+  elif test "x$OPENJDK_TARGET_CPU" != x; then
+    HOTSPOT_TARGET_CPU_DEFINE=$(echo $OPENJDK_TARGET_CPU | tr a-z A-Z)
   fi
 
 
@@ -16117,6 +16119,8 @@
     HOTSPOT_BUILD_CPU_DEFINE=S390
   elif test "x$OPENJDK_BUILD_CPU" = xs390x; then
     HOTSPOT_BUILD_CPU_DEFINE=S390
+  elif test "x$OPENJDK_BUILD_CPU" != x; then
+    HOTSPOT_BUILD_CPU_DEFINE=$(echo $OPENJDK_BUILD_CPU | tr a-z A-Z)
   fi
 
 
--- a/common/autoconf/platform.m4	Sat Sep 10 08:25:51 2016 -0400
+++ b/common/autoconf/platform.m4	Sat Sep 10 12:23:52 2016 -0700
@@ -454,6 +454,8 @@
     HOTSPOT_$1_CPU_DEFINE=S390
   elif test "x$OPENJDK_$1_CPU" = xs390x; then
     HOTSPOT_$1_CPU_DEFINE=S390
+  elif test "x$OPENJDK_$1_CPU" != x; then
+    HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
   fi
   AC_SUBST(HOTSPOT_$1_CPU_DEFINE)
 
--- a/corba/.hgtags	Sat Sep 10 08:25:51 2016 -0400
+++ b/corba/.hgtags	Sat Sep 10 12:23:52 2016 -0700
@@ -376,3 +376,5 @@
 f7e1d5337c2e550fe553df7a3886bbed80292ecd jdk-9+131
 1ab4b9399c4cba584f66c1c088188f2f565fbf9c jdk-9+132
 2021bfedf1c478a4808a7711a6090682a12f4c0e jdk-9+133
+1a497f5ca0cfd88115cc7daa8af8a62b8741caf2 jdk-9+134
+094d0db606db976045f594dba47d4593b715cc81 jdk-9+135
--- a/hotspot/.hgtags	Sat Sep 10 08:25:51 2016 -0400
+++ b/hotspot/.hgtags	Sat Sep 10 12:23:52 2016 -0700
@@ -536,3 +536,5 @@
 943bf73b49c33c2d7cbd796f6a4ae3c7a00ae932 jdk-9+131
 713951c08aa26813375175c2ab6cc99ff2a56903 jdk-9+132
 a25e0fb6033245ab075136e744d362ce765464cd jdk-9+133
+b8b694c6b4d2ab0939aed7adaf0eec1ac321a085 jdk-9+134
+3b1c4562953db47e36b237a500f368d5c9746d47 jdk-9+135
--- a/jaxp/.hgtags	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/.hgtags	Sat Sep 10 12:23:52 2016 -0700
@@ -376,3 +376,5 @@
 874082a9b565a7092a40bfa934a6e3e3c3455a60 jdk-9+131
 907445d85e680ea410fe2c83c0ec64b5508e4f3e jdk-9+132
 9490ba2e5e41685c858a0ca2a6ec87611eb011c6 jdk-9+133
+1c6c21d87aa459d82425e1fddc9ce8647aebde34 jdk-9+134
+f695240370c77a25fed88225a392e7d530cb4d78 jdk-9+135
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java	Sat Sep 10 12:23:52 2016 -0700
@@ -1,13 +1,14 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  */
+
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -17,9 +18,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * $Id: TransletOutput.java,v 1.2.4.1 2005/09/05 09:19:44 pvedula Exp $
- */
 
 package com.sun.org.apache.xalan.internal.xsltc.compiler;
 
@@ -35,6 +33,7 @@
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Type;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.TypeCheckError;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Util;
+import jdk.xml.internal.JdkXmlFeatures;
 
 /**
  * @author Morten Jorgensen
@@ -103,8 +102,10 @@
         final InstructionList il = methodGen.getInstructionList();
         final boolean isSecureProcessing = classGen.getParser().getXSLTC()
                                            .isSecureProcessing();
+        final boolean isExtensionFunctionEnabled = classGen.getParser().getXSLTC()
+                .getFeature(JdkXmlFeatures.XmlFeature.ENABLE_EXTENSION_FUNCTION);
 
-        if (isSecureProcessing) {
+        if (isSecureProcessing && !isExtensionFunctionEnabled) {
             int index = cpg.addMethodref(BASIS_LIBRARY_CLASS,
                                          "unallowed_extension_elementF",
                                          "(Ljava/lang/String;)V");
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java	Sat Sep 10 12:23:52 2016 -0700
@@ -111,6 +111,9 @@
 
     private boolean _useServicesMechanism;
 
+    // The OutputStream for redirect function
+    private FileOutputStream output = null;
+
     /**
      * protocols allowed for external references set by the stylesheet processing instruction, Document() function, Import and Include element.
      */
@@ -567,9 +570,10 @@
                dir.mkdirs();
             }
 
+            output = new FileOutputStream(filename, append);
             factory.setEncoding(_encoding);
             factory.setOutputMethod(_method);
-            factory.setOutputStream(new BufferedOutputStream(new FileOutputStream(filename, append)));
+            factory.setOutputStream(new BufferedOutputStream(output));
             factory.setOutputType(TransletOutputHandlerFactory.STREAM);
 
             final SerializationHandler handler
@@ -594,6 +598,9 @@
         try {
             handler.endDocument();
             handler.close();
+            if (output != null) {
+                output.close();
+            }
         }
         catch (Exception e) {
             // what can you do?
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java	Sat Sep 10 12:23:52 2016 -0700
@@ -31,6 +31,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -72,9 +73,6 @@
     //System Id for this catalog
     String systemId;
 
-    //The parent
-    CatalogImpl parent = null;
-
     /*
      A list of catalog entry files from the input, excluding the current catalog.
      Paths in the List are normalized.
@@ -107,7 +105,7 @@
      * catalog file.
      */
     public CatalogImpl(CatalogImpl parent, CatalogFeatures f, String... file) throws CatalogException {
-        super(CatalogEntryType.CATALOG);
+        super(CatalogEntryType.CATALOG, parent);
         if (f == null) {
             throw new NullPointerException(
                     formatMessage(CatalogMessages.ERR_NULL_ARGUMENT, new Object[]{"CatalogFeatures"}));
@@ -117,7 +115,7 @@
             CatalogMessages.reportNPEOnNull("The path to the catalog file", file[0]);
         }
 
-        init(parent, f);
+        init(f);
 
         //Path of catalog files
         String[] catalogFile = file;
@@ -159,19 +157,34 @@
                     }
                 }
             }
-
-            if (systemId != null) {
-                parse(systemId);
-            }
         }
     }
 
-    private void init(CatalogImpl parent, CatalogFeatures f) {
-        this.parent = parent;
+    /**
+     * Loads the catalog
+     */
+    void load() {
+        if (systemId != null) {
+            parse(systemId);
+        }
+
+        //save this catalog before loading the next
+        loadedCatalogs.put(systemId, this);
+
+        //Load delegate and alternative catalogs if defer is false.
+        if (!isDeferred()) {
+           loadDelegateCatalogs();
+           loadNextCatalogs();
+        }
+    }
+
+    private void init(CatalogFeatures f) {
         if (parent == null) {
             level = 0;
         } else {
             level = parent.level + 1;
+            this.loadedCatalogs = parent.loadedCatalogs;
+            this.catalogsSearched = parent.catalogsSearched;
         }
         if (f == null) {
             this.features = CatalogFeatures.defaults();
@@ -196,11 +209,6 @@
         entries.stream().filter((entry) -> (entry.type == CatalogEntryType.GROUP)).forEach((entry) -> {
             ((GroupEntry) entry).reset();
         });
-
-        if (parent != null) {
-            this.loadedCatalogs = parent.loadedCatalogs;
-            this.catalogsSearched = parent.catalogsSearched;
-        }
     }
 
     /**
@@ -421,16 +429,16 @@
     void loadNextCatalogs() {
         //loads catalogs specified in nextCatalogs
         if (nextCatalogs != null) {
-            for (NextCatalog next : nextCatalogs) {
+            nextCatalogs.stream().forEach((next) -> {
                 getCatalog(next.getCatalogURI());
-            }
+            });
         }
 
         //loads catalogs from the input list
         if (inputFiles != null) {
-            for (String file : inputFiles) {
+            inputFiles.stream().forEach((file) -> {
                 getCatalog(getSystemId(file));
-            }
+            });
         }
     }
 
@@ -445,14 +453,14 @@
             return null;
         }
 
-        Catalog c = null;
+        CatalogImpl c = null;
         String path = uri.toASCIIString();
 
         if (verifyCatalogFile(uri)) {
             c = getLoadedCatalog(path);
             if (c == null) {
                 c = new CatalogImpl(this, features, path);
-                saveLoadedCatalog(path, c);
+                c.load();
             }
         }
         return c;
@@ -464,7 +472,7 @@
      * @param catalogId the catalogId associated with the Catalog object
      * @param c the Catalog to be saved
      */
-    void saveLoadedCatalog(String catalogId, Catalog c) {
+    void saveLoadedCatalog(String catalogId, CatalogImpl c) {
         loadedCatalogs.put(catalogId, c);
     }
 
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java	Sat Sep 10 12:23:52 2016 -0700
@@ -62,7 +62,9 @@
      * @throws CatalogException If an error occurs while parsing the catalog
      */
     public static Catalog catalog(CatalogFeatures features, String... paths) {
-        return new CatalogImpl(features, paths);
+        CatalogImpl catalog = new CatalogImpl(features, paths);
+        catalog.load();
+        return catalog;
     }
 
     /**
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java	Sat Sep 10 12:23:52 2016 -0700
@@ -259,15 +259,6 @@
         CatalogEntryType type = CatalogEntryType.getType(localName);
         if (type == CatalogEntryType.GROUP) {
             inGroup = false;
-        } else if (type == CatalogEntryType.CATALOGENTRY) {
-            /*
-             Done reading the catalog file.
-             Load delegate and alternative catalogs if defer is false.
-             */
-            if (!catalog.isDeferred()) {
-                catalog.loadDelegateCatalogs();
-                catalog.loadNextCatalogs();
-            }
         }
     }
 
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogResolverImpl.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogResolverImpl.java	Sat Sep 10 12:23:52 2016 -0700
@@ -119,6 +119,10 @@
         String result = null;
         CatalogImpl c = (CatalogImpl)catalog;
         String uri = Normalizer.normalizeURI(href);
+        if (uri == null) {
+            return null;
+        }
+
         //check whether uri is an urn
         if (uri != null && uri.startsWith(Util.URN)) {
             String publicId = Normalizer.decodeURN(uri);
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java	Sat Sep 10 12:23:52 2016 -0700
@@ -48,6 +48,9 @@
     //Value of the prefer attribute
     boolean isPreferPublic = true;
 
+    //The parent of the catalog instance
+    CatalogImpl parent = null;
+
     //The catalog instance this group belongs to
     CatalogImpl catalog;
 
@@ -55,10 +58,10 @@
     List<BaseEntry> entries = new ArrayList<>();
 
     //loaded delegated catalog by system id
-    Map<String, Catalog> delegateCatalogs = new HashMap<>();
+    Map<String, CatalogImpl> delegateCatalogs = new HashMap<>();
 
     //A list of all loaded Catalogs, including this, and next catalogs
-    Map<String, Catalog> loadedCatalogs = new HashMap<>();
+    Map<String, CatalogImpl> loadedCatalogs = new HashMap<>();
 
     /*
      A list of Catalog Ids that have already been searched in a matching
@@ -136,8 +139,9 @@
      *
      * @param type The type of the entry
      */
-    public GroupEntry(CatalogEntryType type) {
+    public GroupEntry(CatalogEntryType type, CatalogImpl parent) {
         super(type);
+        this.parent = parent;
     }
 
     /**
@@ -163,7 +167,7 @@
     }
     /**
      * Constructs a group entry.
-     * @param catalog The parent catalog
+     * @param catalog The catalog this GroupEntry belongs
      * @param base The baseURI attribute
      * @param attributes The attributes
      */
@@ -445,13 +449,14 @@
      * @param catalogId the catalog Id
      */
     Catalog loadCatalog(URI catalogURI) {
-        Catalog delegateCatalog = null;
+        CatalogImpl delegateCatalog = null;
         if (catalogURI != null) {
             String catalogId = catalogURI.toASCIIString();
             delegateCatalog = getLoadedCatalog(catalogId);
             if (delegateCatalog == null) {
                 if (verifyCatalogFile(catalogURI)) {
                     delegateCatalog = new CatalogImpl(catalog, features, catalogId);
+                    delegateCatalog.load();
                     delegateCatalogs.put(catalogId, delegateCatalog);
                 }
             }
@@ -467,8 +472,8 @@
      * @return a Catalog object previously loaded, or null if none in the saved
      * list
      */
-    Catalog getLoadedCatalog(String catalogId) {
-        Catalog c = null;
+    CatalogImpl getLoadedCatalog(String catalogId) {
+        CatalogImpl c = null;
 
         //checl delegate Catalogs
         c = delegateCatalogs.get(catalogId);
@@ -504,7 +509,7 @@
         }
 
         String catalogId = catalogURI.toASCIIString();
-        if (catalogsSearched.contains(catalogId)) {
+        if (catalogsSearched.contains(catalogId) || isCircular(catalogId)) {
             CatalogMessages.reportRunTimeError(CatalogMessages.ERR_CIRCULAR_REFERENCE,
                     new Object[]{CatalogMessages.sanitize(catalogId)});
         }
@@ -512,4 +517,20 @@
         return true;
     }
 
+    /**
+     * Checks whether the catalog is circularly referenced
+     * @param systemId the system identifier of the catalog to be loaded
+     * @return true if is circular, false otherwise
+     */
+    boolean isCircular(String systemId) {
+        if (parent == null) {
+            return false;
+        }
+
+        if (parent.systemId.equals(systemId)) {
+            return true;
+        }
+
+        return parent.isCircular(systemId);
+    }
 }
--- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java	Sat Sep 10 12:23:52 2016 -0700
@@ -1072,4 +1072,3 @@
     @Override
     public abstract Object clone();
 }
-
--- a/jaxp/src/java.xml/share/classes/jdk/xml/internal/JdkXmlFeatures.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/jdk/xml/internal/JdkXmlFeatures.java	Sat Sep 10 12:23:52 2016 -0700
@@ -42,6 +42,9 @@
             ORACLE_JAXP_PROPERTY_PREFIX + "enableExtensionFunctions";
     public static final String SP_ENABLE_EXTENSION_FUNCTION =
             "javax.xml.enableExtensionFunctions";
+    // This is the correct name by the spec
+    public static final String SP_ENABLE_EXTENSION_FUNCTION_SPEC =
+            "jdk.xml.enableExtensionFunctions";
     public static final String CATALOG_FEATURES = "javax.xml.catalog.catalogFeatures";
 
     public final static String PROPERTY_USE_CATALOG = XMLConstants.USE_CATALOG;
@@ -49,11 +52,11 @@
     public static enum XmlFeature {
         /**
          * Feature enableExtensionFunctions
-         * FSP: extension function is enforced by FSP. When FSP is on, entension
+         * FSP: extension function is enforced by FSP. When FSP is on, extension
          * function is disabled.
          */
         ENABLE_EXTENSION_FUNCTION(ORACLE_ENABLE_EXTENSION_FUNCTION,
-                SP_ENABLE_EXTENSION_FUNCTION, true, false, true, true),
+                SP_ENABLE_EXTENSION_FUNCTION_SPEC, true, false, true, true),
         /**
          * The {@link javax.xml.XMLConstants.USE_CATALOG} feature.
          * FSP: USE_CATALOG is not enforced by FSP.
@@ -149,6 +152,30 @@
     }
 
     /**
+     * Maps old property names with the new ones. This map is used to keep track of
+     * name changes so that old or incorrect names continue to be supported for compatibility.
+     */
+    public static enum NameMap {
+
+        ENABLE_EXTENSION_FUNCTION(SP_ENABLE_EXTENSION_FUNCTION_SPEC, SP_ENABLE_EXTENSION_FUNCTION);
+
+        final String newName;
+        final String oldName;
+
+        NameMap(String newName, String oldName) {
+            this.newName = newName;
+            this.oldName = oldName;
+        }
+
+        String getOldName(String newName) {
+            if (newName.equals(this.newName)) {
+                return oldName;
+            }
+            return null;
+        }
+    }
+
+    /**
      * States of the settings of a property, in the order: default value, value
      * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
      * properties, and jaxp api properties
@@ -316,6 +343,15 @@
     private void readSystemProperties() {
         for (XmlFeature feature : XmlFeature.values()) {
             getSystemProperty(feature, feature.systemProperty());
+            if (!getSystemProperty(feature, feature.systemProperty())) {
+                //if system property is not found, try the older form if any
+                for (NameMap nameMap : NameMap.values()) {
+                    String oldName = nameMap.getOldName(feature.systemProperty());
+                    if (oldName != null) {
+                        getSystemProperty(feature, oldName);
+                    }
+                }
+            }
         }
     }
 
--- a/jaxp/src/java.xml/share/classes/module-info.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/module-info.java	Sat Sep 10 12:23:52 2016 -0700
@@ -92,4 +92,3 @@
     uses javax.xml.xpath.XPathFactory;
     uses org.xml.sax.XMLReader;
 }
-
--- a/jaxp/src/jdk.xml.dom/share/classes/module-info.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/src/jdk.xml.dom/share/classes/module-info.java	Sat Sep 10 12:23:52 2016 -0700
@@ -30,4 +30,3 @@
     exports org.w3c.dom.stylesheets;
     exports org.w3c.dom.xpath;
 }
-
--- a/jaxp/test/ProblemList.txt	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/ProblemList.txt	Sat Sep 10 12:23:52 2016 -0700
@@ -24,7 +24,3 @@
 ###########################################################################
 
 javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.sh            8147431 generic-all
-
-javax/xml/jaxp/unittest/common/TransformationWarningsTest.java	8150145 generic-all
-
-javax/xml/jaxp/unittest/common/ValidationWarningsTest.java      8150145 generic-all
--- a/jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -64,12 +64,12 @@
     public Object[][] data() {
         return new Object[][]{
             // By default, alternative catalogs are not loaded.
-            {createCatalog(CatalogFeatures.defaults()), 0},
+            {createCatalog(CatalogFeatures.defaults()), 1},
             // Alternative catalogs are not loaded when DEFER is set to true.
-            {createCatalog(createDeferFeature(DEFER_TRUE)), 0},
-            // The 3 alternative catalogs are not pre-loaded
+            {createCatalog(createDeferFeature(DEFER_TRUE)), 1},
+            // The 3 alternative catalogs are pre-loaded along with the parent
             //when DEFER is set to false.
-            {createCatalog(createDeferFeature(DEFER_FALSE)), 3}};
+            {createCatalog(createDeferFeature(DEFER_FALSE)), 4}};
     }
 
     private CatalogFeatures createDeferFeature(String defer) {
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -587,4 +587,3 @@
     private final BigInteger one = BigInteger.ONE;
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -77,4 +77,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -358,4 +358,3 @@
     private final int undef = DatatypeConstants.FIELD_UNDEFINED;
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -105,5 +105,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -531,5 +531,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java	Sat Sep 10 12:23:52 2016 -0700
@@ -157,5 +157,3 @@
             return null;
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -86,5 +86,3 @@
         DocumentBuilderFactory.newInstance();
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -78,5 +78,3 @@
     }
 
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -229,5 +229,3 @@
         assertFalse(spf.getFeature(EXTERNAL_P_ENTITIES));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -502,5 +502,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java	Sat Sep 10 12:23:52 2016 -0700
@@ -269,5 +269,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java	Sat Sep 10 12:23:52 2016 -0700
@@ -116,5 +116,3 @@
     }
 
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -82,4 +82,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -82,4 +82,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -67,5 +67,3 @@
     }
 
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -118,5 +118,3 @@
                 writeNodes(kids.item(i), bWriter);
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -104,5 +104,3 @@
         this.status = ListenerStatus.FATAL;
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -105,5 +105,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -431,5 +431,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -106,5 +106,3 @@
         });
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -239,5 +239,3 @@
         assertNull(transformer.getParameter(LONG_PARAM_NAME));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -384,5 +384,3 @@
     private Document xmlDoc;
 
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -105,5 +105,3 @@
         assertNotNull(te.initCause(null));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -141,5 +141,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -207,5 +207,3 @@
         System.out.println(" In fatal");
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java	Sat Sep 10 12:23:52 2016 -0700
@@ -85,5 +85,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java	Sat Sep 10 12:23:52 2016 -0700
@@ -94,5 +94,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -262,5 +262,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -54,5 +54,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -404,4 +404,3 @@
     private Document xsdDoc2;
     private byte[] xml;
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -95,4 +95,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -148,4 +148,3 @@
     private Schema schema;
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -209,4 +209,3 @@
     private Document xmlDoc;
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -491,5 +491,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -218,5 +218,3 @@
         assertNotNull(XPathFactory.newInstance(DOM_OBJECT_MODEL));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -82,5 +82,3 @@
         assertEquals(xpath.evaluate(null, "5"), "2");
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -757,5 +757,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -151,4 +151,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -48,4 +48,3 @@
         return document.createComment(text);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -175,4 +175,3 @@
         doc.createElement("!nc$%^*(!");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -92,4 +92,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -129,4 +129,3 @@
         assertEquals(documentType.getName(), name);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -255,4 +255,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -61,4 +61,3 @@
         assertEquals(nl.getLength(), 3);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -121,4 +121,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -64,4 +64,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -211,4 +211,3 @@
         transformer.transform(domSource, streamResult);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -74,4 +74,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -54,4 +54,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -74,4 +74,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -140,4 +140,3 @@
 
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -202,5 +202,3 @@
         attr.removeAttribute(1);
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -74,5 +74,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -76,5 +76,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -264,5 +264,3 @@
             bWriter.close();
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -272,5 +272,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -135,5 +135,3 @@
         bWriter.close();
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -131,5 +131,3 @@
         assertNull(support.getURI(DC_PREFIX));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -168,5 +168,3 @@
         assertFalse(spf.getFeature(NAMESPACE_PREFIXES));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -265,5 +265,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -143,5 +143,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -107,5 +107,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -285,5 +285,3 @@
             bWriter.close();
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -246,5 +246,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -112,5 +112,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -76,5 +76,3 @@
         XMLReaderFactory.createXMLReader("org.apache.crimson.parser.ABCD");
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -131,5 +131,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -671,5 +671,3 @@
     public void internalEntityDecl(String name, String value) {
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -145,4 +145,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -182,4 +182,3 @@
         return dbf.newDocumentBuilder();
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -89,4 +89,3 @@
         assertEquals(QName.valueOf(qname.toString()), qname);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/astro/SAX201Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/SAX201Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -48,4 +48,3 @@
         reader.setDTDHandler(null); // SAX 2.0.1 allows
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -76,4 +76,3 @@
         return spf.newSAXParser();
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/astro/XPathAPITest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/XPathAPITest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -171,4 +171,3 @@
         return new InputSource(filenameToURL(ASTROCAT));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java	Sat Sep 10 12:23:52 2016 -0700
@@ -366,5 +366,3 @@
         assertTrue(roletypeInfo.getTypeNamespace().equals(PORTAL_ACCOUNT_NS));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java	Sat Sep 10 12:23:52 2016 -0700
@@ -371,5 +371,3 @@
         assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java	Sat Sep 10 12:23:52 2016 -0700
@@ -304,5 +304,3 @@
         assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java	Sat Sep 10 12:23:52 2016 -0700
@@ -64,4 +64,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java	Sat Sep 10 12:23:52 2016 -0700
@@ -90,4 +90,3 @@
 
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java	Sat Sep 10 12:23:52 2016 -0700
@@ -62,4 +62,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java	Sat Sep 10 12:23:52 2016 -0700
@@ -128,4 +128,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java	Sat Sep 10 12:23:52 2016 -0700
@@ -81,4 +81,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java	Sat Sep 10 12:23:52 2016 -0700
@@ -81,4 +81,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java	Sat Sep 10 12:23:52 2016 -0700
@@ -247,4 +247,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/BasicModularXMLParserTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/BasicModularXMLParserTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -93,7 +93,7 @@
      */
     public void testWithOneProvider() throws Exception {
         int exitValue
-            = executeTestJava("-mp", MOD_DIR1.toString(),
+            = executeTestJava("--module-path", MOD_DIR1.toString(),
                               "-cp", CLASSES_DIR.toString(),
                               "Main", "xmlprovider1")
                 .outputTo(System.out)
@@ -108,7 +108,7 @@
      */
     public void testWithTwoProvider() throws Exception {
         int exitValue
-            = executeTestJava("-mp", MOD_DIR1.toString() + File.pathSeparator + MOD_DIR2.toString(),
+            = executeTestJava("--module-path", MOD_DIR1.toString() + File.pathSeparator + MOD_DIR2.toString(),
                               "-cp", CLASSES_DIR.toString(),
                               "Main", "xmlprovider1", "xmlprovider2")
                 .outputTo(System.out)
--- a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/test/module-info.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/test/module-info.java	Sat Sep 10 12:23:52 2016 -0700
@@ -24,4 +24,4 @@
 module test {
     requires java.xml;
     exports test;
-}
\ No newline at end of file
+}
--- a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/module-info.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/module-info.java	Sat Sep 10 12:23:52 2016 -0700
@@ -31,4 +31,4 @@
     provides javax.xml.transform.TransformerFactory with xp1.TransformerFactoryImpl;
     provides javax.xml.validation.SchemaFactory with xp1.SchemaFactoryImpl;
     provides javax.xml.xpath.XPathFactory with xp1.XPathFactoryImpl;
-}
\ No newline at end of file
+}
--- a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/module-info.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/module-info.java	Sat Sep 10 12:23:52 2016 -0700
@@ -27,4 +27,4 @@
     provides javax.xml.datatype.DatatypeFactory with xp2.DatatypeFactoryImpl;
     provides javax.xml.stream.XMLEventFactory with xp2.XMLEventFactoryImpl;
     provides org.xml.sax.XMLReader with xp2.XMLReaderImpl;
-}
\ No newline at end of file
+}
--- a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -92,6 +92,34 @@
         super.setUp();
     }
 
+    /*
+     * @bug 8162431
+     * Verifies that circular references are caught and
+     * CatalogException is thrown.
+     */
+    @Test(dataProvider = "getFeatures", expectedExceptions = CatalogException.class)
+    public void testCircularRef(CatalogFeatures cf, String xml) {
+        CatalogResolver catalogResolver = CatalogManager.catalogResolver(
+                cf,
+                getClass().getResource(xml).getFile());
+        catalogResolver.resolve("anyuri", "");
+    }
+
+    /*
+       DataProvider: used to verify circular reference
+        Data columns: CatalogFeatures, catalog
+     */
+    @DataProvider(name = "getFeatures")
+    public Object[][] getFeatures() {
+
+        return new Object[][]{
+            {CatalogFeatures.builder().with(CatalogFeatures.Feature.DEFER, "false").build(),
+                "catalogReferCircle-itself.xml"},
+            {CatalogFeatures.defaults(), "catalogReferCircle-itself.xml"},
+            {CatalogFeatures.builder().with(CatalogFeatures.Feature.DEFER, "false").build(),
+                "catalogReferCircle-left.xml"},
+            {CatalogFeatures.defaults(), "catalogReferCircle-left.xml"},};
+    }
 
     /*
      * @bug 8163232
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/catalogReferCircle-itself.xml	Sat Sep 10 12:23:52 2016 -0700
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <nextCatalog catalog="catalogReferCircle-itself.xml" />
+</catalog>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/catalogReferCircle-left.xml	Sat Sep 10 12:23:52 2016 -0700
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <nextCatalog catalog="catalogReferCircle-right.xml" />
+</catalog>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/catalogReferCircle-right.xml	Sat Sep 10 12:23:52 2016 -0700
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <nextCatalog catalog="catalogReferCircle-left.xml" />
+</catalog>
+
--- a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java	Sat Sep 10 12:23:52 2016 -0700
@@ -75,4 +75,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -68,4 +68,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -486,4 +486,3 @@
         return document;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -114,4 +114,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/Sources.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Sources.java	Sat Sep 10 12:23:52 2016 -0700
@@ -213,4 +213,3 @@
         return r;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/TestSAXDriver.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/TestSAXDriver.java	Sat Sep 10 12:23:52 2016 -0700
@@ -56,4 +56,3 @@
 
     private static final String ENT_EXP_LIMIT_PROP = "http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit";
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -42,12 +42,13 @@
  * @test
  * @bug 8144593
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
+ * @compile -XDignore.symbol.file TestSAXDriver.java
  * @run testng/othervm -DrunSecMngr=true common.TransformationWarningsTest
  * @run testng/othervm common.TransformationWarningsTest
  * @summary Check that warnings about unsupported properties from parsers
  * are suppressed during the transformation process.
  */
-@Listeners({jaxp.library.BasePolicy.class})
+@Listeners({jaxp.library.BasePolicy.class, jaxp.library.InternalAPIPolicy.class})
 public class TransformationWarningsTest extends WarningsTestBase {
 
     @BeforeClass
@@ -80,7 +81,12 @@
         Source xslsrc = new StreamSource(new StringReader(xsl));
 
         // Create factory and transformer
-        TransformerFactory tf = TransformerFactory.newInstance();
+        TransformerFactory tf;
+        // newTransformer() method doc states that different transformer
+        // factories can be used concurrently by different Threads.
+        synchronized (TransformerFactory.class) {
+            tf = TransformerFactory.newInstance();
+        }
         Transformer t = tf.newTransformer(xslsrc);
 
         // Set URI Resolver to return the newly constructed xml
@@ -99,4 +105,3 @@
             + "</xsl:stylesheet>";
     private static final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root></root>";
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -46,6 +46,7 @@
  * @bug 8144593
  * @key intermittent
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
+ * @compile -XDignore.symbol.file TestSAXDriver.java
  * @run testng/othervm -DrunSecMngr=true common.ValidationWarningsTest
  * @run testng/othervm common.ValidationWarningsTest
  * @summary Check that warnings about unsupported properties from SAX
@@ -84,4 +85,3 @@
     private static final String xml = "<?xml version='1.0'?><test>Element</test>";
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/WarningsTestBase.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/WarningsTestBase.java	Sat Sep 10 12:23:52 2016 -0700
@@ -23,11 +23,15 @@
 
 package common;
 
+import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -58,25 +62,27 @@
         PrintStream defStdErr = System.err;
         //Set new byte array stream as standard error stream
         ByteArrayOutputStream byteStream = new ByteArrayOutputStream(5000);
-        System.setErr(new PrintStream(byteStream));
+        runWithAllPerm(() -> System.setErr(new PrintStream(byteStream)));
         //Execute multiple TestWorker tasks
         for (int id = 0; id < THREADS_COUNT; id++) {
             EXECUTOR.execute(new TestWorker(id));
         }
         //Initiate shutdown of previously submitted task
-        EXECUTOR.shutdown();
+        runWithAllPerm(EXECUTOR::shutdown);
         //Wait for termination of submitted tasks
         if (!EXECUTOR.awaitTermination(THREADS_COUNT, TimeUnit.SECONDS)) {
             //If not all tasks terminates during the time out force them to shutdown
-            EXECUTOR.shutdownNow();
+            runWithAllPerm(EXECUTOR::shutdownNow);
         }
         //Restore default standard error stream
-        System.setErr(defStdErr);
+        runWithAllPerm(() -> System.setErr(defStdErr));
         //Print tasks stderr output
         String errContent = byteStream.toString();
         System.out.println("Standard error output content:");
         System.out.println(errContent);
-        //Check tasks stderr output for quatity of warning messages
+        //Check if uncaught exceptions were observed by one or more threads
+        Assert.assertFalse(uncaughtExceptions);
+        //Check tasks stderr output for quantity of warning messages
         Assert.assertTrue(warningPrintedOnce(XMLConstants.ACCESS_EXTERNAL_DTD, errContent));
         Assert.assertTrue(warningPrintedOnce(ENT_EXP_PROPERTY, errContent));
         Assert.assertTrue(warningPrintedOnce(XMLConstants.FEATURE_SECURE_PROCESSING, errContent));
@@ -123,6 +129,25 @@
         }
     }
 
+    // Thread factory that handles uncaughtExceptions and prints them
+    // to stdout instead of stderr.
+    private static class TestThreadFactory implements ThreadFactory {
+
+        public Thread newThread(final Runnable r) {
+            Thread t = Executors.defaultThreadFactory().newThread(r);
+            t.setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
+                @Override
+                public void uncaughtException(Thread t, Throwable thr) {
+                    thr.printStackTrace(System.out);
+                    uncaughtExceptions = true;
+                }
+            });
+            return t;
+        }
+    }
+
+    //Flag that indicates if one or more threads from thread pool caught unhandled exception
+    private static boolean uncaughtExceptions = false;
     //Entity expansion limit property name
     private static final String ENT_EXP_PROPERTY = "http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit";
     //Number of simultaneous test threads
@@ -130,7 +155,7 @@
     //Number of iterations per one thread
     private static final int ITERATIONS_PER_THREAD = 4;
     //Test thread pool
-    private static final ExecutorService EXECUTOR = Executors.newCachedThreadPool();
-    //Cyclic barrier for threads startup synchronisation
+    private static final ExecutorService EXECUTOR = Executors.newCachedThreadPool(new TestThreadFactory());
+    //Cyclic barrier for threads startup synchronization
     private static final CyclicBarrier BARRIER = new CyclicBarrier(THREADS_COUNT);
 }
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java	Sat Sep 10 12:23:52 2016 -0700
@@ -108,4 +108,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -57,4 +57,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -270,4 +270,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -60,4 +60,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -640,4 +640,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -484,4 +484,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -76,4 +76,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -51,4 +51,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -228,4 +228,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java	Sat Sep 10 12:23:52 2016 -0700
@@ -81,4 +81,3 @@
         return docBuilder.parse(source);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java	Sat Sep 10 12:23:52 2016 -0700
@@ -74,4 +74,3 @@
         Assert.assertTrue(hadError[0]);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java	Sat Sep 10 12:23:52 2016 -0700
@@ -53,4 +53,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java	Sat Sep 10 12:23:52 2016 -0700
@@ -69,4 +69,3 @@
         Assert.assertTrue(typeNs.length() != 0, "returned typeNamespace shouldn't be empty");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java	Sat Sep 10 12:23:52 2016 -0700
@@ -61,4 +61,3 @@
         Assert.assertFalse(type.isDerivedFrom("testNS", "Test", TypeInfo.DERIVATION_UNION));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java	Sat Sep 10 12:23:52 2016 -0700
@@ -66,4 +66,3 @@
         Assert.assertTrue(type.isDerivedFrom("testNS", "Test", 0));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java	Sat Sep 10 12:23:52 2016 -0700
@@ -139,4 +139,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java	Sat Sep 10 12:23:52 2016 -0700
@@ -118,4 +118,3 @@
         return p;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java	Sat Sep 10 12:23:52 2016 -0700
@@ -52,4 +52,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java	Sat Sep 10 12:23:52 2016 -0700
@@ -83,4 +83,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java	Sat Sep 10 12:23:52 2016 -0700
@@ -77,4 +77,3 @@
         Assert.assertEquals(systemId, systemId2);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -123,4 +123,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -78,4 +78,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -88,4 +88,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -128,4 +128,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -86,4 +86,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -72,4 +72,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -1628,4 +1628,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -54,4 +54,3 @@
         Assert.assertEquals(domImpl.getFeature("+XPath", "3.0"), null);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.java	Sat Sep 10 12:23:52 2016 -0700
@@ -135,4 +135,3 @@
         return doc;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -46,4 +46,3 @@
         Assert.assertTrue(runWithAllPerm(() -> cls.getClassLoader()) != null);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -102,4 +102,3 @@
         System.out.println("OK");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java	Sat Sep 10 12:23:52 2016 -0700
@@ -204,4 +204,3 @@
         return true;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java	Sat Sep 10 12:23:52 2016 -0700
@@ -147,4 +147,3 @@
         return src;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java	Sat Sep 10 12:23:52 2016 -0700
@@ -142,4 +142,3 @@
         return documentBuilder.newDocument();
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java	Sat Sep 10 12:23:52 2016 -0700
@@ -121,4 +121,3 @@
         return src;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -80,4 +80,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -584,4 +584,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -109,4 +109,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -319,4 +319,3 @@
         Assert.assertEquals(XML11_DOCUMENT_OUTPUT, defaultSerialization, "Invalid serialization of XML 1.1 document: ");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -70,4 +70,3 @@
         System.out.println("Success: File " + XML_FILE_NAME + " was parsed with a large value of maxOccurs.");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java	Sat Sep 10 12:23:52 2016 -0700
@@ -74,4 +74,3 @@
         r.parse(is);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java	Sat Sep 10 12:23:52 2016 -0700
@@ -101,4 +101,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java	Sat Sep 10 12:23:52 2016 -0700
@@ -68,4 +68,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java	Sat Sep 10 12:23:52 2016 -0700
@@ -56,4 +56,3 @@
         parser.parse(Bug4991020.class.getResource("Bug4991020.xml").toExternalForm(), new util.DraconianErrorHandler());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java	Sat Sep 10 12:23:52 2016 -0700
@@ -56,4 +56,3 @@
         parser.parse(Bug4991946.class.getResource("Bug4991946.xml").toExternalForm(), new util.DraconianErrorHandler());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java	Sat Sep 10 12:23:52 2016 -0700
@@ -77,4 +77,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java	Sat Sep 10 12:23:52 2016 -0700
@@ -89,4 +89,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java	Sat Sep 10 12:23:52 2016 -0700
@@ -370,4 +370,3 @@
         return System.getSecurityManager() != null;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java	Sat Sep 10 12:23:52 2016 -0700
@@ -83,4 +83,3 @@
         System.out.println("OK.");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java	Sat Sep 10 12:23:52 2016 -0700
@@ -56,4 +56,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -71,4 +71,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java	Sat Sep 10 12:23:52 2016 -0700
@@ -67,4 +67,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java	Sat Sep 10 12:23:52 2016 -0700
@@ -180,4 +180,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java	Sat Sep 10 12:23:52 2016 -0700
@@ -73,4 +73,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java	Sat Sep 10 12:23:52 2016 -0700
@@ -45,4 +45,3 @@
         System.out.println(e.getMessage());
     } // warning ()
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java	Sat Sep 10 12:23:52 2016 -0700
@@ -175,4 +175,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java	Sat Sep 10 12:23:52 2016 -0700
@@ -59,4 +59,3 @@
     public class MyHandler extends DefaultHandler {
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java	Sat Sep 10 12:23:52 2016 -0700
@@ -87,4 +87,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java	Sat Sep 10 12:23:52 2016 -0700
@@ -168,4 +168,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -81,4 +81,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -218,4 +218,3 @@
         boolean validating = false;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -80,4 +80,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -93,4 +93,3 @@
         }, new FilePermission(getSystemProperty("test.classes") + "/-", "read,write"));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147TestClass.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147TestClass.java	Sat Sep 10 12:23:52 2016 -0700
@@ -32,4 +32,3 @@
     public void doSomething(double d, ArrayList<Integer> list) {
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java	Sat Sep 10 12:23:52 2016 -0700
@@ -100,4 +100,3 @@
         assertTrue(exceptionText.contains("Unicode: " + hexString));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -75,4 +75,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java	Sat Sep 10 12:23:52 2016 -0700
@@ -45,4 +45,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java	Sat Sep 10 12:23:52 2016 -0700
@@ -53,4 +53,3 @@
         errorOccured = true;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java	Sat Sep 10 12:23:52 2016 -0700
@@ -92,4 +92,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java	Sat Sep 10 12:23:52 2016 -0700
@@ -71,4 +71,3 @@
         return parser;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -107,4 +107,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -153,4 +153,3 @@
         Assert.assertTrue(impl1.getQName(2).equals(impl3.getQName(2)));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -87,4 +87,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -60,4 +60,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -81,4 +81,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -86,4 +86,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -199,4 +199,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -251,4 +251,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -142,4 +142,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java	Sat Sep 10 12:23:52 2016 -0700
@@ -198,4 +198,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -232,4 +232,3 @@
         Assert.assertNull(nssupport.getURI(""));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java	Sat Sep 10 12:23:52 2016 -0700
@@ -38,4 +38,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/XMLReaderTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/XMLReaderTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -70,4 +70,3 @@
         XMLReaderAdapter adapter = new XMLReaderAdapter();
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -66,4 +66,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java	Sat Sep 10 12:23:52 2016 -0700
@@ -69,4 +69,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java	Sat Sep 10 12:23:52 2016 -0700
@@ -51,4 +51,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java	Sat Sep 10 12:23:52 2016 -0700
@@ -58,4 +58,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java	Sat Sep 10 12:23:52 2016 -0700
@@ -83,4 +83,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java	Sat Sep 10 12:23:52 2016 -0700
@@ -174,4 +174,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -113,4 +113,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -100,4 +100,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -110,4 +110,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -179,4 +179,3 @@
         return true;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -231,4 +231,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -178,4 +178,3 @@
         System.out.println(sw.toString());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -115,4 +115,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -71,4 +71,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -84,4 +84,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -151,4 +151,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -77,4 +77,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -67,4 +67,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -383,4 +383,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -82,4 +82,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java	Sat Sep 10 12:23:52 2016 -0700
@@ -77,4 +77,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java	Sat Sep 10 12:23:52 2016 -0700
@@ -116,4 +116,3 @@
         }, new FilePermission("/tmp/this/does/not/exist/but/that/is/ok", "read"));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -66,4 +66,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -89,4 +89,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -100,4 +100,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -83,4 +83,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java	Sat Sep 10 12:23:52 2016 -0700
@@ -94,4 +94,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -100,4 +100,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -214,4 +214,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -156,4 +156,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -113,4 +113,3 @@
         Assert.assertTrue(xif instanceof XMLInputFactory, "xif should be an instance of XMLInputFactory");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -66,4 +66,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java	Sat Sep 10 12:23:52 2016 -0700
@@ -92,4 +92,3 @@
 
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java	Sat Sep 10 12:23:52 2016 -0700
@@ -158,4 +158,3 @@
         throw new UnsupportedOperationException("Not supported yet.");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -89,4 +89,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -83,4 +83,3 @@
         Assert.assertEquals(EXPECTED_OUTPUT, buffer.toString());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -162,4 +162,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -96,4 +96,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -53,4 +53,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java	Sat Sep 10 12:23:52 2016 -0700
@@ -68,4 +68,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java	Sat Sep 10 12:23:52 2016 -0700
@@ -225,4 +225,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -145,4 +145,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java	Sat Sep 10 12:23:52 2016 -0700
@@ -47,4 +47,3 @@
         return types[r.getEventType()];
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -67,4 +67,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java	Sat Sep 10 12:23:52 2016 -0700
@@ -76,4 +76,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -79,4 +79,3 @@
         return sbuffer.toString();
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -76,4 +76,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -69,4 +69,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -51,4 +51,3 @@
         Assert.assertEquals(XMLStreamConstants.START_DOCUMENT, r.getEventType());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -108,4 +108,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -118,4 +118,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -165,4 +165,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -59,4 +59,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -89,4 +89,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java	Sat Sep 10 12:23:52 2016 -0700
@@ -61,4 +61,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java	Sat Sep 10 12:23:52 2016 -0700
@@ -59,4 +59,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java	Sat Sep 10 12:23:52 2016 -0700
@@ -76,4 +76,3 @@
         Assert.assertNotNull(value, "should have attribute value");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -91,4 +91,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -69,4 +69,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -153,4 +153,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -62,4 +62,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -288,4 +288,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -58,4 +58,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -54,4 +54,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -103,4 +103,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java	Sat Sep 10 12:23:52 2016 -0700
@@ -64,4 +64,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -59,4 +59,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -164,4 +164,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -65,4 +65,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java	Sat Sep 10 12:23:52 2016 -0700
@@ -221,4 +221,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -124,4 +124,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -85,4 +85,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -110,4 +110,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -1434,4 +1434,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -54,4 +54,3 @@
         w.writeCharacters("---");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -88,4 +88,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -175,4 +175,3 @@
         };
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -125,4 +125,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -784,4 +784,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -73,4 +73,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -94,4 +94,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java	Sat Sep 10 12:23:52 2016 -0700
@@ -377,4 +377,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java	Sat Sep 10 12:23:52 2016 -0700
@@ -55,4 +55,3 @@
         r.setNextSibling(r.getNode().getFirstChild());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java	Sat Sep 10 12:23:52 2016 -0700
@@ -54,4 +54,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java	Sat Sep 10 12:23:52 2016 -0700
@@ -134,4 +134,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -69,4 +69,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java	Sat Sep 10 12:23:52 2016 -0700
@@ -85,4 +85,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java	Sat Sep 10 12:23:52 2016 -0700
@@ -94,4 +94,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java	Sat Sep 10 12:23:52 2016 -0700
@@ -72,4 +72,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java	Sat Sep 10 12:23:52 2016 -0700
@@ -76,4 +76,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java	Sat Sep 10 12:23:52 2016 -0700
@@ -61,4 +61,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java	Sat Sep 10 12:23:52 2016 -0700
@@ -145,4 +145,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java	Sat Sep 10 12:23:52 2016 -0700
@@ -77,4 +77,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java	Sat Sep 10 12:23:52 2016 -0700
@@ -85,4 +85,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java	Sat Sep 10 12:23:52 2016 -0700
@@ -64,4 +64,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6551616.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6551616.java	Sat Sep 10 12:23:52 2016 -0700
@@ -68,4 +68,3 @@
         // if it doesn't blow up, it succeeded.
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java	Sat Sep 10 12:23:52 2016 -0700
@@ -70,4 +70,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java	Sat Sep 10 12:23:52 2016 -0700
@@ -64,4 +64,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java	Sat Sep 10 12:23:52 2016 -0700
@@ -115,4 +115,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -157,4 +157,3 @@
         return sb.toString();
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CLITest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CLITest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -50,4 +50,3 @@
         }, new PropertyPermission("*", "read,write"));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -94,4 +94,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -94,4 +94,3 @@
                 : new FilePermission("///tmp/test.xml", "read,write,delete"));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -59,4 +59,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -79,4 +79,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -64,4 +64,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -65,4 +65,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -77,4 +77,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -76,4 +76,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -99,4 +99,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -90,4 +90,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -215,4 +215,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java	Sat Sep 10 12:23:52 2016 -0700
@@ -33,4 +33,3 @@
         return "["+node.getNodeName() + ":" + node.getTextContent()+"]";
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -75,4 +75,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -67,4 +67,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -96,4 +96,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -66,4 +66,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -198,4 +198,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -135,4 +135,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -148,4 +148,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -129,4 +129,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/TemplatesTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TemplatesTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -83,4 +83,3 @@
             + "      contains($validAffectsRelClasses, @Class)]/@OBID)\"/>"
             + "</xsl:stylesheet>";
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -153,4 +153,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -439,4 +439,3 @@
         Assert.assertNull(document.getElementsByTagName("test6").item(0).getNamespaceURI(), "unexpected namespace for test6");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java	Sat Sep 10 12:23:52 2016 -0700
@@ -56,4 +56,3 @@
             return null;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java	Sat Sep 10 12:23:52 2016 -0700
@@ -62,4 +62,3 @@
         return encoding;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java	Sat Sep 10 12:23:52 2016 -0700
@@ -82,4 +82,3 @@
         return encoding;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -23,9 +23,12 @@
 
 package transform;
 
+import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
-
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
@@ -34,11 +37,16 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
+import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
+import static jaxp.library.JAXPTestUtilities.clearSystemProperty;
+import static jaxp.library.JAXPTestUtilities.setSystemProperty;
+import static jaxp.library.JAXPTestUtilities.getSystemProperty;
 
 /*
  * @test
@@ -49,8 +57,95 @@
  * @summary This class contains tests for XSLT functions.
  */
 
-//@Listeners({jaxp.library.BasePolicy.class}) //uncomment this line after 8161454 is resolved
+@Listeners({jaxp.library.FilePolicy.class})
 public class XSLTFunctionsTest {
+    /**
+     * @bug 8165116
+     * Verifies that redirect works properly when extension function is enabled
+     *
+     * @param xml the XML source
+     * @param xsl the stylesheet that redirect output to a file
+     * @param output the output file
+     * @param redirect the redirect file
+     * @throws Exception if the test fails
+     **/
+    @Test(dataProvider = "redirect")
+    public void testRedirect(String xml, String xsl, String output, String redirect) throws Exception {
+
+        TransformerFactory tf = TransformerFactory.newInstance();
+        tf.setFeature(ORACLE_ENABLE_EXTENSION_FUNCTION, true);
+        Transformer t = tf.newTransformer(new StreamSource(new StringReader(xsl)));
+
+        //Transform the xml
+        t.transform(new StreamSource(new StringReader(xml)), new StreamResult(new StringWriter()));
+
+        // Verifies that the output is redirected successfully
+        String userDir = getSystemProperty("user.dir");
+        Path pathOutput = Paths.get(userDir, output);
+        Path pathRedirect = Paths.get(userDir, redirect);
+        Assert.assertTrue(Files.exists(pathOutput));
+        Assert.assertTrue(Files.exists(pathRedirect));
+        System.out.println("Output to " + pathOutput + " successful.");
+        System.out.println("Redirect to " + pathRedirect + " successful.");
+        Files.deleteIfExists(pathOutput);
+        Files.deleteIfExists(pathRedirect);
+    }
+
+    /**
+     * @bug 8161454
+     * Verifies that the new / correct name is supported, as is the old / incorrect
+     * one for compatibility
+     */
+    @Test
+    public void testNameChange() {
+
+        boolean feature;
+        TransformerFactory tf = TransformerFactory.newInstance();
+        feature = tf.getFeature(ORACLE_ENABLE_EXTENSION_FUNCTION);
+        System.out.println("Default setting: " + feature);
+        // The default: true if no SecurityManager, false otherwise
+        Assert.assertTrue(feature == getDefault());
+
+        setSystemProperty(SP_ENABLE_EXTENSION_FUNCTION, getDefaultOpposite());
+        tf = TransformerFactory.newInstance();
+        feature = tf.getFeature(ORACLE_ENABLE_EXTENSION_FUNCTION);
+        System.out.println("After setting " + SP_ENABLE_EXTENSION_FUNCTION + ": " + feature);
+        clearSystemProperty(SP_ENABLE_EXTENSION_FUNCTION);
+        // old/incorrect name is still supported
+        Assert.assertTrue(feature != getDefault());
+
+        setSystemProperty(SP_ENABLE_EXTENSION_FUNCTION_SPEC, getDefaultOpposite());
+        tf = TransformerFactory.newInstance();
+        feature = tf.getFeature(ORACLE_ENABLE_EXTENSION_FUNCTION);
+        System.out.println("After setting " + SP_ENABLE_EXTENSION_FUNCTION_SPEC + ": " + feature);
+        clearSystemProperty(SP_ENABLE_EXTENSION_FUNCTION_SPEC);
+        // new/correct name is effective
+        Assert.assertTrue(feature != getDefault());
+    }
+
+    final boolean isSecure;
+    {
+        String runSecMngr = getSystemProperty("runSecMngr");
+        isSecure = runSecMngr != null && runSecMngr.equals("true");
+    }
+
+    // The default: true if no SecurityManager, false otherwise
+    private boolean getDefault() {
+        if (isSecure) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    // Gets a String value that is opposite to the default value
+    private String getDefaultOpposite() {
+        if (isSecure) {
+            return "true";
+        } else {
+            return "false";
+        }
+    }
 
     /**
      * @bug 8062518 8153082
@@ -72,7 +167,9 @@
 
         // Create factory and transformer
         TransformerFactory tf = TransformerFactory.newInstance();
-        tf.setFeature("http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions", true);
+        tf.setFeature(ORACLE_ENABLE_EXTENSION_FUNCTION, true);
+        tf.setAttribute(EXTENSION_CLASS_LOADER,
+                runWithAllPerm(() -> Thread.currentThread().getContextClassLoader()));
         Transformer t = tf.newTransformer( xslsrc );
         t.setErrorListener(tf.getErrorListener());
 
@@ -114,6 +211,13 @@
         };
     }
 
+    @DataProvider(name = "redirect")
+    public static Object[][] getData() {
+        return new Object[][] {
+            {documentTestXml, xslRedirect, "testoutput.xml", "testredirect.xml"},
+        };
+    }
+
     static final String documentTestXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Test>Doc</Test>";
 
     static final String documentTestExternalDoc = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Test>External Doc</Test>";
@@ -133,5 +237,33 @@
 
     static final String documentTesteExpectedResult = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                                                     + "<root>[Test:Doc][Test:External Doc]</root>";
+
+    static String xslRedirect = " <xsl:stylesheet \n"
+            + "   xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n"
+            + "   xmlns:xsltc=\"http://xml.apache.org/xalan/xsltc\"\n"
+            + "   xmlns:redirect=\"http://xml.apache.org/xalan/redirect\"\n"
+            + "   extension-element-prefixes=\"xsltc redirect\"\n"
+            + "   version=\"1.0\">\n"
+            + "   <xsl:template match=\"/\">\n"
+            + "     <xsl:text>This goes to standard output</xsl:text>\n"
+            + "     <xsltc:output file=\"testoutput.xml\">\n"
+            + "       <xsl:text>This ends up in the file 'testoutput.xml'</xsl:text>\n"
+            + "     </xsltc:output>\n"
+            + "     <redirect:write file=\"testredirect.xml\">\n"
+            + "       <xsl:text>This ends up in the file 'testredirect.xml'</xsl:text>\n"
+            + "     </redirect:write>\n"
+            + "   </xsl:template>\n"
+            + "</xsl:stylesheet>";
+
+    public static final String ORACLE_JAXP_PROPERTY_PREFIX =
+        "http://www.oracle.com/xml/jaxp/properties/";
+    /**
+     * Feature enableExtensionFunctions
+     */
+    public static final String ORACLE_ENABLE_EXTENSION_FUNCTION =
+            ORACLE_JAXP_PROPERTY_PREFIX + "enableExtensionFunctions";
+    static final String SP_ENABLE_EXTENSION_FUNCTION = "javax.xml.enableExtensionFunctions";
+    // This is the correct name by the spec
+    static final String SP_ENABLE_EXTENSION_FUNCTION_SPEC = "jdk.xml.enableExtensionFunctions";
+    private static final String EXTENSION_CLASS_LOADER = "jdk.xml.transform.extensionClassLoader";
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java	Sat Sep 10 12:23:52 2016 -0700
@@ -62,4 +62,3 @@
         Assert.assertEquals(0, ((Document) result.getNode()).getDocumentElement().getChildNodes().getLength());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java	Sat Sep 10 12:23:52 2016 -0700
@@ -68,4 +68,3 @@
         Assert.assertTrue(version.equals(resultVersion), "Expected XML Version is 1.1, but actual version " + resultVersion);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java	Sat Sep 10 12:23:52 2016 -0700
@@ -70,4 +70,3 @@
         Assert.assertTrue(encoding.equals(resultEncoding), "Expected XML Version is " + encoding + " , but actual  encoding " + resultEncoding);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java	Sat Sep 10 12:23:52 2016 -0700
@@ -92,4 +92,3 @@
         ((StreamUtil) TransformerUtilFactory.getUtil(TransformerUtilFactory.STREAM)).checkStream(new FileInputStream(TEMP_FILE), version);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java	Sat Sep 10 12:23:52 2016 -0700
@@ -94,4 +94,3 @@
         Assert.assertTrue(dh.getEncoding().equals(encoding), "Expected version is " + encoding + " actual version " + dh.getEncoding());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java	Sat Sep 10 12:23:52 2016 -0700
@@ -78,4 +78,3 @@
         }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java	Sat Sep 10 12:23:52 2016 -0700
@@ -557,4 +557,3 @@
         System.err.println("Skipping " + clsName + "#" + method + ": entity expansion does not seem to be functioning properly" + msg + ".");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -85,4 +85,3 @@
 
     private Validator validator;
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java	Sat Sep 10 12:23:52 2016 -0700
@@ -75,4 +75,3 @@
         Assert.assertNotNull(s);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java	Sat Sep 10 12:23:52 2016 -0700
@@ -78,4 +78,3 @@
         return s;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java	Sat Sep 10 12:23:52 2016 -0700
@@ -111,4 +111,3 @@
         Assert.assertTrue(invoked[1], "Method characters() was not invoked.");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java	Sat Sep 10 12:23:52 2016 -0700
@@ -76,4 +76,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java	Sat Sep 10 12:23:52 2016 -0700
@@ -79,4 +79,3 @@
         validatorHandler.setProperty(name, "123");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java	Sat Sep 10 12:23:52 2016 -0700
@@ -66,4 +66,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java	Sat Sep 10 12:23:52 2016 -0700
@@ -67,4 +67,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java	Sat Sep 10 12:23:52 2016 -0700
@@ -67,4 +67,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java	Sat Sep 10 12:23:52 2016 -0700
@@ -65,4 +65,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java	Sat Sep 10 12:23:52 2016 -0700
@@ -112,4 +112,3 @@
         parse(xmlReader, XML);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java	Sat Sep 10 12:23:52 2016 -0700
@@ -62,4 +62,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java	Sat Sep 10 12:23:52 2016 -0700
@@ -53,4 +53,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java	Sat Sep 10 12:23:52 2016 -0700
@@ -48,4 +48,3 @@
         validatorHandler.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java	Sat Sep 10 12:23:52 2016 -0700
@@ -123,4 +123,3 @@
         parse(xmlReader, XML);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java	Sat Sep 10 12:23:52 2016 -0700
@@ -126,4 +126,3 @@
         parse(xmlReader, XML);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java	Sat Sep 10 12:23:52 2016 -0700
@@ -66,4 +66,3 @@
         Assert.assertNotNull(schema, "Failed: newSchema returned null.");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java	Sat Sep 10 12:23:52 2016 -0700
@@ -56,4 +56,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java	Sat Sep 10 12:23:52 2016 -0700
@@ -67,4 +67,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java	Sat Sep 10 12:23:52 2016 -0700
@@ -56,4 +56,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java	Sat Sep 10 12:23:52 2016 -0700
@@ -60,4 +60,3 @@
         schemaFactory.newSchema(tmpFile);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java	Sat Sep 10 12:23:52 2016 -0700
@@ -56,4 +56,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java	Sat Sep 10 12:23:52 2016 -0700
@@ -46,4 +46,3 @@
         schemaFactory.newSchema(Bug4988268.class.getResource("Bug4988268.xsd"));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java	Sat Sep 10 12:23:52 2016 -0700
@@ -53,4 +53,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java	Sat Sep 10 12:23:52 2016 -0700
@@ -90,4 +90,3 @@
         errorCounter++;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java	Sat Sep 10 12:23:52 2016 -0700
@@ -81,4 +81,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java	Sat Sep 10 12:23:52 2016 -0700
@@ -108,4 +108,3 @@
         validator.validate(xmlSource);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java	Sat Sep 10 12:23:52 2016 -0700
@@ -125,4 +125,3 @@
         Assert.assertSame(r.getNode(), n);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java	Sat Sep 10 12:23:52 2016 -0700
@@ -53,4 +53,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java	Sat Sep 10 12:23:52 2016 -0700
@@ -46,4 +46,3 @@
         SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI).newSchema(getClass().getResource("Bug6449797.xsd"));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java	Sat Sep 10 12:23:52 2016 -0700
@@ -86,4 +86,3 @@
         return rtn;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -205,4 +205,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java	Sat Sep 10 12:23:52 2016 -0700
@@ -88,4 +88,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java	Sat Sep 10 12:23:52 2016 -0700
@@ -48,4 +48,3 @@
         System.out.println("Got here3");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java	Sat Sep 10 12:23:52 2016 -0700
@@ -141,4 +141,3 @@
         parse(xmlReader, XML);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java	Sat Sep 10 12:23:52 2016 -0700
@@ -82,4 +82,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java	Sat Sep 10 12:23:52 2016 -0700
@@ -70,4 +70,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -82,4 +82,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -160,4 +160,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java	Sat Sep 10 12:23:52 2016 -0700
@@ -100,4 +100,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -210,4 +210,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -128,4 +128,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -83,4 +83,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -140,4 +140,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java	Sat Sep 10 12:23:52 2016 -0700
@@ -131,4 +131,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java	Sat Sep 10 12:23:52 2016 -0700
@@ -45,4 +45,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -78,4 +78,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java	Sat Sep 10 12:23:52 2016 -0700
@@ -132,4 +132,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -84,4 +84,3 @@
         return list.toArray(new Source[list.size()]);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java	Sat Sep 10 12:23:52 2016 -0700
@@ -94,4 +94,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -109,4 +109,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -147,4 +147,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -115,4 +115,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -147,4 +147,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -115,4 +115,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -147,4 +147,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java	Sat Sep 10 12:23:52 2016 -0700
@@ -115,4 +115,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -99,4 +99,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -57,4 +57,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -98,4 +98,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/SchemaTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/SchemaTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -54,4 +54,3 @@
         factory.newSchema(new File(getClass().getResource("Bug8149915.xsd").getFile()));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -60,4 +60,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -208,4 +208,3 @@
         return xmlr;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java	Sat Sep 10 12:23:52 2016 -0700
@@ -141,4 +141,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java	Sat Sep 10 12:23:52 2016 -0700
@@ -59,4 +59,3 @@
         validator.validate(new DOMSource(node));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -69,4 +69,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -61,4 +61,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -148,4 +148,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -58,4 +58,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -70,4 +70,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -72,4 +72,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -102,4 +102,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -122,4 +122,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -71,4 +71,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -71,4 +71,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -148,4 +148,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java	Sat Sep 10 12:23:52 2016 -0700
@@ -59,4 +59,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -63,4 +63,3 @@
         validator.validate(new StreamSource(ParticleTest.class.getResourceAsStream("upa01.xml")));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/RegexWord.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/RegexWord.java	Sat Sep 10 12:23:52 2016 -0700
@@ -63,4 +63,3 @@
         validator.validate(new StreamSource(RegexWord.class.getResourceAsStream("reZ003vExc23082309.xml")));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java	Sat Sep 10 12:23:52 2016 -0700
@@ -92,4 +92,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java	Sat Sep 10 12:23:52 2016 -0700
@@ -61,4 +61,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java	Sat Sep 10 12:23:52 2016 -0700
@@ -82,4 +82,3 @@
         return xpath;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java	Sat Sep 10 12:23:52 2016 -0700
@@ -83,4 +83,3 @@
         return xpath;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java	Sat Sep 10 12:23:52 2016 -0700
@@ -70,4 +70,3 @@
         return xpath;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -54,4 +54,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java	Sat Sep 10 12:23:52 2016 -0700
@@ -47,4 +47,3 @@
         return isCalled;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -196,4 +196,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -200,4 +200,3 @@
         verifyResult(result, "Customer");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java	Sat Sep 10 12:23:52 2016 -0700
@@ -187,4 +187,3 @@
     }
 
 }
-
--- a/jaxws/.hgtags	Sat Sep 10 08:25:51 2016 -0400
+++ b/jaxws/.hgtags	Sat Sep 10 12:23:52 2016 -0700
@@ -379,3 +379,5 @@
 783e7e2c587f2c7e1b9998a46d90ec196ab2a195 jdk-9+131
 9fff2477a4cadf2a9618a76f1f4fe0f20bb5ff3b jdk-9+132
 05e99eefda2b58d1ed176e411302d9d6b35dca16 jdk-9+133
+ab1d78d395d4cb8be426ff181211da1a4085cf01 jdk-9+134
+22631824f55128a7ab6605493b3001a37af6a168 jdk-9+135
--- a/jdk/.hgtags	Sat Sep 10 08:25:51 2016 -0400
+++ b/jdk/.hgtags	Sat Sep 10 12:23:52 2016 -0700
@@ -376,3 +376,5 @@
 8c57f4c293bbc5609928308a6d91ba765760b5f9 jdk-9+131
 d5c70818cd8a82e76632c8c815bdb4f75f53aeaf jdk-9+132
 3cdae27c90b5e41afe75eab904fda19fac076330 jdk-9+133
+803adcd526d74ae0b64948d1f8260c2dbe514779 jdk-9+134
+021369229cfd0b5feb76834b2ea498f47f43c0f3 jdk-9+135
--- a/jdk/make/GenerateClasslist.gmk	Sat Sep 10 08:25:51 2016 -0400
+++ b/jdk/make/GenerateClasslist.gmk	Sat Sep 10 12:23:52 2016 -0700
@@ -50,6 +50,8 @@
 
 CLASSLIST_FILE := $(SUPPORT_OUTPUTDIR)/classlist/classlist
 
+JLI_TRACE_FILE := $(SUPPORT_OUTPUTDIR)/classlist/jli_trace.out
+
 # If an external buildjdk has been supplied, we don't build a separate interim
 # image, so just use the external build jdk instead.
 ifeq ($(EXTERNAL_BUILDJDK), true)
@@ -59,13 +61,11 @@
 $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR)
 	$(call MakeDir, $(@D))
 	$(call LogInfo, Generating lib/classlist)
-	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.tmp \
+	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@ \
+	    -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
-	    build.tools.classlist.HelloClasslist $(LOG_DEBUG) 2>&1
-        # Filter out generated classes, remove after JDK-8149977
-	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@ \
-	    -Xshare:dump -XX:SharedClassListFile=$@.tmp $(LOG_DEBUG) 2>&1
-	$(RM) $@.tmp
+	    build.tools.classlist.HelloClasslist \
+	    $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE)
 
 TARGETS += $(CLASSLIST_FILE)
 
--- a/jdk/make/gendata/GendataBreakIterator.gmk	Sat Sep 10 08:25:51 2016 -0400
+++ b/jdk/make/gendata/GendataBreakIterator.gmk	Sat Sep 10 12:23:52 2016 -0700
@@ -81,7 +81,7 @@
 
 # output
 BASE_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/java.base/sun/text/resources
-LD_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/jdk.localedata/sun/text/resources
+LD_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/jdk.localedata/sun/text/resources/ext
 BIFILES := $(BASE_DATA_PKG_DIR)/CharacterBreakIteratorData \
     $(BASE_DATA_PKG_DIR)/WordBreakIteratorData \
     $(BASE_DATA_PKG_DIR)/LineBreakIteratorData \
--- a/jdk/make/gensrc/GensrcVarHandles.gmk	Sat Sep 10 08:25:51 2016 -0400
+++ b/jdk/make/gensrc/GensrcVarHandles.gmk	Sat Sep 10 12:23:52 2016 -0700
@@ -44,6 +44,10 @@
     $1_ARGS += -KAtomicAdd
   endif
 
+  ifneq ($$(findstring $$($1_Type), Boolean Byte Short Char Int Long), )
+    $1_ARGS += -KBitwise
+  endif
+
   ifneq ($$(findstring $$($1_Type), Byte Short Char), )
     $1_ARGS += -KShorterThanInt
   endif
@@ -101,6 +105,7 @@
 
     $1_ARGS += -KCAS
     $1_ARGS += -KAtomicAdd
+    $1_ARGS += -KBitwise
   endif
 
   ifeq ($$($1_Type), Long)
@@ -113,6 +118,7 @@
 
     $1_ARGS += -KCAS
     $1_ARGS += -KAtomicAdd
+    $1_ARGS += -KBitwise
   endif
 
   ifeq ($$($1_Type), Float)
--- a/jdk/make/mapfiles/libawt/mapfile-mawt-vers	Sat Sep 10 08:25:51 2016 -0400
+++ b/jdk/make/mapfiles/libawt/mapfile-mawt-vers	Sat Sep 10 12:23:52 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2016, 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
@@ -22,259 +22,261 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-#		Java_java_awt_KeyboardFocusManager_getGlobalHeavyweightFocusOwner;
 
 # Define public interface.
 # These are the libmawt exports. See mapfile-vers for the libawt exports
 
 SUNWprivate_1.1 {
-	global:
-		JNI_OnLoad;
+    global:
+        JNI_OnLoad;
 
-		Java_sun_awt_DefaultMouseInfoPeer_fillPointWithCoords;
-		Java_sun_awt_DefaultMouseInfoPeer_isWindowUnderMouse;
-		Java_java_awt_AWTEvent_nativeSetSource;
-		Java_java_awt_Checkbox_initIDs;
-		Java_java_awt_Component_initIDs;
-		Java_java_awt_Dialog_initIDs;
-		Java_java_awt_Font_initIDs;
-                Java_java_awt_KeyboardFocusManager_initIDs;
-		Java_java_awt_Menu_initIDs;
-		Java_java_awt_MenuComponent_initIDs;
-		Java_java_awt_MenuItem_initIDs;
-		Java_java_awt_Scrollbar_initIDs;
-		Java_java_awt_ScrollPane_initIDs;
-		Java_java_awt_TextArea_initIDs;
-		Java_sun_awt_FontDescriptor_initIDs;
-		Java_sun_awt_KeyboardFocusManagerPeerImpl_clearNativeGlobalFocusOwner;
-                Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusOwner;
-                Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusedWindow;
-                Java_sun_awt_UNIXToolkit_check_1gtk;
-                Java_sun_awt_UNIXToolkit_load_1gtk;
-                Java_sun_awt_UNIXToolkit_unload_1gtk;
-                Java_sun_awt_UNIXToolkit_load_1stock_1icon;
-                Java_sun_awt_UNIXToolkit_load_1gtk_1icon;
-		Java_sun_awt_UNIXToolkit_nativeSync;
-		Java_sun_awt_X11InputMethod_disposeXIC;
-		Java_sun_awt_X11InputMethod_isCompositionEnabledNative;
-		Java_sun_awt_X11InputMethod_resetXIC;
-		Java_sun_awt_X11InputMethod_setCompositionEnabledNative;
-		Java_sun_awt_X11InputMethod_turnoffStatusWindow;
-		Java_sun_awt_SunToolkit_closeSplashScreen;
-		Java_sun_awt_PlatformFont_initIDs;
-		Java_sun_awt_X11GraphicsConfig_init;
-		Java_sun_awt_X11GraphicsConfig_dispose;
-		Java_sun_awt_X11GraphicsConfig_pGetBounds;
-		Java_sun_awt_X11GraphicsConfig_getNumColors;
-		Java_sun_awt_X11GraphicsConfig_getXResolution;
-		Java_sun_awt_X11GraphicsConfig_getYResolution;
-		Java_sun_awt_X11GraphicsConfig_createBackBuffer;
-		Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
-		Java_sun_awt_X11GraphicsConfig_swapBuffers;
-                Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
-		Java_sun_awt_X11GraphicsDevice_isDBESupported;
-		Java_sun_awt_X11GraphicsDevice_getDisplay;
-		Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
-		Java_sun_awt_X11GraphicsDevice_getNumConfigs;
-		Java_sun_awt_X11GraphicsDevice_initIDs;
-                Java_sun_awt_X11GraphicsDevice_initXrandrExtension;
-                Java_sun_awt_X11GraphicsDevice_enterFullScreenExclusive;
-                Java_sun_awt_X11GraphicsDevice_exitFullScreenExclusive;
-                Java_sun_awt_X11GraphicsDevice_getCurrentDisplayMode;
-                Java_sun_awt_X11GraphicsDevice_enumDisplayModes;
-                Java_sun_awt_X11GraphicsDevice_configDisplayMode;
-                Java_sun_awt_X11GraphicsDevice_resetNativeData;
-		Java_sun_awt_X11GraphicsEnvironment_checkShmExt;
-		Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum;
-		Java_sun_awt_X11GraphicsEnvironment_getDisplayString;
-		Java_sun_awt_X11GraphicsEnvironment_getNumScreens;
-		Java_sun_awt_X11GraphicsEnvironment_initDisplay;
-                Java_sun_awt_X11GraphicsEnvironment_initGLX;
-		Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
-		Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
-		Java_sun_awt_X11GraphicsEnvironment_initXRender;
-		Java_java_awt_AWTEvent_initIDs;
-		Java_java_awt_Button_initIDs;
-		Java_java_awt_Container_initIDs;
-		Java_java_awt_Cursor_finalizeImpl;
-		Java_java_awt_Cursor_initIDs;
-		Java_java_awt_Event_initIDs;
-		Java_java_awt_event_InputEvent_initIDs;
-		Java_java_awt_event_KeyEvent_initIDs;
-		Java_java_awt_FileDialog_initIDs;
-		Java_java_awt_Frame_initIDs;
-		Java_java_awt_Insets_initIDs;
-		Java_java_awt_TextField_initIDs;
-		Java_java_awt_Window_initIDs;
-		Java_sun_awt_X11GraphicsConfig_init;
-		Java_sun_awt_X11GraphicsConfig_initIDs;
-		Java_sun_awt_X11GraphicsConfig_makeColorModel;
-		Java_sun_awt_X11GraphicsDevice_getConfigVisualId;
-                Java_sun_awt_X11GraphicsDevice_getConfigColormap;
-                Java_sun_awt_X11GraphicsDevice_getConfigDepth;
+        Java_sun_awt_DefaultMouseInfoPeer_fillPointWithCoords;
+        Java_sun_awt_DefaultMouseInfoPeer_isWindowUnderMouse;
+        Java_java_awt_AWTEvent_nativeSetSource;
+        Java_java_awt_Checkbox_initIDs;
+        Java_java_awt_Component_initIDs;
+        Java_java_awt_Dialog_initIDs;
+        Java_java_awt_Font_initIDs;
+        Java_java_awt_KeyboardFocusManager_initIDs;
+        Java_java_awt_Menu_initIDs;
+        Java_java_awt_MenuComponent_initIDs;
+        Java_java_awt_MenuItem_initIDs;
+        Java_java_awt_Scrollbar_initIDs;
+        Java_java_awt_ScrollPane_initIDs;
+        Java_java_awt_TextArea_initIDs;
+        Java_sun_awt_FontDescriptor_initIDs;
+        Java_sun_awt_KeyboardFocusManagerPeerImpl_clearNativeGlobalFocusOwner;
+        Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusOwner;
+        Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusedWindow;
+        Java_sun_awt_UNIXToolkit_check_1gtk;
+        Java_sun_awt_UNIXToolkit_load_1gtk;
+        Java_sun_awt_UNIXToolkit_unload_1gtk;
+        Java_sun_awt_UNIXToolkit_load_1stock_1icon;
+        Java_sun_awt_UNIXToolkit_load_1gtk_1icon;
+        Java_sun_awt_UNIXToolkit_nativeSync;
+        Java_sun_awt_X11InputMethod_disposeXIC;
+        Java_sun_awt_X11InputMethod_isCompositionEnabledNative;
+        Java_sun_awt_X11InputMethod_resetXIC;
+        Java_sun_awt_X11InputMethod_setCompositionEnabledNative;
+        Java_sun_awt_X11InputMethod_turnoffStatusWindow;
+        Java_sun_awt_SunToolkit_closeSplashScreen;
+        Java_sun_awt_PlatformFont_initIDs;
+        Java_sun_awt_X11GraphicsConfig_init;
+        Java_sun_awt_X11GraphicsConfig_dispose;
+        Java_sun_awt_X11GraphicsConfig_pGetBounds;
+        Java_sun_awt_X11GraphicsConfig_getNumColors;
+        Java_sun_awt_X11GraphicsConfig_getXResolution;
+        Java_sun_awt_X11GraphicsConfig_getYResolution;
+        Java_sun_awt_X11GraphicsConfig_createBackBuffer;
+        Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
+        Java_sun_awt_X11GraphicsConfig_swapBuffers;
+        Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
+        Java_sun_awt_X11GraphicsDevice_isDBESupported;
+        Java_sun_awt_X11GraphicsDevice_getDisplay;
+        Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
+        Java_sun_awt_X11GraphicsDevice_getNumConfigs;
+        Java_sun_awt_X11GraphicsDevice_initIDs;
+        Java_sun_awt_X11GraphicsDevice_initXrandrExtension;
+        Java_sun_awt_X11GraphicsDevice_enterFullScreenExclusive;
+        Java_sun_awt_X11GraphicsDevice_exitFullScreenExclusive;
+        Java_sun_awt_X11GraphicsDevice_getCurrentDisplayMode;
+        Java_sun_awt_X11GraphicsDevice_enumDisplayModes;
+        Java_sun_awt_X11GraphicsDevice_configDisplayMode;
+        Java_sun_awt_X11GraphicsDevice_resetNativeData;
+        Java_sun_awt_X11GraphicsEnvironment_checkShmExt;
+        Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum;
+        Java_sun_awt_X11GraphicsEnvironment_getDisplayString;
+        Java_sun_awt_X11GraphicsEnvironment_getNumScreens;
+        Java_sun_awt_X11GraphicsEnvironment_initDisplay;
+        Java_sun_awt_X11GraphicsEnvironment_initGLX;
+        Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
+        Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
+        Java_sun_awt_X11GraphicsEnvironment_initXRender;
+        Java_java_awt_AWTEvent_initIDs;
+        Java_java_awt_Button_initIDs;
+        Java_java_awt_Container_initIDs;
+        Java_java_awt_Cursor_finalizeImpl;
+        Java_java_awt_Cursor_initIDs;
+        Java_java_awt_Event_initIDs;
+        Java_java_awt_event_InputEvent_initIDs;
+        Java_java_awt_event_KeyEvent_initIDs;
+        Java_java_awt_FileDialog_initIDs;
+        Java_java_awt_Frame_initIDs;
+        Java_java_awt_Insets_initIDs;
+        Java_java_awt_TextField_initIDs;
+        Java_java_awt_Window_initIDs;
+        Java_sun_awt_X11GraphicsConfig_init;
+        Java_sun_awt_X11GraphicsConfig_initIDs;
+        Java_sun_awt_X11GraphicsConfig_makeColorModel;
+        Java_sun_awt_X11GraphicsDevice_getConfigVisualId;
+        Java_sun_awt_X11GraphicsDevice_getConfigColormap;
+        Java_sun_awt_X11GraphicsDevice_getConfigDepth;
 
-                Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit;
-                Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask;
-		Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg;
-		Java_sun_java2d_x11_X11Renderer_XFillSpans;
-		Java_sun_java2d_x11_X11Renderer_XDrawArc;
-		Java_sun_java2d_x11_X11Renderer_XDrawLine;
-		Java_sun_java2d_x11_X11Renderer_XDrawOval;
-		Java_sun_java2d_x11_X11Renderer_XDrawPoly;
-		Java_sun_java2d_x11_X11Renderer_XDrawRect;
-		Java_sun_java2d_x11_X11Renderer_XDrawRoundRect;
-                Java_sun_java2d_x11_X11Renderer_XDoPath;
-		Java_sun_java2d_x11_X11Renderer_XFillArc;
-		Java_sun_java2d_x11_X11Renderer_XFillOval;
-		Java_sun_java2d_x11_X11Renderer_XFillPoly;
-		Java_sun_java2d_x11_X11Renderer_XFillRect;
-		Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
-		Java_sun_java2d_x11_X11Renderer_devCopyArea;
-		Java_sun_java2d_x11_X11SurfaceData_initIDs;
-		Java_sun_java2d_x11_X11SurfaceData_initOps;
-		Java_sun_java2d_x11_X11SurfaceData_initSurface;
-		Java_sun_java2d_x11_X11SurfaceData_isDgaAvailable;
-		Java_sun_java2d_x11_X11SurfaceData_isShmPMAvailable;
-                Java_sun_java2d_x11_X11SurfaceData_XSetCopyMode;
-                Java_sun_java2d_x11_X11SurfaceData_XSetXorMode;
-                Java_sun_java2d_x11_X11SurfaceData_XSetForeground;
+        Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit;
+        Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask;
+        Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg;
+        Java_sun_java2d_x11_X11Renderer_XFillSpans;
+        Java_sun_java2d_x11_X11Renderer_XDrawArc;
+        Java_sun_java2d_x11_X11Renderer_XDrawLine;
+        Java_sun_java2d_x11_X11Renderer_XDrawOval;
+        Java_sun_java2d_x11_X11Renderer_XDrawPoly;
+        Java_sun_java2d_x11_X11Renderer_XDrawRect;
+        Java_sun_java2d_x11_X11Renderer_XDrawRoundRect;
+        Java_sun_java2d_x11_X11Renderer_XDoPath;
+        Java_sun_java2d_x11_X11Renderer_XFillArc;
+        Java_sun_java2d_x11_X11Renderer_XFillOval;
+        Java_sun_java2d_x11_X11Renderer_XFillPoly;
+        Java_sun_java2d_x11_X11Renderer_XFillRect;
+        Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
+        Java_sun_java2d_x11_X11Renderer_devCopyArea;
+        Java_sun_java2d_x11_X11SurfaceData_initIDs;
+        Java_sun_java2d_x11_X11SurfaceData_initOps;
+        Java_sun_java2d_x11_X11SurfaceData_initSurface;
+        Java_sun_java2d_x11_X11SurfaceData_isDgaAvailable;
+        Java_sun_java2d_x11_X11SurfaceData_isShmPMAvailable;
+        Java_sun_java2d_x11_X11SurfaceData_XSetCopyMode;
+        Java_sun_java2d_x11_X11SurfaceData_XSetXorMode;
+        Java_sun_java2d_x11_X11SurfaceData_XSetForeground;
 
-		Java_sun_java2d_x11_XSurfaceData_initOps;
-		Java_sun_java2d_x11_XSurfaceData_XCreateGC;
-		Java_sun_java2d_x11_XSurfaceData_XResetClip;
-		Java_sun_java2d_x11_XSurfaceData_XSetClip;
-		Java_sun_java2d_x11_XSurfaceData_flushNativeSurface;
-		Java_sun_java2d_x11_XSurfaceData_isDrawableValid;
-		Java_sun_java2d_x11_XSurfaceData_setInvalid;
-		Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures;
-		Java_sun_java2d_xr_XRSurfaceData_initXRPicture;
-		Java_sun_java2d_xr_XRSurfaceData_initIDs;
-		Java_sun_java2d_xr_XRSurfaceData_XRInitSurface;
-		Java_sun_java2d_xr_XRSurfaceData_freeXSDOPicture;
-		Java_sun_java2d_xr_XRBackendNative_initIDs;
-		Java_sun_java2d_xr_XIDGenerator_bufferXIDs;
-		Java_sun_java2d_xr_XRBackendNative_freeGC;
-		Java_sun_java2d_xr_XRBackendNative_createGC;
-		Java_sun_java2d_xr_XRBackendNative_createPixmap;
-		Java_sun_java2d_xr_XRBackendNative_createPictureNative;
-		Java_sun_java2d_xr_XRBackendNative_freePicture;
-		Java_sun_java2d_xr_XRBackendNative_freePixmap;
-		Java_sun_java2d_xr_XRBackendNative_setPictureRepeat;
-		Java_sun_java2d_xr_XRBackendNative_setGCExposures;
-		Java_sun_java2d_xr_XRBackendNative_setGCForeground;
-		Java_sun_java2d_xr_XRBackendNative_copyArea;
-		Java_sun_java2d_xr_XRBackendNative_renderComposite;
-		Java_sun_java2d_xr_XRBackendNative_renderRectangle;
-		Java_sun_java2d_xr_XRBackendNative_XRenderRectanglesNative;
-		Java_sun_java2d_xr_XRBackendNative_XRSetTransformNative;
-		Java_sun_java2d_xr_XRBackendNative_XRCreateLinearGradientPaintNative;
-		Java_sun_java2d_xr_XRBackendNative_XRCreateRadialGradientPaintNative;
-		Java_sun_java2d_xr_XRBackendNative_setFilter;
-		Java_sun_java2d_xr_XRBackendNative_XRSetClipNative;
-		Java_sun_java2d_xr_XRBackendNative_putMaskNative;
-		Java_sun_java2d_xr_XRBackendNative_XRAddGlyphsNative;
-		Java_sun_java2d_xr_XRBackendNative_XRFreeGlyphsNative;
-		Java_sun_java2d_xr_XRBackendNative_XRenderCreateGlyphSetNative;
-		Java_sun_java2d_xr_XRBackendNative_XRenderCompositeTextNative;
-		Java_sun_java2d_xr_XRBackendNative_setGCMode;
-		Java_sun_java2d_xr_XRBackendNative_GCRectanglesNative;
-		Java_sun_java2d_xr_XRUtils_initFormatPtrs;
-		Java_sun_java2d_xr_XRBackendNative_renderCompositeTrapezoidsNative;
-		XRT_DrawGlyphList;
+        Java_sun_java2d_x11_XSurfaceData_initOps;
+        Java_sun_java2d_x11_XSurfaceData_XCreateGC;
+        Java_sun_java2d_x11_XSurfaceData_XResetClip;
+        Java_sun_java2d_x11_XSurfaceData_XSetClip;
+        Java_sun_java2d_x11_XSurfaceData_flushNativeSurface;
+        Java_sun_java2d_x11_XSurfaceData_isDrawableValid;
+        Java_sun_java2d_x11_XSurfaceData_setInvalid;
+        Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures;
+        Java_sun_java2d_xr_XRSurfaceData_initXRPicture;
+        Java_sun_java2d_xr_XRSurfaceData_initIDs;
+        Java_sun_java2d_xr_XRSurfaceData_XRInitSurface;
+        Java_sun_java2d_xr_XRSurfaceData_freeXSDOPicture;
+        Java_sun_java2d_xr_XRBackendNative_initIDs;
+        Java_sun_java2d_xr_XIDGenerator_bufferXIDs;
+        Java_sun_java2d_xr_XRBackendNative_freeGC;
+        Java_sun_java2d_xr_XRBackendNative_createGC;
+        Java_sun_java2d_xr_XRBackendNative_createPixmap;
+        Java_sun_java2d_xr_XRBackendNative_createPictureNative;
+        Java_sun_java2d_xr_XRBackendNative_freePicture;
+        Java_sun_java2d_xr_XRBackendNative_freePixmap;
+        Java_sun_java2d_xr_XRBackendNative_setPictureRepeat;
+        Java_sun_java2d_xr_XRBackendNative_setGCExposures;
+        Java_sun_java2d_xr_XRBackendNative_setGCForeground;
+        Java_sun_java2d_xr_XRBackendNative_copyArea;
+        Java_sun_java2d_xr_XRBackendNative_renderComposite;
+        Java_sun_java2d_xr_XRBackendNative_renderRectangle;
+        Java_sun_java2d_xr_XRBackendNative_XRenderRectanglesNative;
+        Java_sun_java2d_xr_XRBackendNative_XRSetTransformNative;
+        Java_sun_java2d_xr_XRBackendNative_XRCreateLinearGradientPaintNative;
+        Java_sun_java2d_xr_XRBackendNative_XRCreateRadialGradientPaintNative;
+        Java_sun_java2d_xr_XRBackendNative_setFilter;
+        Java_sun_java2d_xr_XRBackendNative_XRSetClipNative;
+        Java_sun_java2d_xr_XRBackendNative_putMaskNative;
+        Java_sun_java2d_xr_XRBackendNative_XRAddGlyphsNative;
+        Java_sun_java2d_xr_XRBackendNative_XRFreeGlyphsNative;
+        Java_sun_java2d_xr_XRBackendNative_XRenderCreateGlyphSetNative;
+        Java_sun_java2d_xr_XRBackendNative_XRenderCompositeTextNative;
+        Java_sun_java2d_xr_XRBackendNative_setGCMode;
+        Java_sun_java2d_xr_XRBackendNative_GCRectanglesNative;
+        Java_sun_java2d_xr_XRUtils_initFormatPtrs;
+        Java_sun_java2d_xr_XRBackendNative_renderCompositeTrapezoidsNative;
+        XRT_DrawGlyphList;
 
-                Java_sun_java2d_opengl_OGLContext_getOGLIdString;
-                Java_sun_java2d_opengl_OGLMaskFill_maskFill;
-                Java_sun_java2d_opengl_OGLRenderer_drawPoly;
-                Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer;
-                Java_sun_java2d_opengl_OGLSurfaceData_initTexture;
-                Java_sun_java2d_opengl_OGLSurfaceData_initFBObject;
-                Java_sun_java2d_opengl_OGLSurfaceData_initFlipBackbuffer;
-                Java_sun_java2d_opengl_OGLSurfaceData_getTextureID;
-                Java_sun_java2d_opengl_OGLSurfaceData_getTextureTarget;
-                Java_sun_java2d_opengl_OGLTextRenderer_drawGlyphList;
-                Java_sun_java2d_opengl_GLXGraphicsConfig_getGLXConfigInfo;
-                Java_sun_java2d_opengl_GLXGraphicsConfig_initConfig;
-                Java_sun_java2d_opengl_GLXGraphicsConfig_getOGLCapabilities;
-                Java_sun_java2d_opengl_GLXSurfaceData_initOps;
+        Java_sun_java2d_opengl_OGLContext_getOGLIdString;
+        Java_sun_java2d_opengl_OGLMaskFill_maskFill;
+        Java_sun_java2d_opengl_OGLRenderer_drawPoly;
+        Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer;
+        Java_sun_java2d_opengl_OGLSurfaceData_initTexture;
+        Java_sun_java2d_opengl_OGLSurfaceData_initFBObject;
+        Java_sun_java2d_opengl_OGLSurfaceData_initFlipBackbuffer;
+        Java_sun_java2d_opengl_OGLSurfaceData_getTextureID;
+        Java_sun_java2d_opengl_OGLSurfaceData_getTextureTarget;
+        Java_sun_java2d_opengl_OGLTextRenderer_drawGlyphList;
+        Java_sun_java2d_opengl_GLXGraphicsConfig_getGLXConfigInfo;
+        Java_sun_java2d_opengl_GLXGraphicsConfig_initConfig;
+        Java_sun_java2d_opengl_GLXGraphicsConfig_getOGLCapabilities;
+        Java_sun_java2d_opengl_GLXSurfaceData_initOps;
 
-                Java_sun_print_CUPSPrinter_initIDs;
-                Java_sun_print_CUPSPrinter_getCupsServer;
-                Java_sun_print_CUPSPrinter_getCupsPort;
-                Java_sun_print_CUPSPrinter_getCupsDefaultPrinter;
-                Java_sun_print_CUPSPrinter_canConnect;
-                Java_sun_print_CUPSPrinter_getMedia;
-                Java_sun_print_CUPSPrinter_getPageSizes;
-                Java_sun_print_CUPSPrinter_getResolutions;
+        Java_sun_print_CUPSPrinter_initIDs;
+        Java_sun_print_CUPSPrinter_getCupsServer;
+        Java_sun_print_CUPSPrinter_getCupsPort;
+        Java_sun_print_CUPSPrinter_getCupsDefaultPrinter;
+        Java_sun_print_CUPSPrinter_canConnect;
+        Java_sun_print_CUPSPrinter_getMedia;
+        Java_sun_print_CUPSPrinter_getPageSizes;
+        Java_sun_print_CUPSPrinter_getResolutions;
 
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1arrow;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box_1gap;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1check;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1expander;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1extension;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1flat_1box;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1focus;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1handle;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1hline;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1option;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1shadow;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1slider;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1vline;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1background;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeStartPainting;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeFinishPainting;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1switch_1theme;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1get_1gtk_1setting;
-                Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeSetRangeValue;
-                Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetXThickness;
-                Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetYThickness;
-                Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetColorForState;
-                Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetClassValue;
-                Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetPangoFontName;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1arrow;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box_1gap;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1check;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1expander;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1extension;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1flat_1box;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1focus;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1handle;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1hline;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1option;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1shadow;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1slider;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1vline;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1background;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeStartPainting;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeFinishPainting;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1switch_1theme;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1get_1gtk_1setting;
+        Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeSetRangeValue;
+        Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetXThickness;
+        Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetYThickness;
+        Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetColorForState;
+        Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetClassValue;
+        Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetPangoFontName;
 
-		awt_display;
-		awt_Lock;
-		awt_Unlock;
-	        awt_GetDrawingSurface;
-	        awt_FreeDrawingSurface;
-	        awt_GetComponent;
+        awt_display;
+        awt_Lock;
+        awt_Unlock;
+        awt_GetDrawingSurface;
+        awt_FreeDrawingSurface;
+        awt_GetComponent;
+        awt_CreateEmbeddedFrame;
+        awt_SetBounds;
+        awt_SynthesizeWindowActivation;
 
-		X11SurfaceData_GetOps;
-		getDefaultConfig;
-                Java_sun_font_FontConfigManager_getFontConfig;
-                Java_sun_font_FontConfigManager_getFontConfigAASettings;
-		Java_sun_awt_FcFontManager_getFontPathNative;
-		Java_sun_font_SunFontManager_populateFontFileNameMap;
+        X11SurfaceData_GetOps;
+        getDefaultConfig;
+            Java_sun_font_FontConfigManager_getFontConfig;
+            Java_sun_font_FontConfigManager_getFontConfigAASettings;
+        Java_sun_awt_FcFontManager_getFontPathNative;
+        Java_sun_font_SunFontManager_populateFontFileNameMap;
 
-		# CDE private entry point
-		Java_sun_awt_motif_XsessionWMcommand;
-		Java_sun_awt_motif_XsessionWMcommand_New;
+        # CDE private entry point
+        Java_sun_awt_motif_XsessionWMcommand;
+        Java_sun_awt_motif_XsessionWMcommand_New;
 
-		# libfontmanager entry points
-		AWTIsHeadless;
-		AWTCountFonts;
-                AWTLoadFont;
-                AWTFreeFont;
-                AWTFontAscent;
-                AWTFontDescent;
-                AWTFontMinByte1;
-                AWTFontMaxByte1;
-                AWTFontMinCharOrByte2;
-                AWTFontMaxCharOrByte2;
-                AWTFontDefaultChar;
-                AWTFontPerChar;
-                AWTFontMaxBounds;
-                AWTFontTextExtents16;
-                AWTFreeChar;
-                AWTFontGenerateImage;
-                AWTCharAdvance;
-                AWTCharLBearing;
-                AWTCharRBearing;
-                AWTCharAscent;
-                AWTCharDescent;
-                AWTDrawGlyphList;
-                AccelGlyphCache_RemoveAllCellInfos;
+        # libfontmanager entry points
+        AWTIsHeadless;
+        AWTCountFonts;
+        AWTLoadFont;
+        AWTFreeFont;
+        AWTFontAscent;
+        AWTFontDescent;
+        AWTFontMinByte1;
+        AWTFontMaxByte1;
+        AWTFontMinCharOrByte2;
+        AWTFontMaxCharOrByte2;
+        AWTFontDefaultChar;
+        AWTFontPerChar;
+        AWTFontMaxBounds;
+        AWTFontTextExtents16;
+        AWTFreeChar;
+        AWTFontGenerateImage;
+        AWTCharAdvance;
+        AWTCharLBearing;
+        AWTCharRBearing;
+        AWTCharAscent;
+        AWTCharDescent;
+        AWTDrawGlyphList;
+        AccelGlyphCache_RemoveAllCellInfos;
 
-	local:
-		*;
+    local:
+        *;
 };
--- a/jdk/make/mapfiles/libawt/mapfile-vers	Sat Sep 10 08:25:51 2016 -0400
+++ b/jdk/make/mapfiles/libawt/mapfile-vers	Sat Sep 10 12:23:52 2016 -0700
@@ -27,163 +27,163 @@
 # These are the libawt exports, mapfile-mawt-vers contains the libmawt exports.
 
 SUNWprivate_1.1 {
-	global:
-		JNI_OnLoad;
+    global:
+        JNI_OnLoad;
 
-		Java_java_awt_CheckboxMenuItem_initIDs;
-		Java_java_awt_Color_initIDs;
-		Java_java_awt_FontMetrics_initIDs;
-		Java_java_awt_image_BufferedImage_initIDs;
-		Java_sun_awt_image_DataBufferNative_getElem;
-		Java_sun_awt_image_DataBufferNative_setElem;
-		Java_java_awt_image_ColorModel_initIDs;
-		Java_java_awt_image_IndexColorModel_initIDs;
-		Java_java_awt_image_Kernel_initIDs;
-		Java_java_awt_image_Raster_initIDs;
-		Java_java_awt_image_SampleModel_initIDs;
-		Java_java_awt_Label_initIDs;
-		Java_java_awt_MenuBar_initIDs;
-		Java_java_awt_ScrollPaneAdjustable_initIDs;
-		Java_java_awt_Toolkit_initIDs;
-                Java_sun_awt_DebugSettings_setCTracingOn__Z;
-                Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2;
-                Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I;
-		Java_sun_awt_image_ByteComponentRaster_initIDs;
-		Java_sun_awt_image_GifImageDecoder_initIDs;
-		Java_sun_awt_image_GifImageDecoder_parseImage;
-		Java_sun_awt_image_ImageRepresentation_initIDs;
-		Java_sun_awt_image_ImageRepresentation_setDiffICM;
-		Java_sun_awt_image_ImageRepresentation_setICMpixels;
-		Java_sun_awt_image_ImagingLib_convolveBI;
-		Java_sun_awt_image_ImagingLib_convolveRaster;
-		Java_sun_awt_image_ImagingLib_init;
-		Java_sun_awt_image_ImagingLib_transformBI;
-		Java_sun_awt_image_ImagingLib_transformRaster;
-		Java_sun_awt_image_IntegerComponentRaster_initIDs;
-		Java_sun_awt_image_ShortComponentRaster_initIDs;
-                Java_sun_java2d_pipe_BufferedMaskBlit_enqueueTile;
-                Java_sun_java2d_pipe_BufferedRenderPipe_fillSpans;
-		Java_sun_java2d_pipe_SpanClipRenderer_eraseTile;
-		Java_sun_java2d_pipe_SpanClipRenderer_fillTile;
-                Java_sun_java2d_pipe_ShapeSpanIterator_addSegment;
-                Java_sun_java2d_pipe_ShapeSpanIterator_moveTo;
-                Java_sun_java2d_pipe_ShapeSpanIterator_lineTo;
-                Java_sun_java2d_pipe_ShapeSpanIterator_quadTo;
-                Java_sun_java2d_pipe_ShapeSpanIterator_curveTo;
-                Java_sun_java2d_pipe_ShapeSpanIterator_closePath;
-                Java_sun_java2d_pipe_ShapeSpanIterator_pathDone;
-                Java_sun_java2d_pipe_ShapeSpanIterator_getNativeConsumer;
-                Java_sun_java2d_pipe_ShapeSpanIterator_appendPoly;
-                Java_sun_java2d_pipe_ShapeSpanIterator_dispose;
-                Java_sun_java2d_pipe_ShapeSpanIterator_getNativeIterator;
-                Java_sun_java2d_pipe_ShapeSpanIterator_getPathBox;
-                Java_sun_java2d_pipe_ShapeSpanIterator_initIDs;
-                Java_sun_java2d_pipe_ShapeSpanIterator_intersectClipBox;
-                Java_sun_java2d_pipe_ShapeSpanIterator_nextSpan;
-                Java_sun_java2d_pipe_ShapeSpanIterator_setNormalize;
-                Java_sun_java2d_pipe_ShapeSpanIterator_setOutputAreaXYXY;
-                Java_sun_java2d_pipe_ShapeSpanIterator_setRule;
-                Java_sun_java2d_pipe_ShapeSpanIterator_skipDownTo;
+        Java_java_awt_CheckboxMenuItem_initIDs;
+        Java_java_awt_Color_initIDs;
+        Java_java_awt_FontMetrics_initIDs;
+        Java_java_awt_image_BufferedImage_initIDs;
+        Java_sun_awt_image_DataBufferNative_getElem;
+        Java_sun_awt_image_DataBufferNative_setElem;
+        Java_java_awt_image_ColorModel_initIDs;
+        Java_java_awt_image_IndexColorModel_initIDs;
+        Java_java_awt_image_Kernel_initIDs;
+        Java_java_awt_image_Raster_initIDs;
+        Java_java_awt_image_SampleModel_initIDs;
+        Java_java_awt_Label_initIDs;
+        Java_java_awt_MenuBar_initIDs;
+        Java_java_awt_ScrollPaneAdjustable_initIDs;
+        Java_java_awt_Toolkit_initIDs;
+        Java_sun_awt_DebugSettings_setCTracingOn__Z;
+        Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2;
+        Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I;
+        Java_sun_awt_image_ByteComponentRaster_initIDs;
+        Java_sun_awt_image_GifImageDecoder_initIDs;
+        Java_sun_awt_image_GifImageDecoder_parseImage;
+        Java_sun_awt_image_ImageRepresentation_initIDs;
+        Java_sun_awt_image_ImageRepresentation_setDiffICM;
+        Java_sun_awt_image_ImageRepresentation_setICMpixels;
+        Java_sun_awt_image_ImagingLib_convolveBI;
+        Java_sun_awt_image_ImagingLib_convolveRaster;
+        Java_sun_awt_image_ImagingLib_init;
+        Java_sun_awt_image_ImagingLib_transformBI;
+        Java_sun_awt_image_ImagingLib_transformRaster;
+        Java_sun_awt_image_IntegerComponentRaster_initIDs;
+        Java_sun_awt_image_ShortComponentRaster_initIDs;
+        Java_sun_java2d_pipe_BufferedMaskBlit_enqueueTile;
+        Java_sun_java2d_pipe_BufferedRenderPipe_fillSpans;
+        Java_sun_java2d_pipe_SpanClipRenderer_eraseTile;
+        Java_sun_java2d_pipe_SpanClipRenderer_fillTile;
+        Java_sun_java2d_pipe_ShapeSpanIterator_addSegment;
+        Java_sun_java2d_pipe_ShapeSpanIterator_moveTo;
+        Java_sun_java2d_pipe_ShapeSpanIterator_lineTo;
+        Java_sun_java2d_pipe_ShapeSpanIterator_quadTo;
+        Java_sun_java2d_pipe_ShapeSpanIterator_curveTo;
+        Java_sun_java2d_pipe_ShapeSpanIterator_closePath;
+        Java_sun_java2d_pipe_ShapeSpanIterator_pathDone;
+        Java_sun_java2d_pipe_ShapeSpanIterator_getNativeConsumer;
+        Java_sun_java2d_pipe_ShapeSpanIterator_appendPoly;
+        Java_sun_java2d_pipe_ShapeSpanIterator_dispose;
+        Java_sun_java2d_pipe_ShapeSpanIterator_getNativeIterator;
+        Java_sun_java2d_pipe_ShapeSpanIterator_getPathBox;
+        Java_sun_java2d_pipe_ShapeSpanIterator_initIDs;
+        Java_sun_java2d_pipe_ShapeSpanIterator_intersectClipBox;
+        Java_sun_java2d_pipe_ShapeSpanIterator_nextSpan;
+        Java_sun_java2d_pipe_ShapeSpanIterator_setNormalize;
+        Java_sun_java2d_pipe_ShapeSpanIterator_setOutputAreaXYXY;
+        Java_sun_java2d_pipe_ShapeSpanIterator_setRule;
+        Java_sun_java2d_pipe_ShapeSpanIterator_skipDownTo;
 
-		Java_java_awt_Choice_initIDs;
-		Java_java_awt_Dimension_initIDs;
-		Java_java_awt_event_MouseEvent_initIDs;
-		Java_java_awt_image_SinglePixelPackedSampleModel_initIDs;
-		Java_java_awt_Rectangle_initIDs;
-		Java_sun_awt_image_BufImgSurfaceData_initIDs;
-		Java_sun_awt_image_BufImgSurfaceData_initRaster;
-                Java_sun_awt_image_BufImgSurfaceData_freeNativeICMData;
-		Java_sun_awt_image_BytePackedRaster_initIDs;
-		Java_sun_awt_image_ImagingLib_lookupByteBI;
-		Java_sun_awt_image_ImagingLib_lookupByteRaster;
-		Java_sun_java2d_SurfaceData_initIDs;
-		Java_sun_java2d_SurfaceData_isOpaqueGray;
-		Java_sun_java2d_Disposer_initIDs;
-		Java_sun_java2d_DefaultDisposerRecord_invokeNativeDispose;
-		Java_sun_java2d_loops_BlitBg_BlitBg;
-		Java_sun_java2d_loops_Blit_Blit;
-		Java_sun_java2d_loops_ScaledBlit_Scale;
-		Java_sun_java2d_loops_DrawLine_DrawLine;
-		Java_sun_java2d_loops_DrawPolygons_DrawPolygons;
-                Java_sun_java2d_loops_DrawPath_DrawPath;
-                Java_sun_java2d_loops_FillPath_FillPath;
+        Java_java_awt_Choice_initIDs;
+        Java_java_awt_Dimension_initIDs;
+        Java_java_awt_event_MouseEvent_initIDs;
+        Java_java_awt_image_SinglePixelPackedSampleModel_initIDs;
+        Java_java_awt_Rectangle_initIDs;
+        Java_sun_awt_image_BufImgSurfaceData_initIDs;
+        Java_sun_awt_image_BufImgSurfaceData_initRaster;
+        Java_sun_awt_image_BufImgSurfaceData_freeNativeICMData;
+        Java_sun_awt_image_BytePackedRaster_initIDs;
+        Java_sun_awt_image_ImagingLib_lookupByteBI;
+        Java_sun_awt_image_ImagingLib_lookupByteRaster;
+        Java_sun_java2d_SurfaceData_initIDs;
+        Java_sun_java2d_SurfaceData_isOpaqueGray;
+        Java_sun_java2d_Disposer_initIDs;
+        Java_sun_java2d_DefaultDisposerRecord_invokeNativeDispose;
+        Java_sun_java2d_loops_BlitBg_BlitBg;
+        Java_sun_java2d_loops_Blit_Blit;
+        Java_sun_java2d_loops_ScaledBlit_Scale;
+        Java_sun_java2d_loops_DrawLine_DrawLine;
+        Java_sun_java2d_loops_DrawPolygons_DrawPolygons;
+        Java_sun_java2d_loops_DrawPath_DrawPath;
+        Java_sun_java2d_loops_FillPath_FillPath;
 
-		Java_sun_java2d_loops_DrawRect_DrawRect;
-		Java_sun_java2d_loops_FillRect_FillRect;
-		Java_sun_java2d_loops_FillSpans_FillSpans;
-		Java_sun_java2d_loops_FillParallelogram_FillParallelogram;
-		Java_sun_java2d_loops_DrawParallelogram_DrawParallelogram;
-		Java_sun_java2d_loops_GraphicsPrimitiveMgr_initIDs;
-		Java_sun_java2d_loops_GraphicsPrimitiveMgr_registerNativeLoops;
-		Java_sun_java2d_loops_MaskBlit_MaskBlit;
-		Java_sun_java2d_loops_MaskFill_MaskFill;
-		Java_sun_java2d_loops_MaskFill_FillAAPgram;
-		Java_sun_java2d_loops_MaskFill_DrawAAPgram;
-		Java_sun_java2d_loops_TransformHelper_Transform;
-		Java_sun_java2d_pipe_Region_initIDs;
-		Java_sun_java2d_pipe_SpanClipRenderer_initIDs;
-		sun_awt_image_GifImageDecoder_initIDs;
+        Java_sun_java2d_loops_DrawRect_DrawRect;
+        Java_sun_java2d_loops_FillRect_FillRect;
+        Java_sun_java2d_loops_FillSpans_FillSpans;
+        Java_sun_java2d_loops_FillParallelogram_FillParallelogram;
+        Java_sun_java2d_loops_DrawParallelogram_DrawParallelogram;
+        Java_sun_java2d_loops_GraphicsPrimitiveMgr_initIDs;
+        Java_sun_java2d_loops_GraphicsPrimitiveMgr_registerNativeLoops;
+        Java_sun_java2d_loops_MaskBlit_MaskBlit;
+        Java_sun_java2d_loops_MaskFill_MaskFill;
+        Java_sun_java2d_loops_MaskFill_FillAAPgram;
+        Java_sun_java2d_loops_MaskFill_DrawAAPgram;
+        Java_sun_java2d_loops_TransformHelper_Transform;
+        Java_sun_java2d_pipe_Region_initIDs;
+        Java_sun_java2d_pipe_SpanClipRenderer_initIDs;
+        sun_awt_image_GifImageDecoder_initIDs;
 
-		# libmawt entry points
-		SurfaceData_InitOps;
-		SurfaceData_ThrowInvalidPipeException;
-                SurfaceData_IntersectBlitBounds;
-                SurfaceData_IntersectBoundsXYXY;
-		Region_GetBounds;
-		Region_GetInfo;
-		Region_StartIteration;
-		Region_CountIterationRects;
-		Region_NextIteration;
-		Region_EndIteration;
-		RegionToYXBandedRectangles;
-		GrPrim_CompGetXorInfo;
-		GrPrim_CompGetAlphaInfo;
-                J2dTraceImpl;
-                J2dTraceInit;
-		img_makePalette;
-		initInverseGrayLut;
-		make_dither_arrays;
-		make_uns_ordered_dither_array;
+        # libmawt entry points
+        SurfaceData_InitOps;
+        SurfaceData_ThrowInvalidPipeException;
+        SurfaceData_IntersectBlitBounds;
+        SurfaceData_IntersectBoundsXYXY;
+        Region_GetBounds;
+        Region_GetInfo;
+        Region_StartIteration;
+        Region_CountIterationRects;
+        Region_NextIteration;
+        Region_EndIteration;
+        RegionToYXBandedRectangles;
+        GrPrim_CompGetXorInfo;
+        GrPrim_CompGetAlphaInfo;
+        J2dTraceImpl;
+        J2dTraceInit;
+        img_makePalette;
+        initInverseGrayLut;
+        make_dither_arrays;
+        make_uns_ordered_dither_array;
 
-		# variables exported to libmawt
-		std_img_oda_red;
-		std_img_oda_blue;
-		std_img_oda_green;
-		std_odas_computed;
-		g_CMpDataID;
-		colorValueID;
-                mul8table;
-                div8table;
-                jvm;
+        # variables exported to libmawt
+        std_img_oda_red;
+        std_img_oda_blue;
+        std_img_oda_green;
+        std_odas_computed;
+        g_CMpDataID;
+        colorValueID;
+        mul8table;
+        div8table;
+        jvm;
 
-                # ProcessPath entry points and data
-                doDrawPath;
-                doFillPath;
-                path2DNumTypesID;
-                path2DTypesID;
-                path2DWindingRuleID;
-                path2DFloatCoordsID;
-                sg2dStrokeHintID;
-                sunHints_INTVAL_STROKE_PURE;
+        # ProcessPath entry points and data
+        doDrawPath;
+        doFillPath;
+        path2DNumTypesID;
+        path2DTypesID;
+        path2DWindingRuleID;
+        path2DFloatCoordsID;
+        sg2dStrokeHintID;
+        sunHints_INTVAL_STROKE_PURE;
 
-		# CDE private entry points
-                # These are in awt_LoadLibrary.c and falls through to libmawt.
-                # Evidently CDE needs this for backward compatability.
-		Java_sun_awt_motif_XsessionWMcommand;
-		Java_sun_awt_motif_XsessionWMcommand_New;
+        # CDE private entry points
+        # These are in awt_LoadLibrary.c and falls through to libmawt.
+        # Evidently CDE needs this for backward compatability.
+        Java_sun_awt_motif_XsessionWMcommand;
+        Java_sun_awt_motif_XsessionWMcommand_New;
 
-		# libfontmanager entry points
-		AWTIsHeadless;
-		GrPrim_Sg2dGetCompInfo;
-		GrPrim_Sg2dGetClip;
-		GetNativePrim;
-		SurfaceData_IntersectBounds;
-		SurfaceData_GetOps;
-		Disposer_AddRecord;
-		GrPrim_Sg2dGetEaRGB;
-		GrPrim_Sg2dGetPixel;
-		GrPrim_Sg2dGetLCDTextContrast;
+        # libfontmanager entry points
+        AWTIsHeadless;
+        GrPrim_Sg2dGetCompInfo;
+        GrPrim_Sg2dGetClip;
+        GetNativePrim;
+        SurfaceData_IntersectBounds;
+        SurfaceData_GetOps;
+        Disposer_AddRecord;
+        GrPrim_Sg2dGetEaRGB;
+        GrPrim_Sg2dGetPixel;
+        GrPrim_Sg2dGetLCDTextContrast;
 
-	local:
-		*;
+    local:
+        *;
 };
--- a/jdk/make/mapfiles/libawt/mapfile-vers-linux	Sat Sep 10 08:25:51 2016 -0400
+++ b/jdk/make/mapfiles/libawt/mapfile-vers-linux	Sat Sep 10 12:23:52 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2016, 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,277 +27,278 @@
 # Linux port does not use mawt, all public symbols are in libawt.so
 
 SUNWprivate_1.1 {
-	global:
-		JNI_OnLoad;
+    global:
+        JNI_OnLoad;
 
-		Java_java_awt_CheckboxMenuItem_initIDs;
-		Java_java_awt_Color_initIDs;
-		Java_java_awt_FontMetrics_initIDs;
-		Java_java_awt_image_BufferedImage_initIDs;
-		Java_sun_awt_image_DataBufferNative_getElem;
-		Java_sun_awt_image_DataBufferNative_setElem;
-		Java_java_awt_image_ColorModel_initIDs;
-		Java_java_awt_image_IndexColorModel_initIDs;
-		Java_java_awt_image_Kernel_initIDs;
-		Java_java_awt_image_Raster_initIDs;
-		Java_java_awt_image_SampleModel_initIDs;
-		Java_java_awt_Label_initIDs;
-		Java_java_awt_MenuBar_initIDs;
-		Java_java_awt_ScrollPaneAdjustable_initIDs;
-		Java_java_awt_Toolkit_initIDs;
-		Java_java_awt_TrayIcon_initIDs;
-                Java_sun_awt_DebugSettings_setCTracingOn__Z;
-                Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2;
-                Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I;
-		Java_sun_awt_image_ByteComponentRaster_initIDs;
-		Java_sun_awt_image_GifImageDecoder_initIDs;
-		Java_sun_awt_image_GifImageDecoder_parseImage;
-		Java_sun_awt_image_Image_initIDs;
-		Java_sun_awt_image_ImageRepresentation_initIDs;
-		Java_sun_awt_image_ImageRepresentation_setDiffICM;
-		Java_sun_awt_image_ImageRepresentation_setICMpixels;
-		Java_sun_awt_image_ImagingLib_convolveBI;
-		Java_sun_awt_image_ImagingLib_convolveRaster;
-		Java_sun_awt_image_ImagingLib_init;
-		Java_sun_awt_image_ImagingLib_transformBI;
-		Java_sun_awt_image_ImagingLib_transformRaster;
-		Java_sun_awt_image_IntegerComponentRaster_initIDs;
-		Java_sun_awt_image_ShortComponentRaster_initIDs;
-		Java_sun_java2d_pipe_SpanClipRenderer_eraseTile;
-		Java_sun_java2d_pipe_SpanClipRenderer_fillTile;
-                Java_sun_java2d_pipe_ShapeSpanIterator_addSegment;
-                Java_sun_java2d_pipe_ShapeSpanIterator_moveTo;
-                Java_sun_java2d_pipe_ShapeSpanIterator_lineTo;
-                Java_sun_java2d_pipe_ShapeSpanIterator_quadTo;
-                Java_sun_java2d_pipe_ShapeSpanIterator_curveTo;
-                Java_sun_java2d_pipe_ShapeSpanIterator_closePath;
-                Java_sun_java2d_pipe_ShapeSpanIterator_pathDone;
-                Java_sun_java2d_pipe_ShapeSpanIterator_getNativeConsumer;
-                Java_sun_java2d_pipe_ShapeSpanIterator_appendPoly;
-                Java_sun_java2d_pipe_ShapeSpanIterator_dispose;
-                Java_sun_java2d_pipe_ShapeSpanIterator_getNativeIterator;
-                Java_sun_java2d_pipe_ShapeSpanIterator_getPathBox;
-                Java_sun_java2d_pipe_ShapeSpanIterator_initIDs;
-                Java_sun_java2d_pipe_ShapeSpanIterator_intersectClipBox;
-                Java_sun_java2d_pipe_ShapeSpanIterator_nextSpan;
-                Java_sun_java2d_pipe_ShapeSpanIterator_setNormalize;
-                Java_sun_java2d_pipe_ShapeSpanIterator_setOutputAreaXYXY;
-                Java_sun_java2d_pipe_ShapeSpanIterator_setRule;
-                Java_sun_java2d_pipe_ShapeSpanIterator_skipDownTo;
+        Java_java_awt_CheckboxMenuItem_initIDs;
+        Java_java_awt_Color_initIDs;
+        Java_java_awt_FontMetrics_initIDs;
+        Java_java_awt_image_BufferedImage_initIDs;
+        Java_sun_awt_image_DataBufferNative_getElem;
+        Java_sun_awt_image_DataBufferNative_setElem;
+        Java_java_awt_image_ColorModel_initIDs;
+        Java_java_awt_image_IndexColorModel_initIDs;
+        Java_java_awt_image_Kernel_initIDs;
+        Java_java_awt_image_Raster_initIDs;
+        Java_java_awt_image_SampleModel_initIDs;
+        Java_java_awt_Label_initIDs;
+        Java_java_awt_MenuBar_initIDs;
+        Java_java_awt_ScrollPaneAdjustable_initIDs;
+        Java_java_awt_Toolkit_initIDs;
+        Java_java_awt_TrayIcon_initIDs;
+        Java_sun_awt_DebugSettings_setCTracingOn__Z;
+        Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2;
+        Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I;
+        Java_sun_awt_image_ByteComponentRaster_initIDs;
+        Java_sun_awt_image_GifImageDecoder_initIDs;
+        Java_sun_awt_image_GifImageDecoder_parseImage;
+        Java_sun_awt_image_Image_initIDs;
+        Java_sun_awt_image_ImageRepresentation_initIDs;
+        Java_sun_awt_image_ImageRepresentation_setDiffICM;
+        Java_sun_awt_image_ImageRepresentation_setICMpixels;
+        Java_sun_awt_image_ImagingLib_convolveBI;
+        Java_sun_awt_image_ImagingLib_convolveRaster;
+        Java_sun_awt_image_ImagingLib_init;
+        Java_sun_awt_image_ImagingLib_transformBI;
+        Java_sun_awt_image_ImagingLib_transformRaster;
+        Java_sun_awt_image_IntegerComponentRaster_initIDs;
+        Java_sun_awt_image_ShortComponentRaster_initIDs;
+        Java_sun_java2d_pipe_SpanClipRenderer_eraseTile;
+        Java_sun_java2d_pipe_SpanClipRenderer_fillTile;
+        Java_sun_java2d_pipe_ShapeSpanIterator_addSegment;
+        Java_sun_java2d_pipe_ShapeSpanIterator_moveTo;
+        Java_sun_java2d_pipe_ShapeSpanIterator_lineTo;
+        Java_sun_java2d_pipe_ShapeSpanIterator_quadTo;
+        Java_sun_java2d_pipe_ShapeSpanIterator_curveTo;
+        Java_sun_java2d_pipe_ShapeSpanIterator_closePath;
+        Java_sun_java2d_pipe_ShapeSpanIterator_pathDone;
+        Java_sun_java2d_pipe_ShapeSpanIterator_getNativeConsumer;
+        Java_sun_java2d_pipe_ShapeSpanIterator_appendPoly;
+        Java_sun_java2d_pipe_ShapeSpanIterator_dispose;
+        Java_sun_java2d_pipe_ShapeSpanIterator_getNativeIterator;
+        Java_sun_java2d_pipe_ShapeSpanIterator_getPathBox;
+        Java_sun_java2d_pipe_ShapeSpanIterator_initIDs;
+        Java_sun_java2d_pipe_ShapeSpanIterator_intersectClipBox;
+        Java_sun_java2d_pipe_ShapeSpanIterator_nextSpan;
+        Java_sun_java2d_pipe_ShapeSpanIterator_setNormalize;
+        Java_sun_java2d_pipe_ShapeSpanIterator_setOutputAreaXYXY;
+        Java_sun_java2d_pipe_ShapeSpanIterator_setRule;
+        Java_sun_java2d_pipe_ShapeSpanIterator_skipDownTo;
 
-		Java_java_awt_Choice_initIDs;
-		Java_java_awt_Dimension_initIDs;
-		Java_java_awt_event_MouseEvent_initIDs;
-		Java_java_awt_image_SinglePixelPackedSampleModel_initIDs;
-		Java_java_awt_Rectangle_initIDs;
-		Java_sun_awt_image_BufImgSurfaceData_getSurfaceData;
-		Java_sun_awt_image_BufImgSurfaceData_initIDs;
-		Java_sun_awt_image_BufImgSurfaceData_initRaster;
-		Java_sun_awt_image_BufImgSurfaceData_setSurfaceData;
-                Java_sun_awt_image_BufImgSurfaceData_freeNativeICMData;
-		Java_sun_awt_image_BytePackedRaster_initIDs;
-		Java_sun_awt_image_ImagingLib_lookupByteBI;
-		Java_sun_awt_image_ImagingLib_lookupByteRaster;
-		Java_sun_java2d_SurfaceData_initIDs;
-		Java_sun_java2d_SurfaceData_isOpaqueGray;
-		Java_sun_java2d_Disposer_initIDs;
-		Java_sun_java2d_DefaultDisposerRecord_invokeNativeDispose;
-		Java_sun_java2d_loops_BlitBg_BlitBg;
-		Java_sun_java2d_loops_Blit_Blit;
-		Java_sun_java2d_loops_ScaledBlit_Scale;
-		Java_sun_java2d_loops_DrawLine_DrawLine;
-		Java_sun_java2d_loops_DrawPolygons_DrawPolygons;
-		Java_sun_java2d_loops_DrawRect_DrawRect;
-		Java_sun_java2d_loops_FillRect_FillRect;
-		Java_sun_java2d_loops_FillSpans_FillSpans;
-		Java_sun_java2d_loops_GraphicsPrimitiveMgr_initIDs;
-		Java_sun_java2d_loops_GraphicsPrimitiveMgr_registerNativeLoops;
-		Java_sun_java2d_loops_MaskBlit_MaskBlit;
-		Java_sun_java2d_loops_MaskFill_MaskFill;
-		Java_sun_java2d_loops_MaskFill_FillAAPgram;
-		Java_sun_java2d_loops_MaskFill_DrawAAPgram;
-                Java_sun_java2d_pipe_BufferedRenderPipe_fillSpans;
-		Java_sun_java2d_pipe_SpanClipRenderer_initIDs;
-		sun_awt_image_GifImageDecoder_initIDs;
+        Java_java_awt_Choice_initIDs;
+        Java_java_awt_Dimension_initIDs;
+        Java_java_awt_event_MouseEvent_initIDs;
+        Java_java_awt_image_SinglePixelPackedSampleModel_initIDs;
+        Java_java_awt_Rectangle_initIDs;
+        Java_sun_awt_image_BufImgSurfaceData_getSurfaceData;
+        Java_sun_awt_image_BufImgSurfaceData_initIDs;
+        Java_sun_awt_image_BufImgSurfaceData_initRaster;
+        Java_sun_awt_image_BufImgSurfaceData_setSurfaceData;
+        Java_sun_awt_image_BufImgSurfaceData_freeNativeICMData;
+        Java_sun_awt_image_BytePackedRaster_initIDs;
+        Java_sun_awt_image_ImagingLib_lookupByteBI;
+        Java_sun_awt_image_ImagingLib_lookupByteRaster;
+        Java_sun_java2d_SurfaceData_initIDs;
+        Java_sun_java2d_SurfaceData_isOpaqueGray;
+        Java_sun_java2d_Disposer_initIDs;
+        Java_sun_java2d_DefaultDisposerRecord_invokeNativeDispose;
+        Java_sun_java2d_loops_BlitBg_BlitBg;
+        Java_sun_java2d_loops_Blit_Blit;
+        Java_sun_java2d_loops_ScaledBlit_Scale;
+        Java_sun_java2d_loops_DrawLine_DrawLine;
+        Java_sun_java2d_loops_DrawPolygons_DrawPolygons;
+        Java_sun_java2d_loops_DrawRect_DrawRect;
+        Java_sun_java2d_loops_FillRect_FillRect;
+        Java_sun_java2d_loops_FillSpans_FillSpans;
+        Java_sun_java2d_loops_GraphicsPrimitiveMgr_initIDs;
+        Java_sun_java2d_loops_GraphicsPrimitiveMgr_registerNativeLoops;
+        Java_sun_java2d_loops_MaskBlit_MaskBlit;
+        Java_sun_java2d_loops_MaskFill_MaskFill;
+        Java_sun_java2d_loops_MaskFill_FillAAPgram;
+        Java_sun_java2d_loops_MaskFill_DrawAAPgram;
+        Java_sun_java2d_pipe_BufferedRenderPipe_fillSpans;
+        Java_sun_java2d_pipe_SpanClipRenderer_initIDs;
+        sun_awt_image_GifImageDecoder_initIDs;
 
-		# libmawt entry points
-		SurfaceData_InitOps;
-		SurfaceData_ThrowInvalidPipeException;
-                Region_GetBounds;
-                Region_GetInfo;
-                Region_StartIteration;
-                Region_CountIterationRects;
-                Region_NextIteration;
-                Region_EndIteration;
-                GrPrim_CompGetXorInfo;
-                GrPrim_CompGetAlphaInfo;
-		img_makePalette;
-		initInverseGrayLut;
-		make_dither_arrays;
-		make_uns_ordered_dither_array;
+        # libmawt entry points
+        SurfaceData_InitOps;
+        SurfaceData_ThrowInvalidPipeException;
+        Region_GetBounds;
+        Region_GetInfo;
+        Region_StartIteration;
+        Region_CountIterationRects;
+        Region_NextIteration;
+        Region_EndIteration;
+        GrPrim_CompGetXorInfo;
+        GrPrim_CompGetAlphaInfo;
+        img_makePalette;
+        initInverseGrayLut;
+        make_dither_arrays;
+        make_uns_ordered_dither_array;
 
-		# variables exported to libmawt
-		std_img_oda_red;
-		std_img_oda_blue;
-		std_img_oda_green;
-		std_odas_computed;
-		g_CMpDataID;
-		colorValueID;
-                jvm;
+        # variables exported to libmawt
+        std_img_oda_red;
+        std_img_oda_blue;
+        std_img_oda_green;
+        std_odas_computed;
+        g_CMpDataID;
+        colorValueID;
+        jvm;
 
-		# CDE private entry point
-                # This is in awt_LoadLibrary.c and falls through to libmawt.
-                # Evidently CDE needs this for backward compatability.
-		Java_sun_awt_motif_XsessionWMcommand;
+        # CDE private entry point
+        # This is in awt_LoadLibrary.c and falls through to libmawt.
+        # Evidently CDE needs this for backward compatability.
+        Java_sun_awt_motif_XsessionWMcommand;
 
-		# libfontmanager entry points
-		AWTIsHeadless;
-		GrPrim_Sg2dGetCompInfo;
-		GrPrim_Sg2dGetClip;
-		GetNativePrim;
-		SurfaceData_IntersectBounds;
-		SurfaceData_GetOps;
-		Disposer_AddRecord;
-		GrPrim_Sg2dGetEaRGB;
-		GrPrim_Sg2dGetPixel;
-		GrPrim_Sg2dGetLCDTextContrast;
+        # libfontmanager entry points
+        AWTIsHeadless;
+        GrPrim_Sg2dGetCompInfo;
+        GrPrim_Sg2dGetClip;
+        GetNativePrim;
+        SurfaceData_IntersectBounds;
+        SurfaceData_GetOps;
+        Disposer_AddRecord;
+        GrPrim_Sg2dGetEaRGB;
+        GrPrim_Sg2dGetPixel;
+        GrPrim_Sg2dGetLCDTextContrast;
 
-		Java_sun_awt_DefaultMouseInfoPeer_fillPointWithCoords;
-		Java_sun_awt_DefaultMouseInfoPeer_isWindowUnderMouse;
-		Java_java_awt_AWTEvent_nativeSetSource;
-		Java_java_awt_Checkbox_initIDs;
-		Java_java_awt_Component_initIDs;
-		Java_java_awt_Dialog_initIDs;
-		Java_java_awt_Font_initIDs;
-		Java_sun_awt_KeyboardFocusManagerPeerImpl_clearNativeGlobalFocusOwner;
-                Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusOwner;
-                Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusedWindow;
-                Java_java_awt_KeyboardFocusManager_initIDs;
-		Java_java_awt_Menu_initIDs;
-		Java_java_awt_MenuComponent_initIDs;
-		Java_java_awt_MenuItem_initIDs;
-		Java_java_awt_Scrollbar_initIDs;
-		Java_java_awt_ScrollPane_initIDs;
-		Java_java_awt_TextArea_initIDs;
-		Java_sun_awt_FontDescriptor_initIDs;
-		Java_sun_awt_X11InputMethod_disposeXIC;
-		Java_sun_awt_X11InputMethod_isCompositionEnabledNative;
-		Java_sun_awt_X11InputMethod_resetXIC;
-		Java_sun_awt_X11InputMethod_setCompositionEnabledNative;
-		Java_sun_awt_X11InputMethod_turnoffStatusWindow;
-		Java_sun_awt_SunToolkit_closeSplashScreen;
-		Java_sun_awt_PlatformFont_initIDs;
-		Java_sun_awt_X11GraphicsConfig_init;
-		Java_sun_awt_X11GraphicsConfig_dispose;
-		Java_sun_awt_X11GraphicsConfig_pGetBounds;
-		Java_sun_awt_X11GraphicsConfig_getNumColors;
-		Java_sun_awt_X11GraphicsConfig_getXResolution;
-		Java_sun_awt_X11GraphicsConfig_getYResolution;
-                Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
-		Java_sun_awt_X11GraphicsDevice_isDBESupported;
-		Java_sun_awt_X11GraphicsDevice_getDisplay;
-		Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
-		Java_sun_awt_X11GraphicsDevice_getNumConfigs;
-		Java_sun_awt_X11GraphicsDevice_initIDs;
-                Java_sun_awt_X11GraphicsDevice_initXrandrExtension;
-                Java_sun_awt_X11GraphicsDevice_enterFullScreenExclusive;
-                Java_sun_awt_X11GraphicsDevice_exitFullScreenExclusive;
-                Java_sun_awt_X11GraphicsDevice_getCurrentDisplayMode;
-                Java_sun_awt_X11GraphicsDevice_enumDisplayModes;
-                Java_sun_awt_X11GraphicsDevice_configDisplayMode;
-                Java_sun_awt_X11GraphicsDevice_resetNativeData;
-                Java_sun_awt_X11GraphicsDevice_getNativeScaleFactor;
-		Java_sun_awt_X11GraphicsEnvironment_checkShmExt;
-		Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum;
-		Java_sun_awt_X11GraphicsEnvironment_getDisplayString;
-		Java_sun_awt_X11GraphicsEnvironment_getNumScreens;
-		Java_sun_awt_X11GraphicsEnvironment_initDisplay;
-		Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
-		Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
-		Java_sun_awt_X11GraphicsEnvironment_initXRender;
+        Java_sun_awt_DefaultMouseInfoPeer_fillPointWithCoords;
+        Java_sun_awt_DefaultMouseInfoPeer_isWindowUnderMouse;
+        Java_java_awt_AWTEvent_nativeSetSource;
+        Java_java_awt_Checkbox_initIDs;
+        Java_java_awt_Component_initIDs;
+        Java_java_awt_Dialog_initIDs;
+        Java_java_awt_Font_initIDs;
+        Java_sun_awt_KeyboardFocusManagerPeerImpl_clearNativeGlobalFocusOwner;
+        Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusOwner;
+        Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusedWindow;
+        Java_java_awt_KeyboardFocusManager_initIDs;
+        Java_java_awt_Menu_initIDs;
+        Java_java_awt_MenuComponent_initIDs;
+        Java_java_awt_MenuItem_initIDs;
+        Java_java_awt_Scrollbar_initIDs;
+        Java_java_awt_ScrollPane_initIDs;
+        Java_java_awt_TextArea_initIDs;
+        Java_sun_awt_FontDescriptor_initIDs;
+        Java_sun_awt_X11InputMethod_disposeXIC;
+        Java_sun_awt_X11InputMethod_isCompositionEnabledNative;
+        Java_sun_awt_X11InputMethod_resetXIC;
+        Java_sun_awt_X11InputMethod_setCompositionEnabledNative;
+        Java_sun_awt_X11InputMethod_turnoffStatusWindow;
+        Java_sun_awt_SunToolkit_closeSplashScreen;
+        Java_sun_awt_PlatformFont_initIDs;
+        Java_sun_awt_X11GraphicsConfig_init;
+        Java_sun_awt_X11GraphicsConfig_dispose;
+        Java_sun_awt_X11GraphicsConfig_pGetBounds;
+        Java_sun_awt_X11GraphicsConfig_getNumColors;
+        Java_sun_awt_X11GraphicsConfig_getXResolution;
+        Java_sun_awt_X11GraphicsConfig_getYResolution;
+        Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
+        Java_sun_awt_X11GraphicsDevice_isDBESupported;
+        Java_sun_awt_X11GraphicsDevice_getDisplay;
+        Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
+        Java_sun_awt_X11GraphicsDevice_getNumConfigs;
+        Java_sun_awt_X11GraphicsDevice_initIDs;
+        Java_sun_awt_X11GraphicsDevice_initXrandrExtension;
+        Java_sun_awt_X11GraphicsDevice_enterFullScreenExclusive;
+        Java_sun_awt_X11GraphicsDevice_exitFullScreenExclusive;
+        Java_sun_awt_X11GraphicsDevice_getCurrentDisplayMode;
+        Java_sun_awt_X11GraphicsDevice_enumDisplayModes;
+        Java_sun_awt_X11GraphicsDevice_configDisplayMode;
+        Java_sun_awt_X11GraphicsDevice_resetNativeData;
+        Java_sun_awt_X11GraphicsDevice_getNativeScaleFactor;
+        Java_sun_awt_X11GraphicsEnvironment_checkShmExt;
+        Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum;
+        Java_sun_awt_X11GraphicsEnvironment_getDisplayString;
+        Java_sun_awt_X11GraphicsEnvironment_getNumScreens;
+        Java_sun_awt_X11GraphicsEnvironment_initDisplay;
+        Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
+        Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
+        Java_sun_awt_X11GraphicsEnvironment_initXRender;
 
+        Java_java_awt_AWTEvent_initIDs;
+        Java_java_awt_Button_initIDs;
+        Java_java_awt_Container_initIDs;
+        Java_java_awt_Cursor_finalizeImpl;
+        Java_java_awt_Cursor_initIDs;
+        Java_java_awt_Event_initIDs;
+        Java_java_awt_event_InputEvent_initIDs;
+        Java_java_awt_event_KeyEvent_initIDs;
+        Java_java_awt_FileDialog_initIDs;
+        Java_java_awt_Frame_initIDs;
+        Java_java_awt_Insets_initIDs;
+        Java_java_awt_TextField_initIDs;
+        Java_java_awt_Window_initIDs;
+        Java_sun_awt_motif_X11OffScreenImage_updateBitmask;
+        Java_sun_awt_X11GraphicsConfig_init;
+        Java_sun_awt_X11GraphicsConfig_initIDs;
+        Java_sun_awt_X11GraphicsConfig_makeColorModel;
+        Java_sun_awt_X11GraphicsDevice_getConfigVisualId;
+        Java_sun_awt_X11PMBlitLoops_Blit;
+        Java_sun_awt_X11PMBlitBgLoops_nativeBlitBg;
+        Java_sun_awt_X11Renderer_devFillSpans;
+        Java_sun_awt_X11Renderer_doDrawArc;
+        Java_sun_awt_X11Renderer_doDrawLine;
+        Java_sun_awt_X11Renderer_doDrawOval;
+        Java_sun_awt_X11Renderer_doDrawPoly;
+        Java_sun_awt_X11Renderer_doDrawRect;
+        Java_sun_awt_X11Renderer_doDrawRoundRect;
+        Java_sun_awt_X11Renderer_doFillArc;
+        Java_sun_awt_X11Renderer_doFillOval;
+        Java_sun_awt_X11Renderer_doFillPoly;
+        Java_sun_awt_X11Renderer_doFillRect;
+        Java_sun_awt_X11Renderer_doFillRoundRect;
+        Java_sun_awt_X11Renderer_devCopyArea;
+        Java_sun_awt_X11SurfaceData_initIDs;
+        Java_sun_awt_X11SurfaceData_initOps;
+        Java_sun_awt_X11SurfaceData_initSurface;
+        Java_sun_awt_X11SurfaceData_isDgaAvailable;
+        Java_sun_awt_X11SurfaceData_setInvalid;
+        Java_sun_awt_X11SurfaceData_flushNativeSurface;
+        awt_display;
+        awt_lock;
+        awt_Lock;
+        awt_Unlock;
+        awt_GetDrawingSurface;
+        awt_FreeDrawingSurface;
+        awt_GetComponent;
+        awt_CreateEmbeddedFrame;
+        awt_SetBounds;
+        awt_SynthesizeWindowActivation;
 
+        X11SurfaceData_GetOps;
+        getDefaultConfig;
+        Java_sun_font_FontConfigManager_getFontConfig;
+        Java_sun_font_FontConfigManager_getFontConfigAASettings;
+        Java_sun_awt_FcFontManager_getFontPathNative;
+        Java_sun_font_SunFontManager_populateFontFileNameMap;
 
-		Java_java_awt_AWTEvent_initIDs;
-		Java_java_awt_Button_initIDs;
-		Java_java_awt_Container_initIDs;
-		Java_java_awt_Cursor_finalizeImpl;
-		Java_java_awt_Cursor_initIDs;
-		Java_java_awt_Event_initIDs;
-		Java_java_awt_event_InputEvent_initIDs;
-		Java_java_awt_event_KeyEvent_initIDs;
-		Java_java_awt_FileDialog_initIDs;
-		Java_java_awt_Frame_initIDs;
-		Java_java_awt_Insets_initIDs;
-		Java_java_awt_TextField_initIDs;
-		Java_java_awt_Window_initIDs;
-		Java_sun_awt_motif_X11OffScreenImage_updateBitmask;
-		Java_sun_awt_X11GraphicsConfig_init;
-		Java_sun_awt_X11GraphicsConfig_initIDs;
-		Java_sun_awt_X11GraphicsConfig_makeColorModel;
-		Java_sun_awt_X11GraphicsDevice_getConfigVisualId;
-		Java_sun_awt_X11PMBlitLoops_Blit;
-		Java_sun_awt_X11PMBlitBgLoops_nativeBlitBg;
-		Java_sun_awt_X11Renderer_devFillSpans;
-		Java_sun_awt_X11Renderer_doDrawArc;
-		Java_sun_awt_X11Renderer_doDrawLine;
-		Java_sun_awt_X11Renderer_doDrawOval;
-		Java_sun_awt_X11Renderer_doDrawPoly;
-		Java_sun_awt_X11Renderer_doDrawRect;
-		Java_sun_awt_X11Renderer_doDrawRoundRect;
-		Java_sun_awt_X11Renderer_doFillArc;
-		Java_sun_awt_X11Renderer_doFillOval;
-		Java_sun_awt_X11Renderer_doFillPoly;
-		Java_sun_awt_X11Renderer_doFillRect;
-		Java_sun_awt_X11Renderer_doFillRoundRect;
-		Java_sun_awt_X11Renderer_devCopyArea;
-		Java_sun_awt_X11SurfaceData_initIDs;
-		Java_sun_awt_X11SurfaceData_initOps;
-		Java_sun_awt_X11SurfaceData_initSurface;
-		Java_sun_awt_X11SurfaceData_isDgaAvailable;
-		Java_sun_awt_X11SurfaceData_setInvalid;
-		Java_sun_awt_X11SurfaceData_flushNativeSurface;
-		awt_display;
-		awt_lock;
-		awt_Lock;
-		awt_Unlock;
-	        awt_GetDrawingSurface;
-	        awt_FreeDrawingSurface;
-	        awt_GetComponent;
+        # CDE private entry point
+        Java_sun_awt_motif_XsessionWMcommand;
 
-		X11SurfaceData_GetOps;
-		getDefaultConfig;
-                Java_sun_font_FontConfigManager_getFontConfig;
-                Java_sun_font_FontConfigManager_getFontConfigAASettings;
-		Java_sun_awt_FcFontManager_getFontPathNative;
-		Java_sun_font_SunFontManager_populateFontFileNameMap;
+        # libfontmanager entry points
+        AWTIsHeadless;
+        AWTCountFonts;
+        AWTLoadFont;
+        AWTFreeFont;
+        AWTFontMinByte1;
+        AWTFontMaxByte1;
+        AWTFontMinCharOrByte2;
+        AWTFontMaxCharOrByte2;
+        AWTFontDefaultChar;
+        AWTFontPerChar;
+        AWTFontMaxBounds;
+        AWTFontTextExtents16;
+        AWTFreeChar;
+        AWTFontGenerateImage;
+        AWTCharAdvance;
+        AWTCharLBearing;
+        AWTCharRBearing;
+        AWTCharAscent;
+        AWTCharDescent;
+        AWTDrawGlyphList;
+        AccelGlyphCache_RemoveAllCellInfos;
 
-		# CDE private entry point
-		Java_sun_awt_motif_XsessionWMcommand;
-
-		# libfontmanager entry points
-		AWTIsHeadless;
-		AWTCountFonts;
-                AWTLoadFont;
-                AWTFreeFont;
-                AWTFontMinByte1;
-                AWTFontMaxByte1;
-                AWTFontMinCharOrByte2;
-                AWTFontMaxCharOrByte2;
-                AWTFontDefaultChar;
-                AWTFontPerChar;
-                AWTFontMaxBounds;
-                AWTFontTextExtents16;
-                AWTFreeChar;
-                AWTFontGenerateImage;
-                AWTCharAdvance;
-                AWTCharLBearing;
-                AWTCharRBearing;
-                AWTCharAscent;
-                AWTCharDescent;
-                AWTDrawGlyphList;
-                AccelGlyphCache_RemoveAllCellInfos;
-
-	local:
-		*;
+    local:
+        *;
 };
--- a/jdk/make/mapfiles/libawt_headless/mapfile-vers	Sat Sep 10 08:25:51 2016 -0400
+++ b/jdk/make/mapfiles/libawt_headless/mapfile-vers	Sat Sep 10 12:23:52 2016 -0700
@@ -26,85 +26,84 @@
 # Define public interface.
 
 SUNWprivate_1.1 {
-	global:
-		JNI_OnLoad;
+    global:
+        JNI_OnLoad;
 
-                Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit;
-		Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg;
-		Java_sun_java2d_x11_X11Renderer_XFillSpans;
-		Java_sun_java2d_x11_X11Renderer_XDrawArc;
-		Java_sun_java2d_x11_X11Renderer_XDrawLine;
-		Java_sun_java2d_x11_X11Renderer_XDrawOval;
-		Java_sun_java2d_x11_X11Renderer_XDrawPoly;
-		Java_sun_java2d_x11_X11Renderer_XDrawRect;
-		Java_sun_java2d_x11_X11Renderer_XDrawRoundRect;
-                Java_sun_java2d_x11_X11Renderer_XDoPath;
-		Java_sun_java2d_x11_X11Renderer_XFillArc;
-		Java_sun_java2d_x11_X11Renderer_XFillOval;
-		Java_sun_java2d_x11_X11Renderer_XFillPoly;
-		Java_sun_java2d_x11_X11Renderer_XFillRect;
-		Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
-		Java_sun_java2d_x11_X11Renderer_devCopyArea;
-		Java_sun_java2d_x11_X11SurfaceData_initIDs;
-		Java_sun_java2d_x11_X11SurfaceData_initSurface;
-                Java_sun_java2d_x11_X11SurfaceData_XSetCopyMode;
-                Java_sun_java2d_x11_X11SurfaceData_XSetXorMode;
-                Java_sun_java2d_x11_X11SurfaceData_XSetForeground;
+        Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit;
+        Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg;
+        Java_sun_java2d_x11_X11Renderer_XFillSpans;
+        Java_sun_java2d_x11_X11Renderer_XDrawArc;
+        Java_sun_java2d_x11_X11Renderer_XDrawLine;
+        Java_sun_java2d_x11_X11Renderer_XDrawOval;
+        Java_sun_java2d_x11_X11Renderer_XDrawPoly;
+        Java_sun_java2d_x11_X11Renderer_XDrawRect;
+        Java_sun_java2d_x11_X11Renderer_XDrawRoundRect;
+        Java_sun_java2d_x11_X11Renderer_XDoPath;
+        Java_sun_java2d_x11_X11Renderer_XFillArc;
+        Java_sun_java2d_x11_X11Renderer_XFillOval;
+        Java_sun_java2d_x11_X11Renderer_XFillPoly;
+        Java_sun_java2d_x11_X11Renderer_XFillRect;
+        Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
+        Java_sun_java2d_x11_X11Renderer_devCopyArea;
+        Java_sun_java2d_x11_X11SurfaceData_initIDs;
+        Java_sun_java2d_x11_X11SurfaceData_initSurface;
+        Java_sun_java2d_x11_X11SurfaceData_XSetCopyMode;
+        Java_sun_java2d_x11_X11SurfaceData_XSetXorMode;
+        Java_sun_java2d_x11_X11SurfaceData_XSetForeground;
 
-		Java_sun_java2d_x11_XSurfaceData_initOps;
-                Java_sun_java2d_x11_XSurfaceData_XCreateGC;
-                Java_sun_java2d_x11_XSurfaceData_XResetClip;
-                Java_sun_java2d_x11_XSurfaceData_XSetClip;
-                Java_sun_java2d_x11_XSurfaceData_flushNativeSurface;
-		Java_sun_java2d_x11_XSurfaceData_isDrawableValid;
-		Java_sun_java2d_x11_XSurfaceData_setInvalid;
-		Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures;
+        Java_sun_java2d_x11_XSurfaceData_initOps;
+        Java_sun_java2d_x11_XSurfaceData_XCreateGC;
+        Java_sun_java2d_x11_XSurfaceData_XResetClip;
+        Java_sun_java2d_x11_XSurfaceData_XSetClip;
+        Java_sun_java2d_x11_XSurfaceData_flushNativeSurface;
+        Java_sun_java2d_x11_XSurfaceData_isDrawableValid;
+        Java_sun_java2d_x11_XSurfaceData_setInvalid;
+        Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures;
 
-		X11SurfaceData_GetOps;
-		Java_java_awt_Font_initIDs;
-                Java_sun_font_FontConfigManager_getFontConfig;
-                Java_sun_font_FontConfigManager_getFontConfigAASettings;