Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorlana
Fri, 22 Dec 2017 01:28:29 +0000
changeset 48414 ca64a6be0128
parent 48412 d4412e380f6b (diff)
parent 48413 c9e503d6fef5 (current diff)
child 48415 bae005a497a2
Merge
--- a/src/java.base/share/classes/java/util/stream/WhileOps.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.base/share/classes/java/util/stream/WhileOps.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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
@@ -95,7 +95,7 @@
 
                     @Override
                     public void accept(T t) {
-                        if (take = predicate.test(t)) {
+                        if (take && (take = predicate.test(t))) {
                             downstream.accept(t);
                         }
                     }
@@ -152,7 +152,7 @@
 
                     @Override
                     public void accept(int t) {
-                        if (take = predicate.test(t)) {
+                        if (take && (take = predicate.test(t))) {
                             downstream.accept(t);
                         }
                     }
@@ -209,7 +209,7 @@
 
                     @Override
                     public void accept(long t) {
-                        if (take = predicate.test(t)) {
+                        if (take && (take = predicate.test(t))) {
                             downstream.accept(t);
                         }
                     }
@@ -266,7 +266,7 @@
 
                     @Override
                     public void accept(double t) {
-                        if (take = predicate.test(t)) {
+                        if (take && (take = predicate.test(t))) {
                             downstream.accept(t);
                         }
                     }
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConst.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConst.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,6 +23,7 @@
 /**
  * Exception constants.
  * @since 6.0 (intended to replace the InstructionConstant interface)
+ * @LastModified: Oct 2017
  */
 public final class ExceptionConst {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -44,6 +43,7 @@
  * Utility functions that do not really belong to any class in particular.
  *
  * @version $Id: Utility.java 1751107 2016-07-03 02:41:18Z dbrosius $
+ * @LastModified: Oct 2017
  */
 // @since 6.0 methods are no longer final
 public abstract class Utility {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
  * <PRE>Stack: ..., arrayref -&gt; ..., length</PRE>
  *
  * @version $Id: ARRAYLENGTH.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
  */
 public class ARRAYLENGTH extends Instruction
     implements ExceptionThrower, StackProducer, StackConsumer /* since 6.0 */ {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
  * <PRE>Stack: ..., objectref -&gt; objectref</PRE>
  *
  * @version $Id: ATHROW.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
  */
 public class ATHROW extends Instruction implements UnconditionalBranch, ExceptionThrower {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
  * <PRE>Stack: ..., value1, value2 -&gt; result</PRE>
  *
  * @version $Id: IDIV.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
  */
 public class IDIV extends ArithmeticInstruction implements ExceptionThrower {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
  * <PRE>Stack: ..., value1, value2 -&gt; result</PRE>
  *
  * @version $Id: IREM.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
  */
 public class IREM extends ArithmeticInstruction implements ExceptionThrower {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
  *        ..., result.word1, result.word2
  *
  * @version $Id: LDIV.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
  */
 public class LDIV extends ArithmeticInstruction implements ExceptionThrower {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
  * <PRE>Stack: ..., value1, value2 -&gt; result</PRE>
  *
  * @version $Id: LREM.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
  */
 public class LREM extends ArithmeticInstruction implements ExceptionThrower {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
  * <PRE>Stack: ..., objectref -&gt; ...</PRE>
  *
  * @version $Id: MONITORENTER.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
  */
 public class MONITORENTER extends Instruction implements ExceptionThrower, StackConsumer {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
  * <PRE>Stack: ..., objectref -&gt; ...</PRE>
  *
  * @version $Id: MONITOREXIT.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
  */
 public class MONITOREXIT extends Instruction implements ExceptionThrower, StackConsumer {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -59,6 +58,7 @@
  * @version $Id: MethodGen.java 1749603 2016-06-21 20:50:19Z ggregory $
  * @see InstructionList
  * @see Method
+ * @LastModified: Oct 2017
  */
 public class MethodGen extends FieldGenOrMethodGen {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
  * type must be one of T_INT, T_SHORT, ...
  *
  * @version $Id: NEWARRAY.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
  */
 public class NEWARRAY extends Instruction implements AllocationInstruction, ExceptionThrower,
         StackProducer {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
  * Super class for the xRETURN family of instructions.
  *
  * @version $Id: ReturnInstruction.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
  */
 public abstract class ReturnInstruction extends Instruction implements ExceptionThrower,
         TypedInstruction, StackConsumer {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,6 +65,7 @@
  *
  * @see BCELifier
  * @version $Id: BCELFactory.java 1749603 2016-06-21 20:50:19Z ggregory $
+ * @LastModified: Oct 2017
  */
 class BCELFactory extends EmptyVisitor {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,6 +65,7 @@
  * @version $Id: InstructionFinder.java 1749603 2016-06-21 20:50:19Z ggregory $
  * @see com.sun.org.apache.bcel.internal.generic.Instruction
  * @see InstructionList
+ * @LastModified: Oct 2017
  */
 public class InstructionFinder {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
  *
  * @see <a href="http://www.exslt.org/">EXSLT</a>
  * @xsl.usage general
+ * @LastModified: Nov 2017
  */
 
 public class ExsltDatetime
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
  * be called XalanMessages, or some such.
  *
  * @xsl.usage internal
+ * @LastModified: Sep 2017
  */
 public class XSLMessages extends XPATHMessages {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,6 +22,8 @@
 
 /**
  * A configuration error. This was an internal class in ObjectFactory previously
+ *
+ * @LastModified: Oct 2017
  */
 public final class ConfigurationError
     extends Error {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
  * class and modified to be used as a general utility for creating objects
  * dynamically.
  *
+ * @LastModified: Oct 2017
  */
 public class ObjectFactory {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public interface Translet {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class ApplyTemplates extends Instruction {
     private Expression _select;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Nov 2017
  */
 final class AttributeSet extends TopLevelElement {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class AttributeValueTemplate extends AttributeValue {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
  */
 final class BinOpExpr extends Expression {
     public static final int PLUS  = 0;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class BooleanCall extends FunctionCall {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
  */
 final class CallTemplate extends Instruction {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
 
 /**
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class CastCall extends FunctionCall {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class CeilingCall extends FunctionCall {
     public CeilingCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class Choose extends Instruction {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class ConcatCall extends FunctionCall {
     public ConcatCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class ContainsCall extends FunctionCall {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class DocumentCall extends FunctionCall {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class ElementAvailableCall extends FunctionCall {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
  * @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
  */
 abstract class Expression extends SyntaxTreeNode {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Nov 2017
  */
 class FilterExpr extends Expression {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class FloorCall extends FunctionCall {
     public FloorCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public final class FlowList {
     private List<InstructionHandle> _elements;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class ForEach extends Instruction {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class FormatNumberCall extends FunctionCall {
     private Expression _value;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
 /**
  * @author G. Todd Miller
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
  */
 final class FunctionAvailableCall extends FunctionCall {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
  * @author Morten Jorgensen
  * @author Erwin Bolwidt <ejb@klomp.org>
  * @author Todd Miller
+ * @LastModified: Nov 2017
  */
 class FunctionCall extends Expression {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class GenerateIdCall extends FunctionCall {
     public GenerateIdCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
  * @author Morten Jorgensen
  * @author Erwin Bolwidt <ejb@klomp.org>
  * @author Gunnlaugur Briem <gthb@dimon.is>
+ * @LastModified: Sep 2017
  */
 final class Import extends TopLevelElement {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
  * @author Morten Jorgensen
  * @author Erwin Bolwidt <ejb@klomp.org>
  * @author Gunnlaugur Briem <gthb@dimon.is>
+ * @LastModified: Sep 2017
  */
 final class Include extends TopLevelElement {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -52,6 +51,7 @@
 /**
  * @author Morten Jorgensen
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class Key extends TopLevelElement {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
 /**
  * @author Morten Jorgensen
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class KeyCall extends FunctionCall {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
 
 /**
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class LangCall extends FunctionCall {
     private Expression _lang;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class LiteralElement extends Instruction {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
 
 /**
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class LocalNameCall extends NameBase {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Nov 2017
  */
 final class LogicalExpr extends Expression {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Nov 2017
  */
 final class Message extends Instruction {
     private boolean _terminate = false;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
  * @author Morten Jorgensen
  * @author Erwin Bolwidt <ejb@klomp.org>
  * @author G. Todd Miller
+ * @LastModified: Nov 2017
  */
 final class Mode implements Constants {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
 /**
  * @author Morten Jorgensen
  * @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
  */
 class NameBase extends FunctionCall {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class NameCall extends NameBase {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
 
 /**
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class NamespaceUriCall extends NameBase {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class NotCall extends FunctionCall {
     public NotCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -54,6 +53,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
  */
 final class Number extends Instruction implements Closure {
     private static final int LEVEL_SINGLE   = 0;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class NumberCall extends FunctionCall {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -67,6 +66,7 @@
  * @author G. Todd Miller
  * @author Morten Jorgensen
  * @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Nov 2017
  */
 public class Parser implements Constants, ContentHandler {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -52,6 +51,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class Predicate extends Expression implements Closure {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
 
 /**
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class ProcessingInstructionPattern extends StepPattern {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -44,6 +43,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class RelationalExpr extends Expression {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class RoundCall extends FunctionCall {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -59,6 +58,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Nov 2017
  */
 final class Sort extends Instruction implements Closure {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class StartsWithCall extends FunctionCall {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class Step extends RelativeLocationPath {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,6 +57,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
  */
 class StepPattern extends RelativePathPattern {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class StringCall extends FunctionCall {
     public StringCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class StringLengthCall extends FunctionCall {
     public StringLengthCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,6 +65,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 public final class Stylesheet extends SyntaxTreeNode {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class SymbolTable {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,6 +57,7 @@
  * @author Morten Jorensen
  * @author Erwin Bolwidt <ejb@klomp.org>
  * @author John Howard <JohnH@schemasoft.com>
+ * @LastModified: Nov 2017
  */
 public abstract class SyntaxTreeNode implements Constants {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
  * @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
  */
 public final class Template extends TopLevelElement {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -47,7 +46,8 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Erwin Bolwidt <ejb@klomp.org>
- * @author Morten Jorgensen <morten.jorgensen@sun.com>
+ * @author Morten Jorgensen
+ * @LastModified: Nov 2017
  */
 final class TestSeq {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @LastModified: Oct 2017
+ */
 class TopLevelElement extends SyntaxTreeNode {
 
     /*
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 final class UnaryOpExpr extends Expression {
     private Expression _left;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
  */
 final class UnionPathExpr extends Expression {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class UnparsedEntityUriCall extends FunctionCall {
     private Expression _entity;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
 
 /**
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class UnsupportedElement extends SyntaxTreeNode {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class UseAttributeSets extends Instruction {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
  * @author Morten Jorgensen
  * @author Erwin Bolwidt <ejb@klomp.org>
  * @author John Howard <JohnH@schemasoft.com>
+ * @LastModified: Oct 2017
  */
 class VariableBase extends TopLevelElement {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
 
 /**
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 final class Whitespace extends TopLevelElement {
     // Three possible actions for the translet:
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,9 @@
 import com.sun.java_cup.internal.runtime.Symbol;
 
 
+/**
+ * @LastModified: Oct 2017
+ */
 class XPathLexer implements com.sun.java_cup.internal.runtime.Scanner {
         private final int YY_BUFFER_SIZE = 512;
         private final int YY_F = -1;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -59,6 +58,7 @@
  * @author G. Todd Miller
  * @author Morten Jorgensen
  * @author John Howard (johnh@schemasoft.com)
+ * @LastModified: Oct 2017
  */
 public final class XSLTC {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -50,6 +49,7 @@
  * @author Morten Jorgensen
  * @author Erwin Bolwidt <ejb@klomp.org>
  * @author Gunnlaugur Briem <gthb@dimon.is>
+ * @LastModified: Oct 2017
  */
 final class XslAttribute extends Instruction {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public final class BooleanType extends Type {
     protected BooleanType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
  * @author G. Todd Miller
  * @author Erwin Bolwidt <ejb@klomp.org>
  * @author Morten Jorgensen
+ * @LastModified: Sep 2017
  */
 public final class ErrorMsg {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -50,6 +49,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public final class IntType extends NumberType {
     protected IntType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,6 +23,8 @@
 /**
  * Marks a class of errors in which XSLTC has reached some incorrect internal
  * state from which it cannot recover.
+ *
+ * @LastModified: Oct 2017
  */
 public class InternalError extends Error {
     private static final long serialVersionUID = -6690855975016554786L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -76,6 +75,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
  */
 public class MethodGenerator extends MethodGen
     implements com.sun.org.apache.xalan.internal.xsltc.compiler.Constants {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public final class MethodType extends Type {
     private final Type _resultType;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public final class NodeSetType extends Type {
     protected NodeSetType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public final class NodeType extends Type {
     private final int _type;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
 /**
  * @author Todd Miller
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public final class ObjectType extends Type {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public final class RealType extends NumberType {
     protected RealType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
  */
 public final class ReferenceType extends Type {
     protected ReferenceType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 public final class ResultTreeType extends Type {
     private final String _methodName;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +25,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public final class StringStack extends Stack<String> {
     static final long serialVersionUID = -1506910875640317898L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public class StringType extends Type {
     protected StringType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 public abstract class Type implements Constants {
     public static final Type Int        = new IntType();
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Sep 2017
  */
 public final class Util {
     private static char filesep;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public final class VoidType extends Type {
     protected VoidType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
  * <b>deprecated.</b></em>
  * @author Morten Jorgensen
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public class KeyIndex extends DTMAxisIteratorBase {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
 
 /**
  * @author Morten Jorgensen
+ * @LastModified: Sep 2017
  */
 public final class LoadDocument {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
+ * @LastModified: Oct 2017
  */
 public abstract class NodeCounter {
     public static final int END = DTM.NULL;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,8 @@
 
 /**
  * Base class for sort records containing application specific sort keys
+ *
+ * @LastModified: Oct 2017
  */
 public abstract class NodeSortRecord {
     public static final int COMPARE_STRING     = 0;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,9 @@
 import java.text.Collator;
 import java.util.Locale;
 
+/**
+ * @LastModified: Oct 2017
+ */
 public class NodeSortRecordFactory {
 
     private static int DESCENDING = "descending".length();
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -69,6 +68,7 @@
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
  * @author Douglas Sellers <douglasjsellers@hotmail.com>
+ * @LastModified: Oct 2017
  */
 public final class SAXImpl extends SAX2DTM2
                            implements DOMEnhancedForDTM, DOMBuilder
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -55,6 +54,7 @@
  * @author Morten Jorgensen
  * @author G. Todd Miller
  * @author John Howard, JohnH@schemasoft.com
+ * @LastModified: Oct 2017
  */
 public abstract class AbstractTranslet implements Translet {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -61,6 +60,8 @@
 /**
  * Standard XSLT functions. All standard functions expect the current node
  * and the DOM as their last two arguments.
+ *
+ * @LastModified: Sep 2017
  */
 public final class BasisLibrary {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,6 +24,8 @@
 /**
  * Class to express failed assertions and similar for the xsltc runtime.
  * As java.lang.AssertionError was introduced in JDK 1.4 we can't use that yet.
+ *
+ * @LastModified: Oct 2017
  */
 public class InternalRuntimeError extends Error {
     private static final long serialVersionUID = 2802784919179095307L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -49,6 +48,7 @@
 
 /**
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
  */
 public class TransletOutputHandlerFactory {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
 
 /**
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Sep 2017
  */
 class WriterOutputBuffer implements OutputBuffer {
     private static final int KB = 1024;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
 
 /**
  * @author G. Todd Miller
+ * @LastModified: Oct 2017
  */
 public class DOM2SAX implements XMLReader, Locator {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
  * @author G. Todd Miller
  * @author Sunitha Reddy
  * @author Huizhe Wang
+ * @LastModified: Nov 2017
  */
 public class SAX2DOM implements ContentHandler, LexicalHandler, Constants {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -69,6 +68,7 @@
  * @author G. Todd Millerj
  * @author Jochen Cordes <Jochen.Cordes@t-online.de>
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
  */
 public final class TemplatesImpl implements Templates, Serializable {
     static final long serialVersionUID = 673094361519270707L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -89,6 +88,7 @@
  * @author G. Todd Miller
  * @author Morten Jorgensen
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
  */
 @SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
 public class TransformerFactoryImpl
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -95,6 +94,7 @@
  * @author Morten Jorgensen
  * @author G. Todd Miller
  * @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
  */
 public final class TransformerImpl extends Transformer
     implements DOMCache, ErrorListener
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
 
 /**
  * @author Morten Jorgensen
+ * @LastModified: Nov 2017
  */
 public final class XSLTCSource implements Source {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
  *
  * @xerces.internal
  *
+ * @LastModified: Oct 2017
  */
 public class AttributeMap extends NamedNodeMapImpl {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -84,6 +83,7 @@
  * @author Andy Clark, IBM
  * @author Ralf Pfeiffer, IBM
  * @since  PR-DOM-Level-1-19980818.
+ * @LastModified: Nov 2017
  */
 public class CoreDocumentImpl
         extends ParentNode implements Document {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -71,6 +70,7 @@
  *
  * @author Elena Litani, IBM
  * @author Neeraj Bajaj, Sun Microsystems.
+ * @LastModified: Oct 2017
  */
 public class DOMConfigurationImpl extends ParserConfigurationSettings
     implements XMLParserConfiguration, DOMConfiguration {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
  *
  * @author Neil Delima, IBM
  * @since DOM Level 3 Core
+ * @LastModified: Oct 2017
  */
 public class DOMImplementationListImpl implements DOMImplementationList {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
  *
  * @xerces.internal
  *
+ * @LastModified: Oct 2017
  */
 public class DOMImplementationSourceImpl
     implements DOMImplementationSource {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
  * @xerces.internal
  *
  * @author Sandy Gao, IBM
+ * @LastModified: Sep 2017
  */
 public class DOMMessageFormatter {
     public static final String DOM_DOMAIN = "http://www.w3.org/dom/DOMTR";
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -97,6 +96,7 @@
  *
  * @author Elena Litani, IBM
  * @author Neeraj Bajaj, Sun Microsystems, inc.
+ * @LastModified: Nov 2017
  */
 public class DOMNormalizer implements XMLDocumentHandler {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
  * @xerces.internal
  *
  * @author Neil Delima, IBM
+ * @LastModified: Nov 2017
  */
 public class DOMStringListImpl implements DOMStringList {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
  * @xerces.internal
  *
  * @author Elena Litani, IBM
+ * @LastModified: Oct 2017
  */
 public class DOMXSImplementationSourceImpl
     extends DOMImplementationSourceImpl {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -72,6 +71,7 @@
  * @xerces.internal
  *
  * @since  PR-DOM-Level-1-19980818.
+ * @LastModified: Oct 2017
  */
 public class DeepNodeListImpl
         implements NodeList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
  * @xerces.internal
  *
  * @since  PR-DOM-Level-1-19980818.
+ * @LastModified: Oct 2017
  */
 public class DeferredDocumentImpl
     extends DocumentImpl
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
  * @xerces.internal
  *
  * @since  PR-DOM-Level-1-19980818.
+ * @LastModified: Oct 2017
  */
 public class DeferredDocumentTypeImpl
     extends DocumentTypeImpl
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -85,6 +84,7 @@
  * @author Andy Clark, IBM
  * @author Ralf Pfeiffer, IBM
  * @since  PR-DOM-Level-1-19980818.
+ * @LastModified: Nov 2017
  */
 public class DocumentImpl
     extends CoreDocumentImpl
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -682,7 +682,6 @@
                     // If the new name has a different prefix, the list may become unsorted.
                     // Maybe it would be better to resort the list, but the simplest
                     // fix seems to be to remove the old attribute and re-insert it.
-                    // -- Norman.Walsh@Sun.COM, 2 Feb 2007
                     newAttr = (Attr) attributes.removeItem(newAttr, false);
                     attributes.addItem(newAttr);
                 }
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -57,6 +56,7 @@
  * @xerces.internal
  *
  * @since  PR-DOM-Level-1-19980818.
+ * @LastModified: Oct 2017
  */
 public class NamedNodeMapImpl
     implements NamedNodeMap, Serializable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
  *
  * @xerces.internal
  *
+ * @LastModified: Oct 2017
  */
 public class RangeImpl  implements Range {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
  *
  * @author Andy Clark, IBM
  *
+ * @LastModified: Oct 2017
  */
 public final class Constants {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java	Fri Dec 22 01:28:29 2017 +0000
@@ -37,13 +37,13 @@
 import jdk.xml.internal.JdkXmlUtils;
 
 /**
- *  This class manages different properties related to Stax specification and its implementation.
+ * This class manages different properties related to Stax specification and its implementation.
  * This class constructor also takes itself (PropertyManager object) as parameter and initializes the
  * object with the property taken from the object passed.
  *
- * @author  Neeraj Bajaj, neeraj.bajaj@sun.com
- * @author K.Venugopal@sun.com
- * @author Sunitha Reddy, sunitha.reddy@sun.com
+ * @author Neeraj Bajaj
+ * @author K Venugopal
+ * @author Sunitha Reddy
  */
 
 public class PropertyManager {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -741,7 +741,7 @@
         // Take advantage of the fact that next string _should_ be "fElementQName.rawName",
         //In scanners most of the time is consumed on checks done for XML characters, we can
         // optimize on it and avoid the checks done for endElement,
-        //we will also avoid symbol table lookup - neeraj.bajaj@sun.com
+        //we will also avoid symbol table lookup.
 
         // this should work both for namespace processing true or false...
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -64,6 +63,7 @@
  * @author Glenn Marcy, IBM
  * @author Eric Ye, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class XMLDTDScannerImpl
 extends XMLScanner
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 
 /*
@@ -72,6 +71,7 @@
  * @author Eric Ye, IBM
  * @author Sunitha Reddy, SUN Microsystems
  *
+ * @LastModified: Sep 2017
  */
 public class XMLDocumentFragmentScannerImpl
         extends XMLScanner
@@ -1670,7 +1670,7 @@
         // Take advantage of the fact that next string _should_ be "fElementQName.rawName",
         //In scanners most of the time is consumed on checks done for XML characters, we can
         // optimize on it and avoid the checks done for endElement,
-        //we will also avoid symbol table lookup - neeraj.bajaj@sun.com
+        //we will also avoid symbol table lookup.
 
         // this should work both for namespace processing true or false...
 
@@ -2461,7 +2461,6 @@
          * we dont need to set the value for every end element encouterd.
          * For Well formedness checks we can have the same QName object that was pushed.
          * the values will be set only if application need to know about the endElement
-         * -- neeraj.bajaj@sun.com
          */
 
         public QName getLastPoppedElement(){
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 
 /*
@@ -65,6 +64,7 @@
  * Refer to the table in unit-test javax.xml.stream.XMLStreamReaderTest.SupportDTD for changes
  * related to property SupportDTD.
  * @author Joe Wang, Sun Microsystems
+ * @LastModified: Sep 2017
  */
 public class XMLDocumentScannerImpl
         extends XMLDocumentFragmentScannerImpl{
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -90,6 +89,7 @@
  * @author K.Venugopal SUN Microsystems
  * @author Neeraj Bajaj SUN Microsystems
  * @author Sunitha Reddy SUN Microsystems
+ * @LastModified: Oct 2017
  */
 public class XMLEntityManager implements XMLComponent, XMLEntityResolver {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -71,6 +70,7 @@
  * @author Eric Ye, IBM
  * @author Andy Clark, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class XMLErrorReporter
     implements XMLComponent {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -57,6 +56,7 @@
  *
  * @author Andy Clark, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class XMLNamespaceBinder
     implements XMLComponent, XMLDocumentFilter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -68,6 +67,7 @@
  * @author Eric Ye, IBM
  * @author K.Venugopal SUN Microsystems
  * @author Sunitha Reddy, SUN Microsystems
+ * @LastModified: Nov 2017
  */
 public abstract class XMLScanner
         implements XMLComponent {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
  * @author Andy Clark, IBM
  * @author Neil Graham, IBM
  *
+ * @LastModified: Oct 2017
  */
 public class DTDGrammar
     implements XMLDTDHandler, XMLDTDContentModelHandler, EntityState, Grammar {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
  * @xerces.internal
  *
  * @author Neil Graham, IBM
+ * @LastModified: Oct 2017
  */
 public class XMLDTDDescription extends XMLResourceIdentifierImpl
         implements com.sun.org.apache.xerces.internal.xni.grammars.XMLDTDDescription {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -68,6 +67,7 @@
  * @author Neil Graham, IBM
  * @author Michael Glavassevich, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class XMLDTDLoader
         extends XMLDTDProcessor
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -72,6 +71,7 @@
  *
  * @author Neil Graham, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class XMLDTDProcessor
         implements XMLComponent, XMLDTDFilter, XMLDTDContentModelFilter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -85,6 +84,7 @@
  * @author Jeffrey Rodriguez IBM
  * @author Neil Graham, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class XMLDTDValidator
         implements XMLComponent, XMLDocumentFilter, XMLDTDValidatorFilter, RevalidationHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,7 @@
  *
  * @xerces.internal
  *
+ * @LastModified: Oct 2017
  */
 public class DFAContentModel
     implements ContentModelValidator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class DatatypeException extends Exception {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
  *
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Oct 2017
  */
 public class XSFacets {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
  *
  * @author Jeffrey Rodriguez
  * @author Sandy Gao
+ * @LastModified: Nov 2017
  */
 public final class  Base64 {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
  *
  * @author Ankit Pasricha, IBM
  *
+ * @LastModified: Oct 2017
  */
 public class ByteListImpl extends AbstractList<Byte> implements ByteList {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class BaseDVFactory extends SchemaDVFactory {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
  *
  * @author Khaled Noaman, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class ExtendedSchemaDVFactoryImpl extends BaseSchemaDVFactory {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class FullDVFactory extends BaseDVFactory {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Oct 2017
  */
 public class ListDV extends TypeValidator{
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class SchemaDVFactoryImpl extends BaseSchemaDVFactory {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -64,6 +63,7 @@
  * @author Sandy Gao, IBM
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  *
+ * @LastModified: Nov 2017
  */
 public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
  *
  * @author Eric Ye, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class XMLMessageFormatter implements MessageFormatter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Eric Ye, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class XMLMessageFormatter_de implements MessageFormatter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Eric Ye, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class XMLMessageFormatter_es implements MessageFormatter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Eric Ye, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class XMLMessageFormatter_fr implements MessageFormatter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Eric Ye, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class XMLMessageFormatter_it implements MessageFormatter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Eric Ye, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class XMLMessageFormatter_ja implements MessageFormatter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Eric Ye, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class XMLMessageFormatter_ko implements MessageFormatter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Eric Ye, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class XMLMessageFormatter_pt_BR implements MessageFormatter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Eric Ye, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class XMLMessageFormatter_sv implements MessageFormatter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Eric Ye, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class XMLMessageFormatter_zh_CN implements MessageFormatter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Eric Ye, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class XMLMessageFormatter_zh_TW implements MessageFormatter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ConfigurableValidationState.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ConfigurableValidationState.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
  * @xerces.internal
  *
  * @author Peter McCracken, IBM
+ * @LastModified: Oct 2017
  */
 public final class ConfigurableValidationState extends ValidationState {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
  * @xerces.internal
  *
  * @author Elena Litani, IBM
+ * @LastModified: Oct 2017
  */
 public class ValidationManager {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
  * @xerces.internal
  *
  * @author Elena Litani, IBM
+ * @LastModified: Oct 2017
  */
 public class ValidationState implements ValidationContext {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
  *
  * @xerces.internal
  *
+ * @LastModified: Sep 2017
  */
 class RegexParser {
     static final int T_CHAR = 0;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
  * @xerces.internal
  *
  * @author Elena Litani IBM
+ * @LastModified: Nov 2017
  */
 public class AttributePSVImpl implements AttributePSVI {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -47,6 +46,7 @@
  * @xerces.internal
  *
  * @author Elena Litani IBM
+ * @LastModified: Nov 2017
  */
 public class ElementPSVImpl implements ElementPSVI {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/PSVIErrorList.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/PSVIErrorList.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
  *
  * @author Michael Glavassevich, IBM
  *
+ * @LastModified: Oct 2017
  */
 final class PSVIErrorList extends AbstractList<String> implements StringList {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -78,6 +77,7 @@
  * @author Sandy Gao, IBM
  * @author Elena Litani, IBM
  *
+ * @LastModified: Oct 2017
  */
 
 public class SchemaGrammar implements XSGrammar, XSNamespaceItem {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
  *
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class SubstitutionGroupHandler {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -102,6 +101,7 @@
  * @xerces.internal
  *
  * @author Neil Graham, IBM
+ * @LastModified: Sep 2017
  */
 
 public class XMLSchemaLoader implements XMLGrammarLoader, XMLComponent, XSElementDeclHelper,
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -112,6 +111,7 @@
  * @author Elena Litani IBM
  * @author Andy Clark IBM
  * @author Neeraj Bajaj, Sun Microsystems, inc.
+ * @LastModified: Nov 2017
  */
 public class XMLSchemaValidator
     implements XMLComponent, XMLDocumentFilter, FieldActivator, RevalidationHandler, XSElementDeclHelper {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
  *
  * @author Elena Litani, IBM
  * @author Sandy Gao, IBM
+ * @LastModified: Nov 2017
  */
 public class XSComplexTypeDecl implements XSComplexTypeDefinition, TypeInfo {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
  *
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class XSConstraints {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
  * @xerces.internal
  *
  * @author Sandy Gao, IBM
+ * @LastModified: Nov 2017
  */
 public class XSGrammarBucket {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
  * @xerces.internal
  *
  * @author Elena Litani, IBM
+ * @LastModified: Sep 2017
  */
 public class XSMessageFormatter implements MessageFormatter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,6 +57,7 @@
  *
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Oct 2017
  */
 @SuppressWarnings("unchecked") // method <T>toArray(T[])
 public final class XSModelImpl extends AbstractList<XSNamespaceItem> implements XSModel, XSNamespaceItemList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
  * @author Elena Litani, IBM
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class CMBuilder {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
  * @xerces.internal
  *
  * @author Pavani Mukthipudi, Sun Microsystems Inc.
+ * @LastModified: Oct 2017
  */
 public class XSAllCM implements XSCMValidator {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
  *
  * @author Sandy Gao, IBM
  * @author Elena Litani, IBM
+ * @LastModified: Oct 2017
  */
 public interface XSCMValidator {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
  * @xerces.internal
  *
  * @author Neil Graham, IBM
+ * @LastModified: Oct 2017
  */
 public class XSDFACM
     implements XSCMValidator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
  *
  * @author Elena Litani, Lisa Martin
  * @author IBM
+ * @LastModified: Oct 2017
  */
 public class XSEmptyCM  implements XSCMValidator {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,7 @@
  * @author Rahul Srivastava, Sun Microsystems Inc.
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Oct 2017
  */
 public class SchemaDOM extends DefaultDocument {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -59,6 +58,7 @@
  *
  * @author Rahul Srivastava, Sun Microsystems Inc.
  *
+ * @LastModified: Sep 2017
  */
 public class SchemaParsingConfig extends BasicParserConfiguration
     implements XMLPullParserConfiguration {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,6 +52,7 @@
  *
  * @xerces.internal
  *
+ * @LastModified: Oct 2017
  */
 final class StAXSchemaParser {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -68,6 +67,7 @@
  * @xerces.internal
  *
  * @author Sandy Gao, IBM
+ * @LastModified: Nov 2017
  */
 
 public class XSAttributeChecker {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -60,6 +59,7 @@
  * @author Rahul Srivastava, Sun Microsystems Inc.
  * @author Neeraj Bajaj, Sun Microsystems Inc.
  *
+ * @LastModified: Oct 2017
  */
 abstract class XSDAbstractTraverser {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -70,6 +69,7 @@
  *
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Oct 2017
  */
 class XSDElementTraverser extends XSDAbstractTraverser {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -131,6 +130,7 @@
  * @author Neil Graham, IBM
  * @author Pavani Mukthipudi, Sun Microsystems
  *
+ * @LastModified: Nov 2017
  */
 @SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
 public class XSDHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -77,6 +76,7 @@
  * @author Neeraj Bajaj, Sun Microsystems, Inc.
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Nov 2017
  */
 class XSDSimpleTypeTraverser extends XSDAbstractTraverser {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  * @xerces.internal
  *
  * @author Neil Graham, IBM
+ * @LastModified: Nov 2017
  */
 class XSDUniqueOrKeyTraverser extends XSDAbstractIDConstraintTraverser {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -44,6 +43,7 @@
  * @xerces.internal
  *
  * @author Neil Graham, IBM
+ * @LastModified: Oct 2017
  */
 class XSDocumentInfo {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
  *
  * @author Michael Glavassevich, IBM
  *
+ * @LastModified: Oct 2017
  */
 @SuppressWarnings("unchecked") // method <T>toArray(T[])
 public final class LSInputListImpl extends AbstractList<LSInput> implements LSInputList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
  *
  * @xerces.internal
  *
+ * @LastModified: Oct 2017
  */
 @SuppressWarnings("unchecked") // method <T>toArray(T[])
 public final class ObjectListImpl extends AbstractList<Object> implements ObjectList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
  *
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Oct 2017
  */
 public final class ShortListImpl extends AbstractList<Short> implements ShortList {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
  *
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Oct 2017
  */
 @SuppressWarnings("unchecked") // method <T>toArray(T[])
 public final class StringListImpl extends AbstractList<String> implements StringList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
  *
  * @xerces.internal
  *
+ * @LastModified: Nov 2017
  */
 public class XSGrammarPool extends XMLGrammarPoolImpl {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
  *
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Oct 2017
  */
 public class XSNamedMapImpl extends AbstractMap<QName, XSObject> implements XSNamedMap {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Sandy Gao, IBM
  *
+ * @LastModified: Oct 2017
  */
 @SuppressWarnings("unchecked") // method <T>toArray(T[])
 public class XSObjectListImpl extends AbstractList<XSObject> implements XSObjectList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java	Fri Dec 22 01:28:29 2017 +0000
@@ -82,7 +82,7 @@
  * only those events that need to go through Validator will go the 1st route,
  * and other events go the 2nd direct route.
  *
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
  */
 final class JAXPValidatorComponent
     extends TeeXMLDocumentFilterImpl implements XMLComponent {
@@ -344,7 +344,7 @@
      * to reuse its default {@link com.sun.org.apache.xerces.internal.xni.XMLDocumentHandler}
      * implementation.
      *
-     * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+     * @author Kohsuke Kawaguchi
      */
     private final class XNI2SAX extends DefaultXMLDocumentHandler {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,6 +61,7 @@
  * @author Rajiv Mordani
  * @author Edwin Goei
  *
+ * @LastModified: Oct 2017
  */
 @SuppressWarnings("deprecation")
 public class SAXParserImpl extends javax.xml.parsers.SAXParser
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -36,7 +36,7 @@
 /**
  * <p>XMLDocumentHandler which forks the pipeline to two other components.</p>
  *
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
  */
 class TeeXMLDocumentFilterImpl implements XMLDocumentFilter {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
  * Events are forwarded to the registered XMLDTDHandler without modification.</p>
  *
  * @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
  */
 final class UnparsedEntityHandler implements XMLDTDFilter, EntityState {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -57,8 +57,8 @@
  *    </li>
  * </ol>
  *
- * @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Joseph Fialli
+ * @author Jeff Suttor
  */
 public class DatatypeFactoryImpl
         extends DatatypeFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -41,9 +41,7 @@
  * </p>
  *
  *
- * @author <a href="mailto:Vikram.Aroskar@Sun.COM">Vikram Aroskar</a>
- * @author <a href="mailto:Huizhe.wang@oracle.com">Joe Wang</a>
-
+ * @author Vikram Aroskar
  * @see XMLGregorianCalendar#add(Duration)
  */
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -95,9 +95,8 @@
  * The impacted methods document their dependency on {@link Calendar}.
  *
  *
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a>
-
+ * @author Kohsuke Kawaguchi
+ * @author Joseph Fialli
  * @see XMLGregorianCalendar#add(Duration)
  */
 class DurationImpl
@@ -1863,7 +1862,7 @@
     /**
      * Representation of {@link Duration} in the object stream.
      *
-     * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+     * @author Kohsuke Kawaguchi
      */
     private static class DurationStream implements Serializable {
         private final String lexical;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -40,9 +40,7 @@
  * </p>
  *
  *
- * @author <a href="mailto:Vikram.Aroskar@Sun.COM">Vikram Aroskar</a>
- * @author <a href="mailto:Huizhe.wang@oracle.com">Joe Wang</a>
-
+ * @author Vikram Aroskar
  * @see XMLGregorianCalendar#add(Duration)
  */
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -185,9 +185,9 @@
  * </ul>
  * </p>
  *
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a>
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Kohsuke Kawaguchi
+ * @author Joseph Fialli
+ * @author Sunitha Reddy
  * @see javax.xml.datatype.Duration
  * @since 1.5
  */
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
  * <p>Abstract implementation of Schema for W3C XML Schemas.</p>
  *
  * @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
  */
 abstract class AbstractXMLSchema extends Schema implements
         XSGrammarPoolContainer {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,6 +65,7 @@
  * <p>DOM result builder.</p>
  *
  * @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
  */
 final class DOMResultBuilder implements DOMDocumentHandler {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,6 +61,7 @@
  * <p>A validator helper for <code>DOMSource</code>s.</p>
  *
  * @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
  */
 final class DOMValidatorHelper implements ValidatorHelper, EntityState {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java	Fri Dec 22 01:28:29 2017 +0000
@@ -28,7 +28,7 @@
 /**
  * {@link ErrorHandler} that throws all errors and fatal errors.
  *
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
  */
 final class DraconianErrorHandler implements ErrorHandler {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java	Fri Dec 22 01:28:29 2017 +0000
@@ -31,7 +31,7 @@
  * and pass them down to SAX {@link ErrorHandler}.
  *
  * @author
- *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *     Kohsuke Kawaguchi
  */
 public abstract class ErrorHandlerAdaptor implements XMLErrorHandler
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
  * <p>Used to format JAXP Validation API error messages using a specified locale.</p>
  *
  * @author Michael Glavassevich, IBM
+ * @LastModified: Sep 2017
  */
 final class JAXPValidationMessageFormatter {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java	Fri Dec 22 01:28:29 2017 +0000
@@ -29,7 +29,7 @@
  * <p>Filter {@link XMLGrammarPool} that exposes a
  * read-only view of the underlying pool.</p>
  *
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
  */
 final class ReadOnlyGrammarPool implements XMLGrammarPool {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
  * contains schema components from one target namespace.</p>
  *
  * @author Michael Glavassevich, IBM
+ * @LastModified: Nov 2017
  */
 final class SimpleXMLSchema extends AbstractXMLSchema implements XMLGrammarPool {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
  * the target namespace for the schema and schema location.</p>
  *
  * @author Michael Glavassevich, IBM
+ * @LastModified: Nov 2017
  */
 final class SoftReferenceGrammarPool implements XMLGrammarPool {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java	Fri Dec 22 01:28:29 2017 +0000
@@ -47,7 +47,7 @@
 /**
  * <p>A validator helper for <code>StAXSource</code>s.</p>
  *
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Sunitha Reddy
  */
 public final class StAXValidatorHelper implements ValidatorHelper {
     private static final String DEFAULT_TRANSFORMER_IMPL = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl";
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java	Fri Dec 22 01:28:29 2017 +0000
@@ -50,7 +50,7 @@
  * A validator helper for <code>StreamSource</code>s.</p>
  *
  * @author Michael Glavassevich, IBM
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Sunitha Reddy
  */
 final class StreamValidatorHelper implements ValidatorHelper {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java	Fri Dec 22 01:28:29 2017 +0000
@@ -32,7 +32,7 @@
 /**
  * <p>Static utility methods for the Validation API implementation.</p>
  *
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
  */
 final class Util {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -92,9 +91,10 @@
  * <p>Implementation of ValidatorHandler for W3C XML Schemas and
  * also a validator helper for <code>SAXSource</code>s.</p>
  *
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
  * @author Michael Glavassevich, IBM
  *
+ * @LastModified: Oct 2017
  */
 final class ValidatorHandlerImpl extends ValidatorHandler implements
     DTDHandler, EntityState, PSVIProvider, ValidatorHelper, XMLDocumentHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -46,9 +46,9 @@
 /**
  * <p>Implementation of Validator for W3C XML Schemas.</p>
  *
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
  * @author Michael Glavassevich, IBM
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Sunitha Reddy
  */
 final class ValidatorImpl extends Validator implements PSVIProvider {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
  * its memory.</p>
  *
  * @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
  */
 final class WeakReferenceXMLSchema extends AbstractXMLSchema {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,7 +36,9 @@
  * kind of SAXException tunneling.
  *
  * @author
- *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *     Kohsuke Kawaguchi
+ *
+ * @LastModified: Oct 2017
  */
 public class WrappedSAXException extends RuntimeException {
     private static final long serialVersionUID = -3201986204982729962L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -64,7 +64,7 @@
 /**
  * {@link SchemaFactory} for XML Schema.
  *
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
  */
 public final class XMLSchemaFactory extends SchemaFactory {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -85,6 +84,7 @@
  * @author Andy Clark, IBM
  * @author Elena Litani, IBM
  *
+ * @LastModified: Nov 2017
  */
 public class AbstractDOMParser extends AbstractXMLDocumentParser {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -95,6 +94,7 @@
  * @author Arnaud  Le Hors, IBM
  * @author Andy Clark, IBM
  *
+ * @LastModified: Oct 2017
  */
 public abstract class BasicParserConfiguration
     extends ParserConfigurationSettings
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -79,6 +78,7 @@
  * @author Pavani Mukthipudi, Sun Microsystems Inc.
  * @author Elena Litani, IBM
  * @author Rahul Srivastava, Sun Microsystems Inc.
+ * @LastModified: Oct 2017
  */
 
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -78,6 +77,7 @@
  * @author Neil Graham, IBM
  * @author Michael Glavassevich, IBM
  *
+ * @LastModified: Oct 2017
  */
 public class XML11Configuration extends ParserConfigurationSettings
     implements XMLPullParserConfiguration, XML11Configurable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -104,6 +103,7 @@
  * @author Michael Glavassevich, IBM
  * @author John Kim, IBM
  *
+ * @LastModified: Oct 2017
  */
 public class XML11DTDConfiguration extends ParserConfigurationSettings
     implements XMLPullParserConfiguration, XML11Configurable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -77,6 +76,7 @@
  * @author John Kim, IBM
  * @author Michael Glavassevich, IBM
  *
+ * @LastModified: Oct 2017
  */
 public class XML11NonValidatingConfiguration extends ParserConfigurationSettings
     implements XMLPullParserConfiguration, XML11Configurable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -50,6 +49,7 @@
  *
  * @author Neil Graham, IBM
  *
+ * @LastModified: Oct 2017
  */
 public class XMLGrammarPreparser {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  * <p>
  *
  * @author Elena Litani, IBM
+ * @LastModified: Oct 2017
  */
 public class AugmentationsImpl implements Augmentations{
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
  * @author Gopal Sharma, SUN MicroSystems Inc.
  * @author Elena Litani, IBM
  * @author Ramesh Mandava, Sun Microsystems
+ * @LastModified: Nov 2017
  */
 public class DOMEntityResolverWrapper
     implements XMLEntityResolver {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
  * <p>Used to format JAXP 1.3 Datatype API error messages using a specified locale.</p>
  *
  * @author  Neeraj Bajaj, Sun Microsystems
+ * @LastModified: Sep 2017
  */
 public class DatatypeMessageFormatter {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java	Fri Dec 22 01:28:29 2017 +0000
@@ -29,7 +29,7 @@
  * {@link ErrorHandler} that throws all errors and fatal errors.
  *
  * @author
- *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *     Kohsuke Kawaguchi
  */
 public class DraconianErrorHandler implements ErrorHandler {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java	Fri Dec 22 01:28:29 2017 +0000
@@ -40,7 +40,7 @@
  * rather than copying it into every component that needs an error handler
  * and update all of them whenever it is changed, IMO.
  *
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
  *
  */
 public abstract class ErrorHandlerProxy implements ErrorHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
  *
  * @author Michael Glavassevich, IBM
  *
+ * @LastModified: Oct 2017
  */
 public final class JAXPNamespaceContextWrapper implements NamespaceContext {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java	Fri Dec 22 01:28:29 2017 +0000
@@ -28,7 +28,7 @@
  * Wraps SAX {@link Locator} into Xerces {@link XMLLocator}.
  *
  * @author
- *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *     Kohsuke Kawaguchi
  */
 public class LocatorWrapper implements XMLLocator {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java	Fri Dec 22 01:28:29 2017 +0000
@@ -39,8 +39,8 @@
  * can be exposed to the application, we must intern all Strings before
  * calling NamespaceSupport methods.
  *
- * @author  Neeraj Bajaj, Sun Microsystems, inc.
- * @author Santiago.PericasGeertsen@sun.com
+ * @author  Neeraj Bajaj
+ * @author Santiago PericasGeertsen
  *
  */
 public class NamespaceContextWrapper implements NamespaceContext {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  *
  * @author Andy Clark, IBM
  *
+ * @LastModified: Oct 2017
  */
 public class NamespaceSupport implements NamespaceContext {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java	Fri Dec 22 01:28:29 2017 +0000
@@ -39,7 +39,7 @@
  * and produces the equivalent {@link XMLDocumentHandler} events.
  *
  * @author
- *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *     Kohsuke Kawaguchi
  */
 public class SAX2XNI implements ContentHandler, XMLDocumentSource {
     public SAX2XNI( XMLDocumentHandler core ) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
  *
  * @author Michael Glavassevich, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class SAXMessageFormatter {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
  * The hash code uses the same algorithm as SymbolTable class.
  *
  * @author Elena Litani
+ * @LastModified: Nov 2017
  */
 public class SymbolHash {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -37,7 +37,7 @@
  *
  *
  * @author
- *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *     Kohsuke Kawaguchi
  */
 public class TeeXMLDocumentFilterImpl implements XMLDocumentFilter {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -42,7 +42,7 @@
  * {@link XMLDocumentFilter}s.
  *
  * @author
- *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *     Kohsuke Kawaguchi
  */
 public class XMLDocumentFilterImpl implements XMLDocumentFilter {
     private XMLDocumentHandler next;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java	Fri Dec 22 01:28:29 2017 +0000
@@ -41,7 +41,7 @@
  * get rid of this awkward adaptor class.
  *
  * @author
- *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *     Kohsuke Kawaguchi
  */
 public final class XMLInputSourceAdaptor implements Source {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,6 +22,8 @@
 
 /**
  * A configuration error. This was an internal class in ObjectFactory previously
+ *
+ * @LastModified: Oct 2017
  */
 public final class ConfigurationError extends Error {
     private static final long serialVersionUID = 8095902236393167968L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  * when bundled as part of the JDK.
  * <p>
  *
+ * @LastModified: Oct 2017
  */
 public final class ObjectFactory {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
  *
  * @author Peter McCracken, IBM
  *
+ * @LastModified: Oct 2017
  */
 public class MultipleScopeNamespaceSupport extends NamespaceSupport {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -128,6 +127,7 @@
  *
  *
  * @see XIncludeNamespaceSupport
+ * @LastModified: Nov 2017
  */
 public class XIncludeHandler
     implements XMLComponent, XMLDocumentFilter, XMLDTDFilter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
  *
  * @author Peter McCracken, IBM
  *
+ * @LastModified: Sep 2017
  */
 public class XIncludeMessageFormatter implements MessageFormatter {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
  *
  *
  * @see XIncludeHandler
+ * @LastModified: Oct 2017
  */
 public class XIncludeTextReader {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
  * should not save any reference to the structure.
  *
  * @author Elena Litani, IBM
+ * @LastModified: Oct 2017
  */
 
 public interface Augmentations {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
  *
  * @author Andy Clark, IBM
  *
+ * @LastModified: Oct 2017
  */
 public interface NamespaceContext {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
  *
  * @xerces.internal
  *
+ * @LastModified: Sep 2017
  */
 final class XPointerMessageFormatter implements MessageFormatter {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,8 @@
  *  The <code>LSInputList</code> interface provides the abstraction of an
  * ordered collection of <code>LSInput</code>s, without defining or
  * constraining how this collection is implemented.
+ *
+ * @LastModified: Oct 2017
  */
 public interface LSInputList extends List<LSInput> {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +25,8 @@
 /**
  *  The <code>ShortList</code> is an immutable ordered collection of
  * <code>unsigned short</code>.
+ *
+ * @LastModified: Oct 2017
  */
 public interface ShortList extends List<Short> {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +25,8 @@
 /**
  *  The <code>StringList</code> is an immutable ordered collection of
  * <code>GenericString</code>.
+ *
+ * @LastModified: Oct 2017
  */
 public interface StringList extends List<String> {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,8 @@
  * accessed by name. Note that <code>XSNamedMap</code> does not inherit from
  * <code>XSObjectList</code>. The <code>XSObject</code>s in
  * <code>XSNamedMap</code>s are not maintained in any particular order.
+ *
+ * @LastModified: Oct 2017
  */
 public interface XSNamedMap extends Map<QName, XSObject> {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,8 @@
  *  The <code>XSNamesaceItemList</code> interface provides the abstraction of
  * an immutable ordered collection of <code>XSNamespaceItem</code>s, without
  * defining or constraining how this collection is implemented.
+ *
+ * @LastModified: Oct 2017
  */
 public interface XSNamespaceItemList extends List<XSNamespaceItem> {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,8 @@
  *  The <code>XSObjectList</code> interface provides the abstraction of an
  * immutable ordered collection of <code>XSObject</code>s, without defining
  * or constraining how this collection is implemented.
+ *
+ * @LastModified: Oct 2017
  */
 public interface XSObjectList extends List<XSObject> {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
  *
  * @author Ankit Pasricha, IBM
  *
+ * @LastModified: Oct 2017
  */
 public interface ByteList extends List<Byte> {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
  *
  * @author Ankit Pasricha, IBM
  *
+ * @LastModified: Oct 2017
  */
 public interface ObjectList extends List<Object> {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
  * <p>
  * Status: In progress, under discussion.
  *
+ * @LastModified: Oct 2017
  */
 public class CustomStringPool extends DTMStringPool {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,8 @@
  * The <code>DTMDefaultBase</code> class serves as a helper base for DTMs.
  * It sets up structures for navigation and type, while leaving data
  * management and construction to the derived classes.
+ *
+ * @LastModified: Oct 2017
  */
 public abstract class DTMDefaultBase implements DTM
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -60,6 +59,8 @@
  *
  * <p>Origin: the implemention is a composite logic based on the DTM of XalanJ1 and
  *     DocImpl, DocumentImpl, ElementImpl, TextImpl, etc. of XalanJ2</p>
+ *
+ * @LastModified: Oct 2017
  */
 public class DTMDocumentImpl
 implements DTM, org.xml.sax.ContentHandler, org.xml.sax.ext.LexicalHandler
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -71,7 +70,9 @@
  * activity (eg, when getDTM() is invoked). The downside of that solution
  * would be a greater delay before the DTM's storage is actually released
  * for reuse.
- * */
+ *
+ * @LastModified: Nov 2017
+ */
 public class DTMManagerDefault extends DTMManager
 {
   //static final boolean JKESS_XNI_EXPERIMENT=true;
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,7 +52,9 @@
  * </ul>
  *
  * <p>State: In progress!!</p>
- * */
+ *
+ * @LastModified: Nov 2017
+ */
 public class DTMNodeList extends DTMNodeListBase {
     private DTMIterator m_iter;
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -61,6 +60,7 @@
  * DTMNodeProxy may be subclassed further to present specific DOM node types.
  *
  * @see org.w3c.dom
+ * @LastModified: Nov 2017
  */
 public class DTMNodeProxy
   implements Node, Document, Text, Element, Attr,
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,7 +52,9 @@
  * ObjectPool if one was needed.</p>
  *
  * <p>Status: Passed basic test in main().</p>
- * */
+ *
+ * @LastModified: Oct 2017
+ */
 public class DTMStringPool
 {
   List<String> m_intToString;
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,7 +39,9 @@
  * <p>Usage example: See main().</p>
  *
  * <p>Status: Passes simple main() unit-test. NEEDS JAVADOC.</p>
- * */
+ *
+ * @LastModified: Oct 2017
+ */
 public class IncrementalSAXSource_Xerces
   implements IncrementalSAXSource
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,7 +61,9 @@
  * Note too that we do not currently attempt to track document
  * mutation. If you alter the DOM after wrapping DOM2DTM around it,
  * all bets are off.
- * */
+ *
+ * @LastModified: Oct 2017
+ */
 public class DOM2DTM extends DTMDefaultBaseIterators
 {
   static final boolean JJK_DEBUG=false;
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,8 @@
 /**
  * This class implements a DTM that tends to be optimized more for speed than
  * for compactness, that is constructed via SAX2 ContentHandler events.
+ *
+ * @LastModified: Oct 2017
  */
 public class SAX2DTM extends DTMDefaultBaseIterators
         implements EntityResolver, DTDHandler, ContentHandler, ErrorHandler,
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,6 +61,8 @@
  * <p>
  * %MK% The code in this class is critical to the XSLTC_DTM performance. Be very careful
  * when making changes here!
+ *
+ * @LastModified: Oct 2017
  */
 public class SAX2DTM2 extends SAX2DTM
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,7 +57,9 @@
  * %REVIEW% In fact, since the differences are so minor, I think it
  * may be possible/practical to fold them back into the base
  * SAX2DTM. Consider that as a future code-size optimization.
- * */
+ *
+ * @LastModified: Oct 2017
+ */
 public class SAX2RTFDTM extends SAX2DTM
 {
   /** Set true to monitor SAX events and similar diagnostic info. */
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
 /**
  * A utility class for issuing XML error messages.
  * @xsl.usage internal
+ * @LastModified: Sep 2017
  */
 public class XMLMessages
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -119,9 +118,9 @@
  *
  *
  * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
- * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a>
+ * @author Rahul Srivastava
  * @author Elena Litani, IBM
- * @author Sunitha Reddy, Sun Microsystems
+ * @author Sunitha Reddy
  * @see Serializer
  * @see org.w3c.dom.ls.LSSerializer
  *
@@ -129,6 +128,8 @@
  * is replaced by that of Xalan. Main class
  * {@link com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl} is replaced
  * by {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}.
+ *
+ * @LastModified: Nov 2017
  */
 @Deprecated
 public abstract class BaseMarkupSerializer
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -75,6 +74,8 @@
  *
  * @deprecated As of JDK 9, Xerces 2.9.0, replaced by
  * {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}
+ *
+ * @LastModified: Oct 2017
  */
 @Deprecated
 public class DOMSerializerImpl implements LSSerializer, DOMConfiguration {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@
  * is replaced by that of Xalan. Main class
  * {@link com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl} is replaced
  * by {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}.
+ *
+ * @LastModified: Oct 2017
  */
 @Deprecated
 class Encodings
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@
  * is replaced by that of Xalan. Main class
  * {@link com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl} is replaced
  * by {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}.
+ *
+ * @LastModified: Oct 2017
  */
 @Deprecated
 public abstract class SerializerFactory
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java	Fri Dec 22 01:28:29 2017 +0000
@@ -74,7 +74,7 @@
  * spaces at beginning of line will be stripped.
  *
  * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
- * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a>
+ * @author Rahul Srivastava
  * @author Elena Litani IBM
  * @see Serializer
  *
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -84,7 +83,7 @@
  * spaces at beginning of line will be stripped.
  *
  * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
- * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a>
+ * @author Rahul Srivastava
  * @author Elena Litani IBM
  * @see Serializer
  *
@@ -92,6 +91,8 @@
  * is replaced by that of Xalan. Main class
  * {@link com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl} is replaced
  * by {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}.
+ *
+ * @LastModified: Oct 2017
  */
 @Deprecated
 public class XMLSerializer
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
  * DEVELOPERS: See Known Issue in the constructor.
  *
  * @xsl.usage internal
+ * @LastModified: Oct 2017
  */
 final class CharInfo
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
  * across package boundaries.
  *
  * @xsl.usage internal
+ * @LastModified: Oct 2017
  */
 public class EmptySerializer implements SerializationHandler
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -49,6 +48,7 @@
  * for each encoding.
  *
  * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
+ * @LastModified: Oct 2017
  */
 
 public final class Encodings extends Object
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -61,6 +60,7 @@
  * This class is public only because it is used by Xalan. It is not a public API
  *
  * @xsl.usage internal
+ * @LastModified: Nov 2017
  */
 public class NamespaceMappings
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -80,6 +79,7 @@
  * @see SerializerFactory
  * @see Method
  * @see Serializer
+ * @LastModified: Oct 2017
  */
 public final class OutputPropertiesFactory
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -56,6 +55,7 @@
    * @see OutputPropertiesFactory
    * @see Method
    * @see Serializer
+ * @LastModified: Oct 2017
    */
 public final class SerializerFactory
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  * This class is not a public API.
  *
  * @xsl.usage internal
+ * @LastModified: Oct 2017
  */
 public abstract class ToSAXHandler extends SerializerBase {
     public ToSAXHandler() { }
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,6 +52,7 @@
  * serializers (xml, html, text ...) that write output to a stream.
  *
  * @xsl.usage internal
+ * @LastModified: Nov 2017
  */
 abstract public class ToStream extends SerializerBase {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -49,6 +48,7 @@
  *
  * This class is not a public API, it is public because it is used within Xalan.
  * @xsl.usage internal
+ * @LastModified: Oct 2017
  */
 public final class ToUnknownStream extends SerializerBase
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -51,6 +50,7 @@
  * This interface is only used internally within Xalan.
  *
  * @xsl.usage internal
+ * @LastModified: Oct 2017
  */
 interface XSLOutputAttributes {
     /**
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
  * parameters and filters if any during serialization.
  *
  * @xsl.usage internal
+ * @LastModified: Oct 2017
  */
 final class DOM3TreeWalker {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -31,6 +30,7 @@
  * This class implemets the DOM Level 3 Core interface DOMStringList.
  *
  * @xsl.usage internal
+ * @LastModified: Oct 2017
  */
 final class DOMStringListImpl implements DOMStringList {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -36,6 +35,7 @@
  * @author Andy Clark, IBM
  *
  * @version $Id: Exp $
+ * @LastModified: Oct 2017
  */
 public class NamespaceSupport {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -90,6 +89,7 @@
  * used in com.sun.org.apache.xml.internal.serializer.
  *
  *  @xsl.usage internal
+ * @LastModified: Sep 2017
  */
 public final class Messages
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,6 +61,7 @@
  * the class is no longer "public".
  *
  * @xsl.usage internal
+ * @LastModified: Oct 2017
  */
 final class URI
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
  * that SAX doesn't handle yet) and adds the result to a document
  * or document fragment.
  * @xsl.usage general
+ * @LastModified: Oct 2017
  */
 public class DOMBuilder
         implements ContentHandler, LexicalHandler
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
 /**
  * Pool of object of a given type to pick from to help memory usage
  * @xsl.usage internal
+ * @LastModified: Oct 2017
  */
 public class ObjectPool implements java.io.Serializable
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
  * is used as the name of the object. The default namespace is not used for
  * unprefixed names."
  * @xsl.usage general
+ * @LastModified: Oct 2017
  */
 public class QName implements java.io.Serializable
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
 /**
 * International friendly string comparison with case-order
  * @author Igor Hersht, igorh@ca.ibm.com
+ * @LastModified: Oct 2017
 */
 public class StringComparable implements Comparable<StringComparable>  {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,8 @@
  * Search for the xml-stylesheet processing instructions in an XML document.
  * @see <a href="http://www.w3.org/TR/xml-stylesheet/">
  * Associating Style Sheets with XML documents, Version 1.0</a>
+ *
+ * @LastModified: Oct 2017
  */
 public class StylesheetPIHandler extends DefaultHandler
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,6 +57,7 @@
  * grammar and basic set of operations that can be applied to a URI.
  *
  *
+ * @LastModified: Oct 2017
  */
 public class URI implements Serializable
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@
 /**
  * Creates XMLReader objects and caches them for re-use.
  * This class follows the singleton pattern.
+ *
+ * @LastModified: Sep 2017
  */
 @SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
 public class XMLReaderManager {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@
  * construction has completed.  An exception to the immutibility rule is iterators
  * and walkers, which must be cloned in order to be used -- the original must
  * still be immutable.
+ *
+ * @LastModified: Oct 2017
  */
 public abstract class Expression implements java.io.Serializable, ExpressionNode, XPathVisitable
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
  * Interface that XPath objects can call to obtain access to an
  * ExtensionsTable.
  *
+ * @LastModified: Oct 2017
  */
 public interface ExtensionsProvider
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -56,6 +55,7 @@
  * to the same calls; the disadvantage is that some of them may return
  * less-than-enlightening results when you do so.</p>
  * @xsl.usage advanced
+ * @LastModified: Nov 2017
  */
 public class NodeSet
         implements NodeList, NodeIterator, Cloneable, ContextNodeList
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,8 @@
  * This class bottlenecks all management of source trees.  The methods
  * in this class should allow easy garbage collection of source
  * trees (not yet!), and should centralize parsing for those source trees.
+ *
+ * @LastModified: Oct 2017
  */
 @SuppressWarnings("deprecation")
 public class SourceTreeManager
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
  * <p>This has been changed from the previous incarnations of this
  * class to be fairly low level.</p>
  * @xsl.usage internal
+ * @LastModified: Nov 2017
  */
 public class VariableStack implements Cloneable
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,7 @@
  * The XPath class wraps an expression object and provides general services
  * for execution of that expression.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class XPath implements Serializable, ExpressionOwner
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -57,6 +56,7 @@
  *
  * <p>This class extends DTMManager but does not directly implement it.</p>
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class XPathContext extends DTMManager // implements ExpressionContext
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
  * all the traces of the nested exceptions, not just the trace
  * of this object.
  * @xsl.usage general
+ * @LastModified: Oct 2017
  */
 public class XPathException extends TransformerException
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,8 @@
 /**
  * Serves as common interface for axes Walkers, and stores common
  * state variables.
+ *
+ * @LastModified: Oct 2017
  */
 public class AxesWalker extends PredicatedNodeTest
         implements Cloneable, PathComponent, ExpressionOwner
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,9 @@
 import com.sun.org.apache.xpath.internal.objects.XNodeSet;
 import java.util.List;
 
+/**
+ * @LastModified: Oct 2017
+ */
 public class FilterExprIterator extends BasicTestIterator
 {
     static final long serialVersionUID = 2552176105165737614L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,8 @@
 /**
  * Class to use for one-step iteration that doesn't have a predicate, and
  * doesn't need to set the context.
+ *
+ * @LastModified: Oct 2017
  */
 public class FilterExprIteratorSimple extends LocPathIterator
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
  * Walker for the OP_VARIABLE, or OP_EXTFUNCTION, or OP_FUNCTION, or OP_GROUP,
  * op codes.
  * @see <a href="http://www.w3.org/TR/xpath#NT-FilterExpr">XPath FilterExpr descriptions</a>
+ * @LastModified: Oct 2017
  */
 public class FilterExprWalker extends AxesWalker
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
 /**
  * Pool of object of a given type to pick from to help memory usage
  * @xsl.usage internal
+ * @LastModified: Oct 2017
  */
 public final class IteratorPool implements java.io.Serializable
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
  * the case where the LocPathIterator is "owned" by a UnionPathIterator,
  * in which case the UnionPathIterator will cache the nodes.</p>
  * @xsl.usage advanced
+ * @LastModified: Nov 2017
  */
 public abstract class LocPathIterator extends PredicatedNodeTest
         implements Cloneable, DTMIterator, java.io.Serializable, PathComponent
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,8 @@
  * traversal against the LocationPath interpreted as a match pattern.  This
  * class is useful to find nodes in document order that are complex paths
  * whose steps probably criss-cross each other.
+ *
+ * @LastModified: Oct 2017
  */
 public class MatchPatternIterator extends LocPathIterator
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,8 @@
 /**
  * This class is the dynamic wrapper for a Xalan DTMIterator instance, and
  * provides random access capabilities.
+ *
+ * @LastModified: Oct 2017
  */
 public class NodeSequence extends XObject
   implements DTMIterator, Cloneable, PathComponent
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,9 @@
 import com.sun.org.apache.xpath.internal.patterns.NodeTest;
 import java.util.List;
 
+/**
+ * @LastModified: Oct 2017
+ */
 public abstract class PredicatedNodeTest extends NodeTest implements SubContextList
 {
     static final long serialVersionUID = -6193530757296377351L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,8 @@
  * This class defines a simplified type of union iterator that only
  * tests along the child axes.  If the conditions are right, it is
  * much faster than using a UnionPathIterator.
+ *
+ * @LastModified: Oct 2017
  */
 public class UnionChildIterator extends ChildTestIterator
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
  * As each node is iterated via nextNode(), the node is also stored
  * in the NodeVector, so that previousNode() can easily be done.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class UnionPathIterator extends LocPathIterator
         implements Cloneable, DTMIterator, java.io.Serializable, PathComponent
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,8 @@
  * This class is both a factory for XPath location path expressions,
  * which are built from the opcode map output, and an analysis engine
  * for the location path expressions in order to provide optimization hints.
+ *
+ * @LastModified: Oct 2017
  */
 public class WalkerFactory
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,8 @@
 
 /**
  * Location path iterator that uses Walkers.
+ *
+ * @LastModified: Oct 2017
  */
 
 public class WalkingIterator extends LocPathIterator implements ExpressionOwner
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
 /**
  * This class iterates over set of nodes that needs to be sorted.
  * @xsl.usage internal
+ * @LastModified: Oct 2017
  */
 public class WalkingIteratorSorted extends WalkingIterator
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -31,6 +30,8 @@
 
 /**
  * The function table for XPath.
+ *
+ * @LastModified: Oct 2017
  */
 public class FunctionTable
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,8 @@
 /**
  * This class is in charge of lexical processing of the XPath
  * expression into tokens.
+ *
+ * @LastModified: Nov 2017
  */
 class Lexer
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,8 @@
 /**
  * This class represents the data structure basics of the XPath
  * object.
+ *
+ * @LastModified: Nov 2017
  */
 public class OpMap
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
 /**
  * Execute the current() function.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class FuncCurrent extends Function
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,7 @@
  * the expression executes, it calls ExtensionsTable#extFunction, and then
  * converts the result to the appropriate XObject.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class FuncExtFunction extends Function
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
 /**
  * Execute the False() function.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class FuncFalse extends Function
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncHere.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncHere.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -36,6 +35,8 @@
 
 /**
  * Execute the XML Signature here() function.
+ *
+ * @LastModified: Oct 2017
  */
 public final class FuncHere extends Function {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
 /**
  * Execute the Last() function.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class FuncLast extends Function
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
 /**
  * Execute the Position() function.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class FuncPosition extends Function
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
 /**
  * Execute the SystemProperty() function.
  * @xsl.usage advanced
+ * @LastModified: Sep 2017
  */
 public class FuncSystemProperty extends FunctionOneArg
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
 /**
  * Execute the True() function.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class FuncTrue extends Function
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
 /**
  * Base class for functions that accept two arguments.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class Function2Args extends FunctionOneArg
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
 /**
  * Base class for functions that accept three arguments.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class Function3Args extends Function2Args
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
  * Base class for functions that accept an undetermined number of multiple
  * arguments.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class FunctionMultiArgs extends Function3Args
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
 /**
  * Base class for functions that accept one argument.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class FunctionOneArg extends Function implements ExpressionOwner
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,7 +36,8 @@
 
 /**
  *
- * @author Ramesh Mandava ( ramesh.mandava@sun.com )
+ * @author Ramesh Mandava
+ * @LastModified: Nov 2017
  */
 public class JAXPExtensionsProvider implements ExtensionsProvider {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java	Fri Dec 22 01:28:29 2017 +0000
@@ -37,7 +37,7 @@
  * Overrides {@link VariableStack} and delegates the call to
  * {@link javax.xml.xpath.XPathVariableResolver}.
  *
- * @author Ramesh Mandava ( ramesh.mandava@sun.com )
+ * @author Ramesh Mandava
  */
 public class JAXPVariableStack extends VariableStack {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
  * This class represents an XPath nodeset object, and is capable of
  * converting the nodeset to other types, such as a string.
  * @xsl.usage general
+ * @LastModified: Oct 2017
  */
 public class XNodeSet extends NodeSequence
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
  * This class acts as the base class to other XPath type objects,
  * such as XString, and provides polymorphic casting capabilities.
  * @xsl.usage general
+ * @LastModified: Oct 2017
  */
 public class XObject extends Expression implements Serializable, Cloneable
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,8 @@
 
 /**
  * This class makes an select statement act like an result tree fragment.
+ *
+ * @LastModified: Oct 2017
  */
 public class XRTreeFragSelectWrapper extends XRTreeFrag implements Cloneable
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,8 @@
 
 /**
  * The baseclass for a binary operation.
+ *
+ * @LastModified: Oct 2017
  */
 public class Operation extends Expression implements ExpressionOwner
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,8 @@
 
 /**
  * The unary operation base class.
+ *
+ * @LastModified: Oct 2017
  */
 public abstract class UnaryOperation extends Expression implements ExpressionOwner
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,8 @@
 
 /**
  * The variable reference expression executer.
+ *
+ * @LastModified: Oct 2017
  */
 public class Variable extends Expression implements PathComponent
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,8 @@
 import com.sun.org.apache.xpath.internal.objects.XObject;
 /**
  * Special context node pattern matcher.
+ *
+ * @LastModified: Oct 2017
  */
 public class ContextMatchStepPattern extends StepPattern
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
 /**
  * Match pattern step that contains a function.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class FunctionPattern extends StepPattern
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
  * This is the basic node test class for both match patterns and location path
  * steps.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class NodeTest extends Expression
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
 /**
  * This class represents a single pattern match step.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class StepPattern extends NodeTest implements SubContextList, ExpressionOwner
 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
  * This class represents a union pattern, which can have multiple individual
  * StepPattern patterns.
  * @xsl.usage advanced
+ * @LastModified: Oct 2017
  */
 public class UnionPattern extends Expression
 {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java	Fri Dec 22 01:28:29 2017 +0000
@@ -29,8 +29,8 @@
  * XMLBufferListerner should be implemented by classes which wish to receive
  * call backs from XMLEntityReader.
  *
- * @author k.venugopal@sun.com,
- * @author Neeraj.bajaj@sun.com
+ * @author k venugopal,
+ * @author Neeraj bajaj
  */
 public interface XMLBufferListener {
 
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -48,7 +48,7 @@
  * This class provides the implementation of XMLOutputFactory.
  *
  * @author  Neeraj Bajaj,
- * @author k.venugopal@sun.com
+ * @author k venugopal
  */
 public class XMLOutputFactoryImpl extends XMLOutputFactory {
 
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -30,7 +30,7 @@
 /**
  *Implementation of Location interface to be used by
  *event readers.
- *@author Neeraj.bajaj@sun.com,k.venugopal@sun.com
+ *@author Neeraj bajaj,k venugopal
  */
 public class LocationImpl implements Location{
     String systemId;
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -32,7 +32,7 @@
 import javax.xml.XMLConstants;
 /**
  *
- * @author  Neeraj Bajaj,K.Venugopal@sun.com  Sun Microsystems.
+ * @author  Neeraj Bajaj,K Venugopal
  */
 public class NamespaceImpl extends AttributeImpl implements Namespace{
 
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -32,7 +32,7 @@
 /**
  * Implementation of NotationDeclaration event.
  *
- * @author k.venugopal@sun.com
+ * @author k venugopal
  */
 public class NotationDeclarationImpl extends DummyEvent implements NotationDeclaration {
 
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -38,7 +38,7 @@
 /**
  * Implementation of XMLEvent Allocator.
  *
- * @author Neeraj.bajaj@sun.com, k.venugopal@sun.com
+ * @author Neeraj bajaj, k venugopal
  */
 public class XMLEventAllocatorImpl implements XMLEventAllocator {
 
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -42,7 +42,7 @@
 
 /**
  *
- * @author  Neeraj Bajaj, k.venugopal@sun.com
+ * @author  Neeraj Bajaj, k venugopal
  */
 public class XMLEventFactoryImpl extends XMLEventFactory {
 
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -31,8 +31,8 @@
  * Buffer allocator for buffers of sizes 128 B, 2 KB and 8 KB. Includes
  * methods for allocating and freeing buffers.
  *
- * @author Binu.John@sun.com
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Binu John
+ * @author Santiago PericasGeertsen
  */
 public class BufferAllocator {
     private static final int SMALL_SIZE_LIMIT = 128;
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -35,8 +35,8 @@
  * The local storage is activated on the return of the buffer.
  * The buffer returns null if it is already allocated.
  *
- * @author Binu.John@sun.com
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Binu John
+ * @author Santiago PericasGeertsen
  */
 public class ThreadLocalBufferAllocator {
    private static ThreadLocal<SoftReference<BufferAllocator>> tlba = new ThreadLocal<>();
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java	Fri Dec 22 01:28:29 2017 +0000
@@ -42,7 +42,7 @@
  * of <code>java.io.BufferedWriter</code> has been shown to be very
  * expensive in JAX-WS.</p>
  *
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Santiago PericasGeertsen
  */
 public final class UTF8OutputStreamWriter extends Writer {
 
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -47,7 +47,7 @@
 
 /**
  * This class provides support to build a DOM tree using XMLStreamWriter API's.
- * @author K.Venugopal@sun.com
+ * @author K Venugopal
  */
 
 /*
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java	Fri Dec 22 01:28:29 2017 +0000
@@ -64,8 +64,8 @@
  *
  * @author Neeraj Bajaj
  * @author K.Venugopal
- * @author Santiago.Pericas-Geertsen@sun.com
- * @author Sunitha.Reddy@sun.com
+ * @author Santiago Pericas-Geertsen
+ * @author Sunitha Reddy
  */
 public final class XMLStreamWriterImpl extends AbstractMap<Object, Object>
         implements XMLStreamWriterBase {
@@ -2041,7 +2041,6 @@
          * we dont need to set the value for every end element we encouter.
          * For Well formedness checks we can have the same QName object that was pushed.
          * the values will be set only if application need to know about the endElement
-         * -- neeraj.bajaj@sun.com
          */
         public ElementState peek() {
             return fElements[fDepth - 1];
--- a/src/java.xml/share/classes/javax/xml/XMLConstants.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/XMLConstants.java	Fri Dec 22 01:28:29 2017 +0000
@@ -28,7 +28,7 @@
 /**
  * <p>Utility class to contain basic XML values as constants.
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @see <a href="http://www.w3.org/TR/xml11/">Extensible Markup Language (XML) 1.1</a>
  * @see <a href="http://www.w3.org/TR/REC-xml">Extensible Markup Language (XML) 1.0 (Second Edition)</a>
  * @see <a href="http://www.w3.org/XML/xml-V10-2e-errata">XML 1.0 Second Edition Specification Errata</a>
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java	Fri Dec 22 01:28:29 2017 +0000
@@ -28,7 +28,7 @@
 /**
  * <p>Indicates a serious configuration error.</p>
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.5
  */
 
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java	Fri Dec 22 01:28:29 2017 +0000
@@ -31,7 +31,7 @@
 /**
  * <p>Utility class to contain basic Datatype values as constants.</p>
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.5
  */
 
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -80,9 +80,9 @@
  *    </li>
  * </ol>
  *
- * @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Joseph Fialli
+ * @author Jeff Suttor
+ * @author Neeraj Bajaj
  *
  * @since 1.5
  */
--- a/src/java.xml/share/classes/javax/xml/datatype/Duration.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/datatype/Duration.java	Fri Dec 22 01:28:29 2017 +0000
@@ -89,10 +89,10 @@
  * some of the methods may not work correctly on such {@code Duration}s.
  * The impacted methods document their dependency on {@link Calendar}.
  *
- * @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a>
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Joseph Fialli
+ * @author Kohsuke Kawaguchi
+ * @author Jeff Suttor
+ * @author Sunitha Reddy
  * @see XMLGregorianCalendar#add(Duration)
  * @since 1.5
  */
--- a/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java	Fri Dec 22 01:28:29 2017 +0000
@@ -41,7 +41,7 @@
  * <p>This class is duplicated for each JAXP subpackage so keep it in
  * sync.  It is package private for secure class loading.</p>
  *
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Santiago PericasGeertsen
  */
 class FactoryFinder {
     private static final String DEFAULT_PACKAGE = "com.sun.org.apache.xerces.internal";
--- a/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java	Fri Dec 22 01:28:29 2017 +0000
@@ -165,10 +165,10 @@
  *   </li>
  * </ul>
  *
- * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a>
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Joseph Fialli
+ * @author Kohsuke Kawaguchi
+ * @author Jeff Suttor
+ * @author Sunitha Reddy
  * @see Duration
  * @see DatatypeFactory
  * @since 1.5
--- a/src/java.xml/share/classes/javax/xml/datatype/package-info.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/datatype/package-info.java	Fri Dec 22 01:28:29 2017 +0000
@@ -149,7 +149,7 @@
  *     <li>xs:unsignedShort</li>
  * </ul>
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">
  *             W3C XML Schema 1.0 Part 2, Section 3.2.7-14</a>
  * @see <a href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
--- a/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java	Fri Dec 22 01:28:29 2017 +0000
@@ -67,7 +67,7 @@
  * <p>A prefix can only be bound to a <strong>single</strong>
  * Namespace URI in the current scope.
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @see javax.xml.XMLConstants
  *   javax.xml.XMLConstants for declarations of common XML values
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#QName">
--- a/src/java.xml/share/classes/javax/xml/namespace/QName.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/namespace/QName.java	Fri Dec 22 01:28:29 2017 +0000
@@ -59,7 +59,7 @@
  *
  * <p><code>QName</code> is immutable.</p>
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#QName">
  *   XML Schema Part2: Datatypes specification</a>
  * @see <a href="http://www.w3.org/TR/REC-xml-names/#ns-qualnames">
--- a/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java	Fri Dec 22 01:28:29 2017 +0000
@@ -56,7 +56,7 @@
  * <code>Document</code>. It merely requires that the implementation
  * communicate with the application using these existing APIs.
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.4
  */
 
--- a/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -32,8 +32,8 @@
  * Defines a factory API that enables applications to obtain a
  * parser that produces DOM object trees from XML documents.
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Jeff Suttor
+ * @author Neeraj Bajaj
  *
  * @since 1.4
  */
--- a/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java	Fri Dec 22 01:28:29 2017 +0000
@@ -31,7 +31,7 @@
  * parser factory specified in the system properties cannot be found
  * or instantiated.
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.4
  */
 
--- a/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java	Fri Dec 22 01:28:29 2017 +0000
@@ -41,8 +41,7 @@
  * <p>This class is duplicated for each JAXP subpackage so keep it in
  * sync.  It is package private for secure class loading.</p>
  *
- * @author Santiago.PericasGeertsen@sun.com
- * @author Huizhe.Wang@oracle.com
+ * @author Santiago PericasGeertsen
  */
 class FactoryFinder {
     private static final String DEFAULT_PACKAGE = "com.sun.org.apache.xerces.internal";
--- a/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java	Fri Dec 22 01:28:29 2017 +0000
@@ -28,7 +28,7 @@
 /**
  * Indicates a serious configuration error.
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.4
  */
 
--- a/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java	Fri Dec 22 01:28:29 2017 +0000
@@ -74,7 +74,7 @@
  * class to initially adapt their SAX1 implementation to work under
  * this revised class.
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.4
  */
 @SuppressWarnings("deprecation")
--- a/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -35,8 +35,8 @@
  * Defines a factory API that enables applications to configure and
  * obtain a SAX based parser to parse XML documents.
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Jeff Suttor
+ * @author Neeraj Bajaj
  *
  * @since 1.4
  */
--- a/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java	Fri Dec 22 01:28:29 2017 +0000
@@ -41,7 +41,7 @@
  * <p>This class is duplicated for each JAXP subpackage so keep it in
  * sync.  It is package private for secure class loading.</p>
  *
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Santiago PericasGeertsen
  */
 class FactoryFinder {
     // Check we have access to package.
--- a/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java	Fri Dec 22 01:28:29 2017 +0000
@@ -43,8 +43,7 @@
  * <p>This class is duplicated for each JAXP subpackage so keep it in
  * sync.  It is package private for secure class loading.</p>
  *
- * @author Santiago.PericasGeertsen@sun.com
- * @author Huizhe.Wang@oracle.com
+ * @author Santiago PericasGeertsen
  */
 class FactoryFinder {
     private static final String DEFAULT_PACKAGE = "com.sun.org.apache.xalan.internal.";
--- a/src/java.xml/share/classes/javax/xml/transform/Result.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/Result.java	Fri Dec 22 01:28:29 2017 +0000
@@ -29,7 +29,7 @@
  * <p>An object that implements this interface contains the information
  * needed to build a transformation result tree.
  *
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.4
  */
 public interface Result {
--- a/src/java.xml/share/classes/javax/xml/transform/Transformer.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/Transformer.java	Fri Dec 22 01:28:29 2017 +0000
@@ -44,7 +44,7 @@
  * <p>A <code>Transformer</code> may be used multiple times.  Parameters and
  * output properties are preserved across transformations.</p>
  *
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.4
  */
 public abstract class Transformer {
--- a/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -38,8 +38,8 @@
  * {@code TransformerFactory} abstract class. If the property is not
  * defined, a platform default is be used.
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Jeff Suttor
+ * @author Neeraj Bajaj
  *
  * @since 1.5
  */
--- a/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java	Fri Dec 22 01:28:29 2017 +0000
@@ -36,7 +36,7 @@
  * a Document node as the holder for the result of the transformation,
  * which may be retrieved with {@link #getNode()}.
  *
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.4
  */
 public class DOMResult implements Result {
--- a/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java	Fri Dec 22 01:28:29 2017 +0000
@@ -38,7 +38,7 @@
  * Parsers can be made namespace aware by calling
  * {@link javax.xml.parsers.DocumentBuilderFactory#setNamespaceAware(boolean awareness)}.</p>
  *
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @see <a href="http://www.w3.org/TR/DOM-Level-2">Document Object Model (DOM) Level 2 Specification</a>
  * @since 1.4
  */
--- a/src/java.xml/share/classes/javax/xml/transform/overview.html	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/overview.html	Fri Dec 22 01:28:29 2017 +0000
@@ -36,7 +36,7 @@
   <meta name="CVS"
         content="$Id: overview.html,v 1.2 2005/06/10 03:50:39 jeffsuttor Exp $" />
   <meta name="AUTHOR"
-        content="Jeff.Suttor@Sun.com" />
+        content="Jeff Suttor" />
 </head>
 <body> 
   
--- a/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java	Fri Dec 22 01:28:29 2017 +0000
@@ -33,7 +33,7 @@
 /**
  * <p>Acts as an holder for a transformation Result.</p>
  *
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.4
  */
 public class SAXResult implements Result {
--- a/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java	Fri Dec 22 01:28:29 2017 +0000
@@ -40,7 +40,7 @@
  * Parsers can be made namespace aware by calling the
  * {@link javax.xml.parsers.SAXParserFactory#setNamespaceAware(boolean awareness)} method.</p>
  *
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.4
  */
 public class SAXSource implements Source {
--- a/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java	Fri Dec 22 01:28:29 2017 +0000
@@ -38,8 +38,8 @@
  * {@link javax.xml.validation.Validator} which accept
  * <code>Result</code> as input.
  *
- * @author <a href="mailto:Neeraj.Bajaj@Sun.com">Neeraj Bajaj</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Neeraj Bajaj
+ * @author Jeff Suttor
  *
  * @see <a href="http://jcp.org/en/jsr/detail?id=173">
  *  JSR 173: Streaming API for XML</a>
--- a/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java	Fri Dec 22 01:28:29 2017 +0000
@@ -44,8 +44,8 @@
  * <p><code>StAXSource</code>s are consumed during processing
  * and are not reusable.</p>
  *
- * @author <a href="mailto:Neeraj.Bajaj@Sun.com">Neeraj Bajaj</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Neeraj Bajaj
+ * @author Jeff Suttor
  *
  * @see <a href="http://jcp.org/en/jsr/detail?id=173">
  *  JSR 173: Streaming API for XML</a>
--- a/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java	Fri Dec 22 01:28:29 2017 +0000
@@ -36,7 +36,7 @@
  * <p>Acts as an holder for a transformation result,
  * which may be XML, plain Text, HTML, or some other form of markup.</p>
  *
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.4
  */
 public class StreamResult implements Result {
--- a/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java	Fri Dec 22 01:28:29 2017 +0000
@@ -40,7 +40,7 @@
  * <p><em>Note:</em> Due to their internal use of either a {@link Reader} or {@link InputStream} instance,
  * <code>StreamSource</code> instances may only be used once.</p>
  *
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
  * @since 1.4
  */
 public class StreamSource implements Source {
--- a/src/java.xml/share/classes/javax/xml/validation/Schema.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/validation/Schema.java	Fri Dec 22 01:28:29 2017 +0000
@@ -58,7 +58,7 @@
  * In other words, if you parse the same schema twice, you may
  * still get <code>!schemaA.equals(schemaB)</code>.
  *
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
  * @see <a href="http://www.w3.org/TR/xmlschema-1/">XML Schema Part 1: Structures</a>
  * @see <a href="http://www.w3.org/TR/xml11/">Extensible Markup Language (XML) 1.1</a>
  * @see <a href="http://www.w3.org/TR/REC-xml">Extensible Markup Language (XML) 1.0 (Second Edition)</a>
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -105,8 +105,8 @@
  *   </tbody>
  * </table>
  *
- * @author  <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author  <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author  Kohsuke Kawaguchi
+ * @author  Neeraj Bajaj
  *
  * @since 1.5
  */
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java	Fri Dec 22 01:28:29 2017 +0000
@@ -41,7 +41,7 @@
 /**
  * Implementation of {@link SchemaFactory#newInstance(String)}.
  *
- * @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
  * @since 1.5
  */
 class SchemaFactoryFinder  {
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java	Fri Dec 22 01:28:29 2017 +0000
@@ -40,7 +40,7 @@
  * It must not be used by users or JAXP implementations.
  * </p>
  *
- * @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
  * @since 1.5
  */
 public abstract class SchemaFactoryLoader {
--- a/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java	Fri Dec 22 01:28:29 2017 +0000
@@ -41,7 +41,7 @@
  * Implementation of this "interface" can be obtained through the
  * {@link ValidatorHandler#getTypeInfoProvider()} method.
  *
- * @author  <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author  Kohsuke Kawaguchi
  * @see org.w3c.dom.TypeInfo
  * @since 1.5
  */
--- a/src/java.xml/share/classes/javax/xml/validation/Validator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/validation/Validator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -48,7 +48,7 @@
  * the {@code validate} method.
  *
  *
- * @author  <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author  Kohsuke Kawaguchi
  * @since 1.5
  */
 public abstract class Validator {
--- a/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java	Fri Dec 22 01:28:29 2017 +0000
@@ -107,7 +107,7 @@
  *
  * <p>This feature is set to <code>false</code> by default.</p>
  *
- * @author  <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author  Kohsuke Kawaguchi
  * @since 1.5
  */
 public abstract class ValidatorHandler implements ContentHandler {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPath.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPath.java	Fri Dec 22 01:28:29 2017 +0000
@@ -98,8 +98,8 @@
  * method is invoked, applications may not recursively call
  * the {@code evaluate} method.
  *
- * @author  <a href="Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author  <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author  Norman Walsh
+ * @author  Jeff Suttor
  * @see <a href="http://www.w3.org/TR/xpath">XML Path Language (XPath) Version 1.0</a>
  * @since 1.5
  */
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java	Fri Dec 22 01:28:29 2017 +0000
@@ -30,8 +30,8 @@
 /**
  * <p>XPath constants.</p>
  *
- * @author <a href="mailto:Norman.Walsh@Sun.COM">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.COM">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
  * @see <a href="http://www.w3.org/TR/xpath">XML Path Language (XPath) Version 1.0</a>
  * @since 1.5
  */
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathException.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathException.java	Fri Dec 22 01:28:29 2017 +0000
@@ -35,8 +35,8 @@
 /**
  * {@code XPathException} represents a generic XPath exception.
  *
- * @author  <a href="Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.COM">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
  * @since 1.5
  */
 public class XPathException extends Exception {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java	Fri Dec 22 01:28:29 2017 +0000
@@ -94,8 +94,8 @@
  * method is invoked, applications may not recursively call
  * the {@code evaluate} method.
  *
- * @author  <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author  <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author  Norman Walsh
+ * @author  Jeff Suttor
  * @see <a href="http://www.w3.org/TR/xpath#section-Expressions">XML Path Language (XPath) Version 1.0, Expressions</a>
  * @since 1.5
  */
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java	Fri Dec 22 01:28:29 2017 +0000
@@ -28,8 +28,8 @@
 /**
  * {@code XPathExpressionException} represents an error in an XPath expression.
  *
- * @author  <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author  <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author  Norman Walsh
+ * @author  Jeff Suttor
  * @since 1.5
  */
 public class XPathExpressionException extends XPathException {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java	Fri Dec 22 01:28:29 2017 +0000
@@ -45,8 +45,8 @@
  * may not attempt to recursively invoke a <code>newInstance</code> method,
  * even from the same thread.
  *
- * @author  <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author  <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author  Norman Walsh
+ * @author  Jeff Suttor
  *
  * @since 1.5
  */
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java	Fri Dec 22 01:28:29 2017 +0000
@@ -29,8 +29,8 @@
  * {@code XPathFactoryConfigurationException} represents
  * a configuration error in a {@code XPathFactory} environment.
  *
- * @author  <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author  <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author  Norman Walsh
+ * @author  Jeff Suttor
  * @since 1.5
  */
 public class XPathFactoryConfigurationException extends XPathException {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java	Fri Dec 22 01:28:29 2017 +0000
@@ -41,7 +41,7 @@
 /**
  * Implementation of {@link XPathFactory#newInstance(String)}.
  *
- * @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
  * @since 1.5
  */
 class XPathFactoryFinder  {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java	Fri Dec 22 01:28:29 2017 +0000
@@ -32,8 +32,8 @@
  *
  * <p>Functions are identified by QName and arity in XPath.</p>
  *
- * @author  <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author  <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author  Norman Walsh
+ * @author  Jeff Suttor
  * @since 1.5
  */
 public interface XPathFunction {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java	Fri Dec 22 01:28:29 2017 +0000
@@ -28,8 +28,8 @@
 /**
  * {@code XPathFunctionException} represents an error with an XPath function.
  *
- * @author  <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author  <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author  Norman Walsh
+ * @author  Jeff Suttor
  * @since 1.5
  */
 public class XPathFunctionException extends XPathExpressionException {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java	Fri Dec 22 01:28:29 2017 +0000
@@ -44,8 +44,8 @@
  * <p>If you wish to implement additional built-in functions, you will have to
  * extend the underlying implementation directly.</p>
  *
- * @author  <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author  <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author  Norman Walsh
+ * @author  Jeff Suttor
  * @see <a href="http://www.w3.org/TR/xpath#corelib">XML Path Language (XPath) Version 1.0, Core Function Library</a>
  * @since 1.5
  */
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java	Fri Dec 22 01:28:29 2017 +0000
@@ -37,8 +37,8 @@
  * single XPath expression, a variable's value <strong><em>must</em></strong>
  * not change.</p>
  *
- * @author  <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author  <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author  Norman Walsh
+ * @author  Jeff Suttor
  * @since 1.5
  */
 public interface XPathVariableResolver {
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/beans/AbstractJavaLinker.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/AbstractJavaLinker.java	Fri Dec 22 01:28:29 2017 +0000
@@ -414,20 +414,21 @@
 
     protected GuardedInvocationComponent getGuardedInvocationComponent(final ComponentLinkRequest req)
     throws Exception {
-        if (!req.namespaces.isEmpty()) {
-            final Namespace ns = req.namespaces.get(0);
-            final Operation op = req.baseOperation;
-            if (op == StandardOperation.GET) {
-                if (ns == StandardNamespace.PROPERTY) {
-                    return getPropertyGetter(req.popNamespace());
-                } else if (ns == StandardNamespace.METHOD) {
-                    return getMethodGetter(req.popNamespace());
-                }
-            } else if (op == StandardOperation.SET && ns == StandardNamespace.PROPERTY) {
-                return getPropertySetter(req.popNamespace());
+        if (req.namespaces.isEmpty()) {
+            return null;
+        }
+        final Namespace ns = req.namespaces.get(0);
+        final Operation op = req.baseOperation;
+        if (op == StandardOperation.GET) {
+            if (ns == StandardNamespace.PROPERTY) {
+                return getPropertyGetter(req.popNamespace());
+            } else if (ns == StandardNamespace.METHOD) {
+                return getMethodGetter(req.popNamespace());
             }
+        } else if (op == StandardOperation.SET && ns == StandardNamespace.PROPERTY) {
+            return getPropertySetter(req.popNamespace());
         }
-        return null;
+        return getNextComponent(req.popNamespace());
     }
 
     GuardedInvocationComponent getNextComponent(final ComponentLinkRequest req) throws Exception {
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeanLinker.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeanLinker.java	Fri Dec 22 01:28:29 2017 +0000
@@ -136,24 +136,21 @@
 
     @Override
     protected GuardedInvocationComponent getGuardedInvocationComponent(final ComponentLinkRequest req) throws Exception {
-        final GuardedInvocationComponent superGic = super.getGuardedInvocationComponent(req);
-        if(superGic != null) {
-            return superGic;
+        if (req.namespaces.isEmpty()) {
+            return null;
         }
-        if (!req.namespaces.isEmpty()) {
+        final Namespace ns = req.namespaces.get(0);
+        if (ns == StandardNamespace.ELEMENT) {
             final Operation op = req.baseOperation;
-            final Namespace ns = req.namespaces.get(0);
-            if (ns == StandardNamespace.ELEMENT) {
-                if (op == StandardOperation.GET) {
-                    return getElementGetter(req.popNamespace());
-                } else if (op == StandardOperation.SET) {
-                    return getElementSetter(req.popNamespace());
-                } else if (op == StandardOperation.REMOVE) {
-                    return getElementRemover(req.popNamespace());
-                }
+            if (op == StandardOperation.GET) {
+                return getElementGetter(req.popNamespace());
+            } else if (op == StandardOperation.SET) {
+                return getElementSetter(req.popNamespace());
+            } else if (op == StandardOperation.REMOVE) {
+                return getElementRemover(req.popNamespace());
             }
         }
-        return null;
+        return super.getGuardedInvocationComponent(req);
     }
 
     @Override
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java	Fri Dec 22 01:28:29 2017 +0000
@@ -59,6 +59,7 @@
 import java.util.Map;
 import java.util.Set;
 import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.BaseNode;
 import jdk.nashorn.internal.ir.BinaryNode;
 import jdk.nashorn.internal.ir.Block;
 import jdk.nashorn.internal.ir.CatchNode;
@@ -735,72 +736,13 @@
 
     @Override
     public Node leaveUnaryNode(final UnaryNode unaryNode) {
-        switch (unaryNode.tokenType()) {
-        case DELETE:
-            return leaveDELETE(unaryNode);
-        case TYPEOF:
+        if (unaryNode.tokenType() == TokenType.TYPEOF) {
             return leaveTYPEOF(unaryNode);
-        default:
+        } else {
             return super.leaveUnaryNode(unaryNode);
         }
     }
 
-    private Node leaveDELETE(final UnaryNode unaryNode) {
-        final FunctionNode currentFunctionNode = lc.getCurrentFunction();
-        final boolean      strictMode          = currentFunctionNode.isStrict();
-        final Expression   rhs                 = unaryNode.getExpression();
-        final Expression   strictFlagNode      = (Expression)LiteralNode.newInstance(unaryNode, strictMode).accept(this);
-
-        Request request = Request.DELETE;
-        final List<Expression> args = new ArrayList<>();
-
-        if (rhs instanceof IdentNode) {
-            final IdentNode ident = (IdentNode)rhs;
-            // If this is a declared variable or a function parameter, delete always fails (except for globals).
-            final String name = ident.getName();
-            final Symbol symbol = ident.getSymbol();
-
-            if (symbol.isThis()) {
-                // Can't delete "this", ignore and return true
-                return LiteralNode.newInstance(unaryNode, true);
-            }
-            final Expression literalNode = LiteralNode.newInstance(unaryNode, name);
-            final boolean failDelete = strictMode || (!symbol.isScope() && (symbol.isParam() || (symbol.isVar() && !symbol.isProgramLevel())));
-
-            if (!failDelete) {
-                args.add(compilerConstantIdentifier(SCOPE));
-            }
-            args.add(literalNode);
-            args.add(strictFlagNode);
-
-            if (failDelete) {
-                request = Request.FAIL_DELETE;
-            } else if ((symbol.isGlobal() && !symbol.isFunctionDeclaration()) || symbol.isProgramLevel()) {
-                request = Request.SLOW_DELETE;
-            }
-        } else if (rhs instanceof AccessNode) {
-            final Expression base     = ((AccessNode)rhs).getBase();
-            final String     property = ((AccessNode)rhs).getProperty();
-
-            args.add(base);
-            args.add(LiteralNode.newInstance(unaryNode, property));
-            args.add(strictFlagNode);
-
-        } else if (rhs instanceof IndexNode) {
-            final IndexNode indexNode = (IndexNode)rhs;
-            final Expression base  = indexNode.getBase();
-            final Expression index = indexNode.getIndex();
-
-            args.add(base);
-            args.add(index);
-            args.add(strictFlagNode);
-
-        } else {
-            throw new AssertionError("Unexpected delete with " + rhs.getClass().getName() + " expression");
-        }
-        return new RuntimeNode(unaryNode, request, args);
-    }
-
     @Override
     public Node leaveForNode(final ForNode forNode) {
         if (forNode.isForInOrOf()) {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -151,6 +151,7 @@
 import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
 import jdk.nashorn.internal.runtime.arrays.ArrayData;
 import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.logging.DebugLogger;
 import jdk.nashorn.internal.runtime.logging.Loggable;
 import jdk.nashorn.internal.runtime.logging.Logger;
@@ -1142,6 +1143,12 @@
             }
 
             @Override
+            public boolean enterDELETE(final UnaryNode unaryNode) {
+                loadDELETE(unaryNode);
+                return false;
+            }
+
+            @Override
             public boolean enterEQ(final BinaryNode binaryNode) {
                 loadCmp(binaryNode, Condition.EQ);
                 return false;
@@ -3791,6 +3798,53 @@
         }
     }
 
+    public void loadDELETE(final UnaryNode unaryNode) {
+        final Expression expression = unaryNode.getExpression();
+        if (expression instanceof IdentNode) {
+            final IdentNode ident = (IdentNode)expression;
+            final Symbol symbol = ident.getSymbol();
+            final String name = ident.getName();
+
+            if (symbol.isThis()) {
+                // Can't delete "this", ignore and return true
+                if (!lc.popDiscardIfCurrent(unaryNode)) {
+                    method.load(true);
+                }
+            } else if (lc.getCurrentFunction().isStrict()) {
+                // All other scope identifier delete attempts fail for strict mode
+                method.load(name);
+                method.invoke(ScriptRuntime.STRICT_FAIL_DELETE);
+            } else if (!symbol.isScope() && (symbol.isParam() || (symbol.isVar() && !symbol.isProgramLevel()))) {
+                // If symbol is a function parameter, or a declared non-global variable, delete is a no-op and returns false.
+                if (!lc.popDiscardIfCurrent(unaryNode)) {
+                    method.load(false);
+                }
+            } else {
+                method.loadCompilerConstant(SCOPE);
+                method.load(name);
+                if ((symbol.isGlobal() && !symbol.isFunctionDeclaration()) || symbol.isProgramLevel()) {
+                    method.invoke(ScriptRuntime.SLOW_DELETE);
+                } else {
+                    method.load(false); // never strict here; that was handled with STRICT_FAIL_DELETE above.
+                    method.invoke(ScriptObject.DELETE);
+                }
+            }
+        } else if (expression instanceof BaseNode) {
+            loadExpressionAsObject(((BaseNode)expression).getBase());
+            if (expression instanceof AccessNode) {
+                final AccessNode accessNode = (AccessNode) expression;
+                method.dynamicRemove(accessNode.getProperty(), getCallSiteFlags(), accessNode.isIndex());
+            } else if (expression instanceof IndexNode) {
+                loadExpressionAsObject(((IndexNode) expression).getIndex());
+                method.dynamicRemoveIndex(getCallSiteFlags());
+            } else {
+                throw new AssertionError(expression.getClass().getName());
+            }
+        } else {
+            throw new AssertionError(expression.getClass().getName());
+        }
+    }
+
     public void loadADD(final BinaryNode binaryNode, final TypeBounds resultBounds) {
         new OptimisticOperation(binaryNode, resultBounds) {
             @Override
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java	Fri Dec 22 01:28:29 2017 +0000
@@ -43,6 +43,7 @@
 import java.util.Set;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.BaseNode;
 import jdk.nashorn.internal.ir.BinaryNode;
 import jdk.nashorn.internal.ir.Block;
 import jdk.nashorn.internal.ir.BreakNode;
@@ -1093,9 +1094,15 @@
     @Override
     public boolean enterUnaryNode(final UnaryNode unaryNode) {
         final Expression expr = unaryNode.getExpression();
-        final LvarType unaryType = toLvarType(unaryNode.setExpression(visitExpression(expr).typeExpression).getType());
-        if(unaryNode.isSelfModifying() && expr instanceof IdentNode) {
-            onSelfAssignment((IdentNode)expr, unaryType);
+        final LvarType unaryType;
+        if (unaryNode.tokenType() == TokenType.DELETE && expr instanceof IdentNode) {
+            // not visiting deleted identifiers; they don't count as use
+            unaryType = toLvarType(unaryNode.getType());
+        } else {
+            unaryType = toLvarType(unaryNode.setExpression(visitExpression(expr).typeExpression).getType());
+            if (unaryNode.isSelfModifying() && expr instanceof IdentNode) {
+                onSelfAssignment((IdentNode) expr, unaryType);
+            }
         }
         typeStack.push(unaryType);
         return false;
@@ -1348,6 +1355,12 @@
                 return true;
             }
 
+            @Override
+            public boolean enterUnaryNode(final UnaryNode unaryNode) {
+                // not visiting deleted identifiers; they don't count as use
+                return !(unaryNode.tokenType() == TokenType.DELETE && unaryNode.getExpression() instanceof IdentNode);
+            }
+
             @SuppressWarnings("fallthrough")
             @Override
             public Node leaveBinaryNode(final BinaryNode binaryNode) {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java	Fri Dec 22 01:28:29 2017 +0000
@@ -2203,7 +2203,7 @@
     }
 
     /**
-     * Generate dynamic getter. Pop scope from stack. Push result
+     * Generate dynamic getter. Pop object from stack. Push result.
      *
      * @param valueType type of the value to set
      * @param name      name of property
@@ -2224,7 +2224,7 @@
             type = Type.OBJECT; //promote e.g strings to object generic setter
         }
 
-        popType(Type.SCOPE);
+        popType(Type.OBJECT);
         method.visitInvokeDynamicInsn(NameCodec.encode(name),
                 Type.getMethodDescriptor(type, Type.OBJECT), LINKERBOOTSTRAP, flags | dynGetOperation(isMethod, isIndex));
 
@@ -2256,13 +2256,38 @@
             convert(Type.OBJECT); //TODO bad- until we specialize boolean setters,
         }
         popType(type);
-        popType(Type.SCOPE);
+        popType(Type.OBJECT);
 
         method.visitInvokeDynamicInsn(NameCodec.encode(name),
                 methodDescriptor(void.class, Object.class, type.getTypeClass()), LINKERBOOTSTRAP, flags | dynSetOperation(isIndex));
     }
 
-     /**
+    /**
+     * Generate dynamic remover. Pop object from stack. Push result.
+     *
+     * @param name      name of property
+     * @param flags     call site flags
+     * @return the method emitter
+     */
+    MethodEmitter dynamicRemove(final String name, final int flags, final boolean isIndex) {
+        if (name.length() > LARGE_STRING_THRESHOLD) { // use removeIndex for extremely long names
+            return load(name).dynamicRemoveIndex(flags);
+        }
+
+        debug("dynamic_remove", name, Type.BOOLEAN, getProgramPoint(flags));
+
+        popType(Type.OBJECT);
+        // Type is widened to OBJECT then coerced back to BOOLEAN
+        method.visitInvokeDynamicInsn(NameCodec.encode(name),
+                Type.getMethodDescriptor(Type.OBJECT, Type.OBJECT), LINKERBOOTSTRAP, flags | dynRemoveOperation(isIndex));
+
+        pushType(Type.OBJECT);
+        convert(Type.BOOLEAN); //most probably a nop
+
+        return this;
+    }
+
+    /**
      * Dynamic getter for indexed structures. Pop index and receiver from stack,
      * generate appropriate signatures based on types
      *
@@ -2342,6 +2367,35 @@
     }
 
     /**
+     * Dynamic remover for indexed structures. Pop index and receiver from stack,
+     * generate appropriate signatures based on types
+     *
+     * @param flags call site flags for getter
+     *
+     * @return the method emitter
+     */
+    MethodEmitter dynamicRemoveIndex(final int flags) {
+        debug("dynamic_remove_index", peekType(1), "[", peekType(), "]", getProgramPoint(flags));
+
+        Type index = peekType();
+        if (index.isObject() || index.isBoolean()) {
+            index = Type.OBJECT; //e.g. string->object
+            convert(Type.OBJECT);
+        }
+        popType();
+
+        popType(Type.OBJECT);
+
+        final String signature = Type.getMethodDescriptor(Type.OBJECT, Type.OBJECT /*e.g STRING->OBJECT*/, index);
+
+        method.visitInvokeDynamicInsn(EMPTY_NAME, signature, LINKERBOOTSTRAP, flags | dynRemoveOperation(true));
+        pushType(Type.OBJECT);
+        convert(Type.BOOLEAN);
+
+        return this;
+    }
+
+    /**
      * Load a key value in the proper form.
      *
      * @param key
@@ -2520,6 +2574,10 @@
         return isIndex ? NashornCallSiteDescriptor.SET_ELEMENT : NashornCallSiteDescriptor.SET_PROPERTY;
     }
 
+    private static int dynRemoveOperation(final boolean isIndex) {
+        return isIndex ? NashornCallSiteDescriptor.REMOVE_ELEMENT : NashornCallSiteDescriptor.REMOVE_PROPERTY;
+    }
+
     private Type emitLocalVariableConversion(final LocalVariableConversion conversion, final boolean onlySymbolLiveValue) {
         final Type from = conversion.getFrom();
         final Type to = conversion.getTo();
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java	Fri Dec 22 01:28:29 2017 +0000
@@ -54,12 +54,6 @@
         TYPEOF,
         /** Reference error type */
         REFERENCE_ERROR,
-        /** Delete operator */
-        DELETE(TokenType.DELETE, Type.BOOLEAN, 1),
-        /** Delete operator for slow scopes */
-        SLOW_DELETE(TokenType.DELETE, Type.BOOLEAN, 1, false),
-        /** Delete operator that always fails -- see Lower */
-        FAIL_DELETE(TokenType.DELETE, Type.BOOLEAN, 1, false),
         /** === operator with at least one object */
         EQ_STRICT(TokenType.EQ_STRICT, Type.BOOLEAN, 2, true),
         /** == operator with at least one object */
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java	Fri Dec 22 01:28:29 2017 +0000
@@ -189,6 +189,8 @@
     /** Method handle for generic property setter */
     public static final Call GENERIC_SET = virtualCallNoLookup(ScriptObject.class, "set", void.class, Object.class, Object.class, int.class);
 
+    public static final Call DELETE = virtualCall(MethodHandles.lookup(), ScriptObject.class, "delete", boolean.class, Object.class, boolean.class);
+
     static final MethodHandle[] SET_SLOW = new MethodHandle[] {
         findOwnMH_V("set", void.class, Object.class, int.class, int.class),
         findOwnMH_V("set", void.class, Object.class, double.class, int.class),
@@ -202,6 +204,9 @@
     static final MethodHandle EXTENSION_CHECK   = findOwnMH_V("extensionCheck", boolean.class, boolean.class, String.class);
     static final MethodHandle ENSURE_SPILL_SIZE = findOwnMH_V("ensureSpillSize", Object.class, int.class);
 
+    private static final GuardedInvocation DELETE_GUARDED = new GuardedInvocation(MH.insertArguments(DELETE.methodHandle(), 2, false), NashornGuards.getScriptObjectGuard());
+    private static final GuardedInvocation DELETE_GUARDED_STRICT = new GuardedInvocation(MH.insertArguments(DELETE.methodHandle(), 2, true), NashornGuards.getScriptObjectGuard());
+
     /**
      * Constructor
      */
@@ -1869,6 +1874,13 @@
             return desc.getOperation() instanceof NamedOperation
                     ? findSetMethod(desc, request)
                     : findSetIndexMethod(desc, request);
+        case REMOVE:
+            final GuardedInvocation inv = NashornCallSiteDescriptor.isStrict(desc) ? DELETE_GUARDED_STRICT : DELETE_GUARDED;
+            final Object name = NamedOperation.getName(desc.getOperation());
+            if (name != null) {
+                return inv.replaceMethods(MH.insertArguments(inv.getInvocation(), 1, name), inv.getGuard());
+            }
+            return inv;
         case CALL:
             return findCallMethod(desc, request);
         case NEW:
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java	Fri Dec 22 01:28:29 2017 +0000
@@ -136,6 +136,16 @@
     public static final Call INVALIDATE_RESERVED_BUILTIN_NAME = staticCallNoLookup(ScriptRuntime.class, "invalidateReservedBuiltinName", void.class, String.class);
 
     /**
+     * Used to perform failed delete under strict mode
+     */
+    public static final Call STRICT_FAIL_DELETE = staticCallNoLookup(ScriptRuntime.class, "strictFailDelete", boolean.class, String.class);
+
+    /**
+     * Used to find the scope for slow delete
+     */
+    public static final Call SLOW_DELETE = staticCallNoLookup(ScriptRuntime.class, "slowDelete", boolean.class, ScriptObject.class, String.class);
+
+    /**
      * Converts a switch tag value to a simple integer. deflt value if it can't.
      *
      * @param tag   Switch statement tag value.
@@ -780,87 +790,40 @@
     }
 
     /**
-     * ECMA 11.4.1 - delete operation, generic implementation
+     * ECMA 11.4.1 - delete operator, implementation for slow scopes
      *
-     * @param obj       object with property to delete
+     * This implementation of 'delete' walks the scope chain to find the scope that contains the
+     * property to be deleted, then invokes delete on it. Always used on scopes, never strict.
+     *
+     * @param obj       top scope object
      * @param property  property to delete
-     * @param strict    are we in strict mode
      *
      * @return true if property was successfully found and deleted
      */
-    public static boolean DELETE(final Object obj, final Object property, final Object strict) {
-        if (obj instanceof ScriptObject) {
-            return ((ScriptObject)obj).delete(property, Boolean.TRUE.equals(strict));
-        }
-
-        if (obj instanceof Undefined) {
-            return ((Undefined)obj).delete(property, false);
-        }
-
-        if (obj == null) {
-            throw typeError("cant.delete.property", safeToString(property), "null");
-        }
-
-        if (obj instanceof ScriptObjectMirror) {
-            return ((ScriptObjectMirror)obj).delete(property);
-        }
-
-        if (JSType.isPrimitive(obj)) {
-            return ((ScriptObject) JSType.toScriptObject(obj)).delete(property, Boolean.TRUE.equals(strict));
-        }
-
-        if (obj instanceof JSObject) {
-            ((JSObject)obj).removeMember(Objects.toString(property));
-            return true;
+    public static boolean slowDelete(final ScriptObject obj, final String property) {
+        ScriptObject sobj = obj;
+        while (sobj != null && sobj.isScope()) {
+            final FindProperty find = sobj.findProperty(property, false);
+            if (find != null) {
+                return sobj.delete(property, false);
+            }
+            sobj = sobj.getProto();
         }
-
-        // if object is not reference type, vacuously delete is successful.
-        return true;
-    }
-
-    /**
-     * ECMA 11.4.1 - delete operator, implementation for slow scopes
-     *
-     * This implementation of 'delete' walks the scope chain to find the scope that contains the
-     * property to be deleted, then invokes delete on it.
-     *
-     * @param obj       top scope object
-     * @param property  property to delete
-     * @param strict    are we in strict mode
-     *
-     * @return true if property was successfully found and deleted
-     */
-    public static boolean SLOW_DELETE(final Object obj, final Object property, final Object strict) {
-        if (obj instanceof ScriptObject) {
-            ScriptObject sobj = (ScriptObject) obj;
-            final String key = property.toString();
-            while (sobj != null && sobj.isScope()) {
-                final FindProperty find = sobj.findProperty(key, false);
-                if (find != null) {
-                    return sobj.delete(key, Boolean.TRUE.equals(strict));
-                }
-                sobj = sobj.getProto();
-            }
-        }
-        return DELETE(obj, property, strict);
+        return obj.delete(property, false);
     }
 
     /**
      * ECMA 11.4.1 - delete operator, special case
      *
-     * This is 'delete' that always fails. We have to check strict mode and throw error.
-     * That is why this is a runtime function. Or else we could have inlined 'false'.
+     * This is 'delete' on a scope; it always fails under strict mode.
+     * It always throws an exception, but is declared to return a boolean
+     * to be compatible with the delete operator type.
      *
      * @param property  property to delete
-     * @param strict    are we in strict mode
-     *
-     * @return false always
+     * @return nothing, always throws an exception.
      */
-    public static boolean FAIL_DELETE(final Object property, final Object strict) {
-        if (Boolean.TRUE.equals(strict)) {
-            throw syntaxError("strict.cant.delete", safeToString(property));
-        }
-        return false;
+    public static boolean strictFailDelete(final String property) {
+        throw syntaxError("strict.cant.delete", property);
     }
 
     /**
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java	Fri Dec 22 01:28:29 2017 +0000
@@ -112,6 +112,11 @@
                 return findSetIndexMethod(desc);
             }
             return findSetMethod(desc);
+        case REMOVE:
+            if (!(desc.getOperation() instanceof NamedOperation)) {
+                return findDeleteIndexMethod(desc);
+            }
+            return findDeleteMethod(desc);
         default:
         }
         return null;
@@ -124,6 +129,7 @@
 
     private static final MethodHandle GET_METHOD = findOwnMH("get", Object.class, Object.class);
     private static final MethodHandle SET_METHOD = MH.insertArguments(findOwnMH("set", void.class, Object.class, Object.class, int.class), 3, NashornCallSiteDescriptor.CALLSITE_STRICT);
+    private static final MethodHandle DELETE_METHOD = MH.insertArguments(findOwnMH("delete", boolean.class, Object.class, boolean.class), 2, false);
 
     private static GuardedInvocation findGetMethod(final CallSiteDescriptor desc) {
         return new GuardedInvocation(MH.insertArguments(GET_METHOD, 1, NashornCallSiteDescriptor.getOperand(desc)), UNDEFINED_GUARD).asType(desc);
@@ -141,6 +147,15 @@
         return new GuardedInvocation(SET_METHOD, UNDEFINED_GUARD).asType(desc);
     }
 
+    private static GuardedInvocation findDeleteMethod(final CallSiteDescriptor desc) {
+        return new GuardedInvocation(MH.insertArguments(DELETE_METHOD, 1, NashornCallSiteDescriptor.getOperand(desc)), UNDEFINED_GUARD).asType(desc);
+    }
+
+    private static GuardedInvocation findDeleteIndexMethod(final CallSiteDescriptor desc) {
+        return new GuardedInvocation(DELETE_METHOD, UNDEFINED_GUARD).asType(desc);
+    }
+
+
     @Override
     public Object get(final Object key) {
         throw typeError("cant.read.property.of.undefined", ScriptRuntime.safeToString(key));
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java	Fri Dec 22 01:28:29 2017 +0000
@@ -31,7 +31,7 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.Map;
-import javax.script.Bindings;
+import java.util.Objects;
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.Operation;
 import jdk.dynalink.StandardOperation;
@@ -64,11 +64,10 @@
         return canLinkTypeStatic(type);
     }
 
-    static boolean canLinkTypeStatic(final Class<?> type) {
-        // can link JSObject also handles Map, Bindings to make
+    private static boolean canLinkTypeStatic(final Class<?> type) {
+        // can link JSObject also handles Map (this includes Bindings) to make
         // sure those are not JSObjects.
         return Map.class.isAssignableFrom(type) ||
-               Bindings.class.isAssignableFrom(type) ||
                JSObject.class.isAssignableFrom(type);
     }
 
@@ -84,7 +83,7 @@
         if (self instanceof JSObject) {
             inv = lookup(desc, request, linkerServices);
             inv = inv.replaceMethods(linkerServices.filterInternalObjects(inv.getInvocation()), inv.getGuard());
-        } else if (self instanceof Map || self instanceof Bindings) {
+        } else if (self instanceof Map) {
             // guard to make sure the Map or Bindings does not turn into JSObject later!
             final GuardedInvocation beanInv = nashornBeansLinker.getGuardedInvocation(request, linkerServices);
             inv = new GuardedInvocation(beanInv.getInvocation(),
@@ -116,6 +115,13 @@
                     return name != null ? findSetMethod(name) : findSetIndexMethod();
                 }
                 break;
+            case REMOVE:
+                if (NashornCallSiteDescriptor.hasStandardNamespace(desc)) {
+                    return new GuardedInvocation(
+                            name == null ? JSOBJECTLINKER_DEL : MH.insertArguments(JSOBJECTLINKER_DEL, 1, name),
+                            IS_JSOBJECT_GUARD);
+                }
+                break;
             case CALL:
                 return findCallMethod(desc);
             case NEW:
@@ -206,6 +212,15 @@
         }
     }
 
+    @SuppressWarnings("unused")
+    private static boolean del(final Object jsobj, final Object key) {
+        if (jsobj instanceof ScriptObjectMirror) {
+            return ((ScriptObjectMirror)jsobj).delete(key);
+        }
+        ((JSObject) jsobj).removeMember(Objects.toString(key));
+        return true;
+    }
+
     private static int getIndex(final Number n) {
         final double value = n.doubleValue();
         return JSType.isRepresentableAsInt(value) ? (int)value : -1;
@@ -245,6 +260,7 @@
     private static final MethodHandle IS_JSOBJECT_GUARD  = findOwnMH_S("isJSObject", boolean.class, Object.class);
     private static final MethodHandle JSOBJECTLINKER_GET = findOwnMH_S("get", Object.class, MethodHandle.class, Object.class, Object.class);
     private static final MethodHandle JSOBJECTLINKER_PUT = findOwnMH_S("put", Void.TYPE, Object.class, Object.class, Object.class);
+    private static final MethodHandle JSOBJECTLINKER_DEL = findOwnMH_S("del", boolean.class, Object.class, Object.class);
 
     // method handles of JSObject class
     private static final MethodHandle JSOBJECT_GETMEMBER     = findJSObjectMH_V("getMember", Object.class, String.class);
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java	Fri Dec 22 01:28:29 2017 +0000
@@ -39,11 +39,13 @@
 import jdk.dynalink.NamedOperation;
 import jdk.dynalink.Operation;
 import jdk.dynalink.beans.BeansLinker;
+import jdk.dynalink.beans.StaticClass;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.GuardingDynamicLinker;
 import jdk.dynalink.linker.GuardingTypeConverterFactory;
 import jdk.dynalink.linker.LinkRequest;
 import jdk.dynalink.linker.LinkerServices;
+import jdk.dynalink.linker.support.Guards;
 import jdk.dynalink.linker.support.Lookup;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.runtime.ECMAException;
@@ -86,12 +88,16 @@
             MH.dropArguments(EMPTY_PROP_SETTER, 0, Object.class);
 
     private static final MethodHandle THROW_STRICT_PROPERTY_SETTER;
+    private static final MethodHandle THROW_STRICT_PROPERTY_REMOVER;
     private static final MethodHandle THROW_OPTIMISTIC_UNDEFINED;
+    private static final MethodHandle MISSING_PROPERTY_REMOVER;
 
     static {
         final Lookup lookup = new Lookup(MethodHandles.lookup());
         THROW_STRICT_PROPERTY_SETTER = lookup.findOwnStatic("throwStrictPropertySetter", void.class, Object.class, Object.class);
+        THROW_STRICT_PROPERTY_REMOVER = lookup.findOwnStatic("throwStrictPropertyRemover", boolean.class, Object.class, Object.class);
         THROW_OPTIMISTIC_UNDEFINED = lookup.findOwnStatic("throwOptimisticUndefined", Object.class, int.class);
+        MISSING_PROPERTY_REMOVER = lookup.findOwnStatic("missingPropertyRemover", boolean.class, Object.class, Object.class);
     }
 
     private static GuardedInvocation linkBean(final LinkRequest linkRequest) throws Exception {
@@ -124,6 +130,7 @@
     static MethodHandle linkMissingBeanMember(final LinkRequest linkRequest, final LinkerServices linkerServices) throws Exception {
         final CallSiteDescriptor desc = linkRequest.getCallSiteDescriptor();
         final String operand = NashornCallSiteDescriptor.getOperand(desc);
+        final boolean strict = NashornCallSiteDescriptor.isStrict(desc);
         switch (NashornCallSiteDescriptor.getStandardOperation(desc)) {
         case GET:
             if (NashornCallSiteDescriptor.isOptimistic(desc)) {
@@ -133,13 +140,17 @@
             }
             return getInvocation(EMPTY_ELEM_GETTER, linkerServices, desc);
         case SET:
-            final boolean strict = NashornCallSiteDescriptor.isStrict(desc);
             if (strict) {
                 return adaptThrower(bindOperand(THROW_STRICT_PROPERTY_SETTER, operand), desc);
             } else if (operand != null) {
                 return getInvocation(EMPTY_PROP_SETTER, linkerServices, desc);
             }
             return getInvocation(EMPTY_ELEM_SETTER, linkerServices, desc);
+        case REMOVE:
+            if (strict) {
+                return adaptThrower(bindOperand(THROW_STRICT_PROPERTY_REMOVER, operand), desc);
+            }
+            return getInvocation(bindOperand(MISSING_PROPERTY_REMOVER, operand), linkerServices, desc);
         default:
             throw new AssertionError("unknown call type " + desc);
         }
@@ -162,6 +173,33 @@
         throw createTypeError(self, name, "cant.set.property");
     }
 
+    @SuppressWarnings("unused")
+    private static boolean throwStrictPropertyRemover(final Object self, final Object name) {
+        if (isNonConfigurableProperty(self, name)) {
+            throw createTypeError(self, name, "cant.delete.property");
+        }
+        return true;
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean missingPropertyRemover(final Object self, final Object name) {
+        return !isNonConfigurableProperty(self, name);
+    }
+
+    // Corresponds to ECMAScript 5.1 8.12.7 [[Delete]] point 3 check for "isConfigurable" (but negated)
+    private static boolean isNonConfigurableProperty(final Object self, final Object name) {
+        if (self instanceof StaticClass) {
+            final Class<?> clazz = ((StaticClass)self).getRepresentedClass();
+            return BeansLinker.getReadableStaticPropertyNames(clazz).contains(name) ||
+                   BeansLinker.getWritableStaticPropertyNames(clazz).contains(name) ||
+                   BeansLinker.getStaticMethodNames(clazz).contains(name);
+        }
+        final Class<?> clazz = self.getClass();
+        return BeansLinker.getReadableInstancePropertyNames(clazz).contains(name) ||
+            BeansLinker.getWritableInstancePropertyNames(clazz).contains(name) ||
+            BeansLinker.getInstanceMethodNames(clazz).contains(name);
+    }
+
     private static ECMAException createTypeError(final Object self, final Object name, final String msg) {
         return typeError(msg, String.valueOf(name), ScriptRuntime.safeToString(self));
     }
@@ -215,6 +253,8 @@
             throw typeError(NashornCallSiteDescriptor.isMethodFirstOperation(desc) ? "no.such.function" : "cant.get.property", getArgument(linkRequest), "null");
         case SET:
             throw typeError("cant.set.property", getArgument(linkRequest), "null");
+        case REMOVE:
+            throw typeError("cant.delete.property", getArgument(linkRequest), "null");
         default:
             throw new AssertionError("unknown call type " + desc);
         }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java	Fri Dec 22 01:28:29 2017 +0000
@@ -29,6 +29,7 @@
 import static jdk.dynalink.StandardNamespace.METHOD;
 import static jdk.dynalink.StandardNamespace.PROPERTY;
 import static jdk.dynalink.StandardOperation.GET;
+import static jdk.dynalink.StandardOperation.REMOVE;
 import static jdk.dynalink.StandardOperation.SET;
 
 import java.lang.invoke.MethodHandles;
@@ -63,7 +64,7 @@
  * form of static methods.
  */
 public final class NashornCallSiteDescriptor extends CallSiteDescriptor {
-    // Lowest three bits describe the operation
+    // Lowest four bits describe the operation
     /** Property getter operation {@code obj.prop} */
     public static final int GET_PROPERTY        = 0;
     /** Element getter operation {@code obj[index]} */
@@ -76,12 +77,16 @@
     public static final int SET_PROPERTY        = 4;
     /** Element setter operation {@code obj[index] = value} */
     public static final int SET_ELEMENT         = 5;
+    /** Property remove operation {@code delete obj.prop} */
+    public static final int REMOVE_PROPERTY     = 6;
+    /** Element remove operation {@code delete obj[index]} */
+    public static final int REMOVE_ELEMENT      = 7;
     /** Call operation {@code fn(args...)} */
-    public static final int CALL                = 6;
+    public static final int CALL                = 8;
     /** New operation {@code new Constructor(args...)} */
-    public static final int NEW                 = 7;
+    public static final int NEW                 = 9;
 
-    private static final int OPERATION_MASK = 7;
+    private static final int OPERATION_MASK = 15;
 
     // Correspond to the operation indices above.
     private static final Operation[] OPERATIONS = new Operation[] {
@@ -91,42 +96,44 @@
         GET.withNamespaces(METHOD, ELEMENT, PROPERTY),
         SET.withNamespaces(PROPERTY, ELEMENT),
         SET.withNamespaces(ELEMENT, PROPERTY),
+        REMOVE.withNamespaces(PROPERTY, ELEMENT),
+        REMOVE.withNamespaces(ELEMENT, PROPERTY),
         StandardOperation.CALL,
         StandardOperation.NEW
     };
 
     /** Flags that the call site references a scope variable (it's an identifier reference or a var declaration, not a
      * property access expression. */
-    public static final int CALLSITE_SCOPE         = 1 << 3;
+    public static final int CALLSITE_SCOPE         = 1 << 4;
     /** Flags that the call site is in code that uses ECMAScript strict mode. */
-    public static final int CALLSITE_STRICT        = 1 << 4;
+    public static final int CALLSITE_STRICT        = 1 << 5;
     /** Flags that a property getter or setter call site references a scope variable that is located at a known distance
      * in the scope chain. Such getters and setters can often be linked more optimally using these assumptions. */
-    public static final int CALLSITE_FAST_SCOPE    = 1 << 5;
+    public static final int CALLSITE_FAST_SCOPE    = 1 << 6;
     /** Flags that a callsite type is optimistic, i.e. we might get back a wider return value than encoded in the
      * descriptor, and in that case we have to throw an UnwarrantedOptimismException */
-    public static final int CALLSITE_OPTIMISTIC    = 1 << 6;
+    public static final int CALLSITE_OPTIMISTIC    = 1 << 7;
     /** Is this really an apply that we try to call as a call? */
-    public static final int CALLSITE_APPLY_TO_CALL = 1 << 7;
+    public static final int CALLSITE_APPLY_TO_CALL = 1 << 8;
     /** Does this a callsite for a variable declaration? */
-    public static final int CALLSITE_DECLARE       = 1 << 8;
+    public static final int CALLSITE_DECLARE       = 1 << 9;
 
     /** Flags that the call site is profiled; Contexts that have {@code "profile.callsites"} boolean property set emit
      * code where call sites have this flag set. */
-    public static final int CALLSITE_PROFILE         = 1 << 9;
+    public static final int CALLSITE_PROFILE         = 1 << 10;
     /** Flags that the call site is traced; Contexts that have {@code "trace.callsites"} property set emit code where
      * call sites have this flag set. */
-    public static final int CALLSITE_TRACE           = 1 << 10;
+    public static final int CALLSITE_TRACE           = 1 << 11;
     /** Flags that the call site linkage miss (and thus, relinking) is traced; Contexts that have the keyword
      * {@code "miss"} in their {@code "trace.callsites"} property emit code where call sites have this flag set. */
-    public static final int CALLSITE_TRACE_MISSES    = 1 << 11;
+    public static final int CALLSITE_TRACE_MISSES    = 1 << 12;
     /** Flags that entry/exit to/from the method linked at call site are traced; Contexts that have the keyword
      * {@code "enterexit"} in their {@code "trace.callsites"} property emit code where call sites have this flag set. */
-    public static final int CALLSITE_TRACE_ENTEREXIT = 1 << 12;
+    public static final int CALLSITE_TRACE_ENTEREXIT = 1 << 13;
     /** Flags that values passed as arguments to and returned from the method linked at call site are traced; Contexts
      * that have the keyword {@code "values"} in their {@code "trace.callsites"} property emit code where call sites
      * have this flag set. */
-    public static final int CALLSITE_TRACE_VALUES    = 1 << 13;
+    public static final int CALLSITE_TRACE_VALUES    = 1 << 14;
 
     //we could have more tracing flags here, for example CALLSITE_TRACE_SCOPE, but bits are a bit precious
     //right now given the program points
@@ -138,10 +145,10 @@
      * TODO: rethink if we need the various profile/trace flags or the linker can use the Context instead to query its
      * trace/profile settings.
      */
-    public static final int CALLSITE_PROGRAM_POINT_SHIFT = 14;
+    public static final int CALLSITE_PROGRAM_POINT_SHIFT = 15;
 
     /**
-     * Maximum program point value. We have 18 bits left over after flags, and
+     * Maximum program point value. We have 17 bits left over after flags, and
      * it should be plenty. Program points are local to a single function. Every
      * function maps to a single JVM bytecode method that can have at most 65535
      * bytes. (Large functions are synthetically split into smaller functions.)
@@ -222,8 +229,10 @@
         case 3: return "GET_METHOD_ELEMENT";
         case 4: return "SET_PROPERTY";
         case 5: return "SET_ELEMENT";
-        case 6: return "CALL";
-        case 7: return "NEW";
+        case 6: return "REMOVE_PROPERTY";
+        case 7: return "REMOVE_ELEMENT";
+        case 8: return "CALL";
+        case 9: return "NEW";
         default: throw new AssertionError();
         }
     }
--- a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java	Fri Dec 22 01:27:36 2017 +0000
+++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java	Fri Dec 22 01:28:29 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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
@@ -46,7 +46,7 @@
 
 /*
  * @test
- * @bug 8071597
+ * @bug 8071597 8193856
  */
 @Test
 public class WhileOpTest extends OpTestCase {
@@ -361,4 +361,33 @@
         }
         assertTrue(isClosed.get());
     }
+
+    @Test(groups = { "serialization-hostile" })
+    public void testFlatMapThenTake() {
+        TestData.OfRef<Integer> range = TestData.Factory.ofSupplier(
+                "range", () -> IntStream.range(0, 100).boxed());
+
+        exerciseOpsMulti(range,
+                         // Reference result
+                         s -> s.takeWhile(e -> e != 50),
+                         // For other results collect into array,
+                         // stream the single array (not the elements),
+                         // then flat map to stream the array elements
+                         s -> Stream.<Integer[]>of(s.toArray(Integer[]::new)).
+                                 flatMap(Stream::of).
+                                 takeWhile(e -> e != 50),
+                         s -> Stream.of(s.mapToInt(e -> e).toArray()).
+                                 flatMapToInt(IntStream::of).
+                                 takeWhile(e -> e != 50).
+                                 mapToObj(e -> e),
+                         s -> Stream.of(s.mapToLong(e -> e).toArray()).
+                                 flatMapToLong(LongStream::of).
+                                 takeWhile(e -> e != 50L).
+                                 mapToObj(e -> (int) e),
+                         s -> Stream.of(s.mapToDouble(e -> e).toArray()).
+                                 flatMapToDouble(DoubleStream::of).
+                                 takeWhile(e -> e != 50.0).
+                                 mapToObj(e -> (int) e)
+                         );
+    }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8193371.js	Fri Dec 22 01:28:29 2017 +0000
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8193371: Use Dynalink REMOVE operation in Nashorn
+ *
+ * @test
+ * @run
+ */
+
+// This test exercises new functionality enabled by the issue, namely removal of elements from Java lists and maps.
+
+var ArrayList = java.util.ArrayList;
+var HashMap = java.util.HashMap;
+var listOf = java.util.List.of;
+var mapOf = java.util.Map.of;
+
+// Remove from a list
+(function() { 
+    var a = new ArrayList(listOf("foo", "bar", "baz"));
+    Assert.assertFalse(delete a.add);
+
+    // Delete actual element
+    Assert.assertTrue(delete a[1]);
+    Assert.assertEquals(a, listOf("foo", "baz"));
+
+    // Gracefully ignore silly indices
+    Assert.assertTrue(delete a[5]);
+    Assert.assertTrue(delete a[-1]);
+    Assert.assertTrue(delete a["whatever"]);
+    Assert.assertTrue(delete a.whatever);
+
+    // Gracefully ignore attempts at deleting methods and properties
+    Assert.assertFalse(delete a.add);
+    Assert.assertFalse(delete a.class);
+
+    Assert.assertEquals(a, listOf("foo", "baz"));
+
+    print("List passed.")
+})();
+
+// Remove from a list, strict
+(function() { 
+    "use strict";
+	
+    var a = new ArrayList(listOf("foo", "bar", "baz"));
+
+    // Delete actual element
+    Assert.assertTrue(delete a[1]);
+    Assert.assertEquals(a, listOf("foo", "baz"));
+
+    // Gracefully ignore silly indices
+    Assert.assertTrue(delete a[5]);
+    Assert.assertTrue(delete a[-1]);
+    Assert.assertTrue(delete a["whatever"]);
+    Assert.assertTrue(delete a.whatever);
+
+    // Fail deleting methods and properties
+    try { delete a.add; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+    try { delete a.class; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+
+    Assert.assertEquals(a, listOf("foo", "baz"));
+
+    print("Strict list passed.")
+})();
+
+// Remove from a map
+(function() { 
+    var m = new HashMap(mapOf("a", 1, "b", 2, "c", 3));
+
+    // Delete actual elements
+    Assert.assertTrue(delete m.a);
+    Assert.assertEquals(m, mapOf("b", 2, "c", 3));
+    var key = "b"
+    Assert.assertTrue(delete m[key]);
+    Assert.assertEquals(m, mapOf("c", 3));
+
+    // Gracefully ignore silly indices
+    Assert.assertTrue(delete m.x);
+    Assert.assertTrue(delete m[5]);
+    Assert.assertTrue(delete m[-1]);
+    Assert.assertTrue(delete m["whatever"]);
+
+    // Gracefully ignore attempts at deleting methods and properties
+    Assert.assertFalse(delete m.put);
+    Assert.assertFalse(delete m.class);
+
+    Assert.assertEquals(m, mapOf("c", 3));
+    print("Map passed.")
+})();
+
+// Remove from a map, strict
+(function() { 
+    "use strict";
+
+    var m = new HashMap(mapOf("a", 1, "b", 2, "c", 3));
+
+    // Delete actual elements
+    Assert.assertTrue(delete m.a);
+    Assert.assertEquals(m, mapOf("b", 2, "c", 3));
+    var key = "b"
+    Assert.assertTrue(delete m[key]);
+    Assert.assertEquals(m, mapOf("c", 3));
+
+    // Gracefully ignore silly indices
+    Assert.assertTrue(delete m.x);
+    Assert.assertTrue(delete m[5]);
+    Assert.assertTrue(delete m[-1]);
+    Assert.assertTrue(delete m["whatever"]);
+
+    // Fail deleting methods and properties
+    try { delete m.size; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+    try { delete m.class; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+
+    // Somewhat counterintuitive, but if we define an element of a map, we can 
+    // delete it, however then the method surfaces, and we can't delete that.
+    m.size = 4
+    Assert.assertTrue(delete m.size)
+    try { delete m.size; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+    
+    Assert.assertEquals(m, mapOf("c", 3));
+
+    print("Strict map passed.")
+})();
+
+// Remove from arrays and beans
+(function() { 
+    var a = new (Java.type("int[]"))(2)
+    a[0] = 42
+    a[1] = 13
+    
+    // Huh, Dynalink doesn't expose .clone() on Java arrays?
+    var c = new (Java.type("int[]"))(2)
+    c[0] = 42
+    c[1] = 13
+
+    // passes vacuously, but does nothing
+    Assert.assertTrue(delete a[0])
+    Assert.assertEquals(a, c);
+    
+    var b = new java.util.BitSet()
+    b.set(2)
+    // does nothing
+    Assert.assertFalse(delete b.get)
+    // Method is still there and operational
+    Assert.assertTrue(b.get(2))
+
+    // passes vacuously for non-existant property
+    Assert.assertTrue(delete b.foo)
+
+    // statics
+    var Calendar = java.util.Calendar
+    Assert.assertFalse(delete Calendar.UNDECIMBER) // field
+    Assert.assertFalse(delete Calendar.availableLocales) // property
+    Assert.assertFalse(delete Calendar.getInstance) // method
+    Assert.assertTrue(delete Calendar.BLAH) // no such thing
+  
+    print("Beans passed.")
+})();
+
+// Remove from arrays and beans, strict
+(function() { 
+    "use strict";
+    
+    var a = new (Java.type("int[]"))(2)
+    a[0] = 42
+    a[1] = 13
+
+    var c = new (Java.type("int[]"))(2)
+    c[0] = 42
+    c[1] = 13
+
+    // passes vacuously, but does nothing
+    Assert.assertTrue(delete a[0])
+    Assert.assertEquals(a, c);
+    
+    var b = new java.util.BitSet()
+    b.set(2)
+    // fails to delete a method
+    try { delete b.get; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+    // Method is still there and operational
+    Assert.assertTrue(b.get(2))
+
+    // passes vacuously for non-existant property
+    Assert.assertTrue(delete b.foo)
+    
+    // statics
+    var Calendar = java.util.Calendar
+    try { delete Calendar.UNDECIMBER; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+    try { delete Calendar.availableLocales; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+    try { delete Calendar.getInstance; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+    Assert.assertTrue(delete Calendar.BLAH) // no such thing
+  
+    print("Strict beans passed.")
+})();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8193371.js.EXPECTED	Fri Dec 22 01:28:29 2017 +0000
@@ -0,0 +1,6 @@
+List passed.
+Strict list passed.
+Map passed.
+Strict map passed.
+Beans passed.
+Strict beans passed.
jdk-sandbox