1.1 --- a/src/linux/doc/man/ja/keytool.1	Tue May 24 14:11:38 2011 -0700
     1.2 +++ b/src/linux/doc/man/ja/keytool.1	Wed May 25 13:32:36 2011 -0700
     1.3 @@ -1,4 +1,4 @@
     1.4 -." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
     1.5 +." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6  ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.7  ."
     1.8  ." This code is free software; you can redistribute it and/or modify it

     2.1 --- a/src/linux/doc/man/keytool.1	Tue May 24 14:11:38 2011 -0700
     2.2 +++ b/src/linux/doc/man/keytool.1	Wed May 25 13:32:36 2011 -0700
     2.3 @@ -1,4 +1,4 @@
     2.4 -." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
     2.5 +." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
     2.6  ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7  ."
     2.8  ." This code is free software; you can redistribute it and/or modify it

     3.1 --- a/src/share/classes/java/io/SerialCallbackContext.java	Tue May 24 14:11:38 2011 -0700
     3.2 +++ b/src/share/classes/java/io/SerialCallbackContext.java	Wed May 25 13:32:36 2011 -0700
     3.3 @@ -1,7 +1,5 @@
     3.4    /*
     3.5 -   * %W% %E%
     3.6 -   *
     3.7 -   * Copyright (c) 2006, 2010  Oracle and/or its affiliates. All rights reserved.
     3.8 +   * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
     3.9     * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
    3.10     */
    3.11  

     4.1 --- a/src/share/classes/sun/io/ByteToCharCp833.java	Tue May 24 14:11:38 2011 -0700
     4.2 +++ b/src/share/classes/sun/io/ByteToCharCp833.java	Wed May 25 13:32:36 2011 -0700
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it

     5.1 --- a/src/share/classes/sun/io/CharToByteCp833.java	Tue May 24 14:11:38 2011 -0700
     5.2 +++ b/src/share/classes/sun/io/CharToByteCp833.java	Wed May 25 13:32:36 2011 -0700
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
     5.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8   *
     5.9   * This code is free software; you can redistribute it and/or modify it

     6.1 --- a/src/share/classes/sun/misc/FpUtils.java	Tue May 24 14:11:38 2011 -0700
     6.2 +++ b/src/share/classes/sun/misc/FpUtils.java	Wed May 25 13:32:36 2011 -0700
     6.3 @@ -1,5 +1,5 @@
     6.4  /*
     6.5 - * Copyright (c) 2003, 2010 Oracle and/or its affiliates. All rights reserved.
     6.6 + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
     6.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8   *
     6.9   * This code is free software; you can redistribute it and/or modify it

     7.1 --- a/src/share/classes/sun/security/provider/certpath/URICertStore.java	Tue May 24 14:11:38 2011 -0700
     7.2 +++ b/src/share/classes/sun/security/provider/certpath/URICertStore.java	Wed May 25 13:32:36 2011 -0700
     7.3 @@ -1,5 +1,5 @@
     7.4  /*
     7.5 - * Copyright (c) 2006, 2010 Oracle and/or its affiliates. All rights reserved.
     7.6 + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
     7.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8   *
     7.9   * This code is free software; you can redistribute it and/or modify it

     8.1 --- a/src/solaris/doc/sun/man/man1/ja/keytool.1	Tue May 24 14:11:38 2011 -0700
     8.2 +++ b/src/solaris/doc/sun/man/man1/ja/keytool.1	Wed May 25 13:32:36 2011 -0700
     8.3 @@ -1,4 +1,4 @@
     8.4 -." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
     8.5 +." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
     8.6  ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.7  ."
     8.8  ." This code is free software; you can redistribute it and/or modify it

     9.1 --- a/src/solaris/doc/sun/man/man1/keytool.1	Tue May 24 14:11:38 2011 -0700
     9.2 +++ b/src/solaris/doc/sun/man/man1/keytool.1	Wed May 25 13:32:36 2011 -0700
     9.3 @@ -1,4 +1,4 @@
     9.4 -." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
     9.5 +." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
     9.6  ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.7  ."
     9.8  ." This code is free software; you can redistribute it and/or modify it

    10.1 --- a/test/com/sun/net/httpserver/Test10.java	Tue May 24 14:11:38 2011 -0700
    10.2 +++ b/test/com/sun/net/httpserver/Test10.java	Wed May 25 13:32:36 2011 -0700
    10.3 @@ -1,5 +1,5 @@
    10.4  /*
    10.5 - * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
    10.6 + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
    10.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.8   *
    10.9   * This code is free software; you can redistribute it and/or modify it

    11.1 --- a/test/java/awt/List/ScrollOutside/ScrollOut.java	Tue May 24 14:11:38 2011 -0700
    11.2 +++ b/test/java/awt/List/ScrollOutside/ScrollOut.java	Wed May 25 13:32:36 2011 -0700
    11.3 @@ -1,5 +1,5 @@
    11.4  /*
    11.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
    11.6 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    11.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.8   *
    11.9   * This code is free software; you can redistribute it and/or modify it

    12.1 --- a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java	Tue May 24 14:11:38 2011 -0700
    12.2 +++ b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java	Wed May 25 13:32:36 2011 -0700
    12.3 @@ -1,5 +1,5 @@
    12.4  /*
    12.5 - * Copyright (c) 2007, 2011 Oracle and/or its affiliates. All rights reserved.
    12.6 + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
    12.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.8   *
    12.9   * This code is free software; you can redistribute it and/or modify it

    13.1 --- a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java	Tue May 24 14:11:38 2011 -0700
    13.2 +++ b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java	Wed May 25 13:32:36 2011 -0700
    13.3 @@ -1,5 +1,5 @@
    13.4  /*
    13.5 - * Copyright (c) 2007, 2011 Oracle and/or its affiliates. All rights reserved.
    13.6 + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
    13.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.8   *
    13.9   * This code is free software; you can redistribute it and/or modify it

    14.1 --- a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java	Tue May 24 14:11:38 2011 -0700
    14.2 +++ b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java	Wed May 25 13:32:36 2011 -0700
    14.3 @@ -1,5 +1,5 @@
    14.4  /*
    14.5 - * Copyright (c) 2007, 2011 Oracle and/or its affiliates. All rights reserved.
    14.6 + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
    14.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.8   *
    14.9   * This code is free software; you can redistribute it and/or modify it

    15.1 --- a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java	Tue May 24 14:11:38 2011 -0700
    15.2 +++ b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java	Wed May 25 13:32:36 2011 -0700
    15.3 @@ -1,5 +1,5 @@
    15.4  /*
    15.5 - * Copyright (c) 2007, 2011 Oracle and/or its affiliates. All rights reserved.
    15.6 + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
    15.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.8   *
    15.9   * This code is free software; you can redistribute it and/or modify it

    16.1 --- a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java	Tue May 24 14:11:38 2011 -0700
    16.2 +++ b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java	Wed May 25 13:32:36 2011 -0700
    16.3 @@ -1,5 +1,5 @@
    16.4  /*
    16.5 - * Copyright (c) 2007, 2011 Oracle and/or its affiliates. All rights reserved.
    16.6 + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
    16.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.8   *
    16.9   * This code is free software; you can redistribute it and/or modify it

    17.1 --- a/test/java/awt/image/IncorrectSampleMaskTest.java	Tue May 24 14:11:38 2011 -0700
    17.2 +++ b/test/java/awt/image/IncorrectSampleMaskTest.java	Wed May 25 13:32:36 2011 -0700
    17.3 @@ -1,5 +1,5 @@
    17.4  /*
    17.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    17.6 + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
    17.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    17.8   *
    17.9   * This code is free software; you can redistribute it and/or modify it
   17.10 @@ -16,10 +16,10 @@
   17.11   * 2 along with this work; if not, write to the Free Software Foundation,
   17.12   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   17.13   *
   17.14 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   17.15 - * CA 95054 USA or visit www.sun.com if you need additional information or
   17.16 - * have any questions.
   17.17 - */
   17.18 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   17.19 + * or visit www.oracle.com if you need additional information or have any
   17.20 + * questions.
   17.21 +*/
   17.22  
   17.23  /*
   17.24   * @test

    18.1 --- a/test/java/lang/invoke/MethodTypeTest.java	Tue May 24 14:11:38 2011 -0700
    18.2 +++ b/test/java/lang/invoke/MethodTypeTest.java	Wed May 25 13:32:36 2011 -0700
    18.3 @@ -1,12 +1,10 @@
    18.4  /*
    18.5 - * Copyright 2008, 2011 Sun Microsystems, Inc.  All Rights Reserved.
    18.6 + * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
    18.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.8   *
    18.9   * This code is free software; you can redistribute it and/or modify it
   18.10   * under the terms of the GNU General Public License version 2 only, as
   18.11 - * published by the Free Software Foundation.  Sun designates this
   18.12 - * particular file as subject to the "Classpath" exception as provided
   18.13 - * by Sun in the LICENSE file that accompanied this code.
   18.14 + * published by the Free Software Foundation.
   18.15   *
   18.16   * This code is distributed in the hope that it will be useful, but WITHOUT
   18.17   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   18.18 @@ -18,9 +16,9 @@
   18.19   * 2 along with this work; if not, write to the Free Software Foundation,
   18.20   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   18.21   *
   18.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   18.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   18.24 - * have any questions.
   18.25 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   18.26 + * or visit www.oracle.com if you need additional information or have any
   18.27 + * questions.
   18.28   */
   18.29  
   18.30  /* @test

    19.1 --- a/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java	Tue May 24 14:11:38 2011 -0700
    19.2 +++ b/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java	Wed May 25 13:32:36 2011 -0700
    19.3 @@ -1,5 +1,5 @@
    19.4  /*
    19.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
    19.6 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    19.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.8   *
    19.9   * This code is free software; you can redistribute it and/or modify it

    20.1 --- a/test/java/util/EnumMap/DistinctEntrySetElements.java	Tue May 24 14:11:38 2011 -0700
    20.2 +++ b/test/java/util/EnumMap/DistinctEntrySetElements.java	Wed May 25 13:32:36 2011 -0700
    20.3 @@ -1,5 +1,5 @@
    20.4  /*
    20.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
    20.6 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    20.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    20.8   *
    20.9   * This code is free software; you can redistribute it and/or modify it

    21.1 --- a/test/java/util/EnumMap/EntrySetIteratorRemoveInvalidatesEntry.java	Tue May 24 14:11:38 2011 -0700
    21.2 +++ b/test/java/util/EnumMap/EntrySetIteratorRemoveInvalidatesEntry.java	Wed May 25 13:32:36 2011 -0700
    21.3 @@ -1,5 +1,5 @@
    21.4  /*
    21.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
    21.6 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    21.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.8   *
    21.9   * This code is free software; you can redistribute it and/or modify it

    22.1 --- a/test/java/util/EnumMap/SimpleSerialization.java	Tue May 24 14:11:38 2011 -0700
    22.2 +++ b/test/java/util/EnumMap/SimpleSerialization.java	Wed May 25 13:32:36 2011 -0700
    22.3 @@ -1,5 +1,5 @@
    22.4  /*
    22.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
    22.6 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    22.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.8   *
    22.9   * This code is free software; you can redistribute it and/or modify it

    23.1 --- a/test/java/util/EnumSet/LargeEnumIteratorRemoveResilience.java	Tue May 24 14:11:38 2011 -0700
    23.2 +++ b/test/java/util/EnumSet/LargeEnumIteratorRemoveResilience.java	Wed May 25 13:32:36 2011 -0700
    23.3 @@ -1,5 +1,5 @@
    23.4  /*
    23.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
    23.6 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    23.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.8   *
    23.9   * This code is free software; you can redistribute it and/or modify it

    24.1 --- a/test/java/util/EnumSet/SmallEnumIteratorRemoveResilience.java	Tue May 24 14:11:38 2011 -0700
    24.2 +++ b/test/java/util/EnumSet/SmallEnumIteratorRemoveResilience.java	Wed May 25 13:32:36 2011 -0700
    24.3 @@ -1,5 +1,5 @@
    24.4  /*
    24.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
    24.6 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    24.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    24.8   *
    24.9   * This code is free software; you can redistribute it and/or modify it

    25.1 --- a/test/java/util/Hashtable/SerializationDeadlock.java	Tue May 24 14:11:38 2011 -0700
    25.2 +++ b/test/java/util/Hashtable/SerializationDeadlock.java	Wed May 25 13:32:36 2011 -0700
    25.3 @@ -1,5 +1,5 @@
    25.4  /*
    25.5 - * Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
    25.6 + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
    25.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    25.8   *
    25.9   * This code is free software; you can redistribute it and/or modify it

    26.1 --- a/test/java/util/Hashtable/SimpleSerialization.java	Tue May 24 14:11:38 2011 -0700
    26.2 +++ b/test/java/util/Hashtable/SimpleSerialization.java	Wed May 25 13:32:36 2011 -0700
    26.3 @@ -1,5 +1,5 @@
    26.4  /*
    26.5 - * Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
    26.6 + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
    26.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.8   *
    26.9   * This code is free software; you can redistribute it and/or modify it

    27.1 --- a/test/java/util/IdentityHashMap/DistinctEntrySetElements.java	Tue May 24 14:11:38 2011 -0700
    27.2 +++ b/test/java/util/IdentityHashMap/DistinctEntrySetElements.java	Wed May 25 13:32:36 2011 -0700
    27.3 @@ -1,5 +1,5 @@
    27.4  /*
    27.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
    27.6 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    27.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    27.8   *
    27.9   * This code is free software; you can redistribute it and/or modify it

    28.1 --- a/test/java/util/IdentityHashMap/EntrySetIteratorRemoveInvalidatesEntry.java	Tue May 24 14:11:38 2011 -0700
    28.2 +++ b/test/java/util/IdentityHashMap/EntrySetIteratorRemoveInvalidatesEntry.java	Wed May 25 13:32:36 2011 -0700
    28.3 @@ -1,5 +1,5 @@
    28.4  /*
    28.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
    28.6 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    28.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    28.8   *
    28.9   * This code is free software; you can redistribute it and/or modify it

    29.1 --- a/test/java/util/Vector/SerializationDeadlock.java	Tue May 24 14:11:38 2011 -0700
    29.2 +++ b/test/java/util/Vector/SerializationDeadlock.java	Wed May 25 13:32:36 2011 -0700
    29.3 @@ -1,5 +1,5 @@
    29.4  /*
    29.5 - * Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
    29.6 + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
    29.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.8   *
    29.9   * This code is free software; you can redistribute it and/or modify it

    30.1 --- a/test/java/util/Vector/SimpleSerialization.java	Tue May 24 14:11:38 2011 -0700
    30.2 +++ b/test/java/util/Vector/SimpleSerialization.java	Wed May 25 13:32:36 2011 -0700
    30.3 @@ -1,5 +1,5 @@
    30.4  /*
    30.5 - * Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
    30.6 + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
    30.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    30.8   *
    30.9   * This code is free software; you can redistribute it and/or modify it

    31.1 --- a/test/java/util/concurrent/ConcurrentHashMap/DistinctEntrySetElements.java	Tue May 24 14:11:38 2011 -0700
    31.2 +++ b/test/java/util/concurrent/ConcurrentHashMap/DistinctEntrySetElements.java	Wed May 25 13:32:36 2011 -0700
    31.3 @@ -1,5 +1,5 @@
    31.4  /*
    31.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
    31.6 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    31.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    31.8   *
    31.9   * This code is free software; you can redistribute it and/or modify it

    32.1 --- a/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java	Tue May 24 14:11:38 2011 -0700
    32.2 +++ b/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java	Wed May 25 13:32:36 2011 -0700
    32.3 @@ -1,5 +1,5 @@
    32.4  /*
    32.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
    32.6 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    32.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    32.8   *
    32.9   * This code is free software; you can redistribute it and/or modify it

    33.1 --- a/test/sun/net/InetAddress/nameservice/chaining/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor	Tue May 24 14:11:38 2011 -0700
    33.2 +++ b/test/sun/net/InetAddress/nameservice/chaining/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor	Wed May 25 13:32:36 2011 -0700
    33.3 @@ -17,7 +17,7 @@
    33.4  #
    33.5  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    33.6  # or visit www.oracle.com if you need additional information or have any
    33.7 -# questions
    33.8 +# questions.
    33.9  
   33.10  Simple1NameServiceDescriptor
   33.11  Simple2NameServiceDescriptor

    34.1 --- a/test/tools/launcher/TestHelper.java	Tue May 24 14:11:38 2011 -0700
    34.2 +++ b/test/tools/launcher/TestHelper.java	Wed May 25 13:32:36 2011 -0700
    34.3 @@ -1,5 +1,5 @@
    34.4  /*
    34.5 - * Copyright (c) 2008, 2011 Oracle and/or its affiliates. All rights reserved.
    34.6 + * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
    34.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    34.8   *
    34.9   * This code is free software; you can redistribute it and/or modify it

    35.1 --- a/test/tools/pack200/CommandLineTests.java	Tue May 24 14:11:38 2011 -0700
    35.2 +++ b/test/tools/pack200/CommandLineTests.java	Wed May 25 13:32:36 2011 -0700
    35.3 @@ -1,5 +1,5 @@
    35.4  /*
    35.5 - * Copyright (c) 2007, 2010 Oracle and/or its affiliates. All rights reserved.
    35.6 + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
    35.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    35.8   *
    35.9   * This code is free software; you can redistribute it and/or modify it

    36.1 --- a/test/tools/pack200/Pack200Test.java	Tue May 24 14:11:38 2011 -0700
    36.2 +++ b/test/tools/pack200/Pack200Test.java	Wed May 25 13:32:36 2011 -0700
    36.3 @@ -1,5 +1,5 @@
    36.4  /*
    36.5 - * Copyright (c) 2007, 2010 Oracle and/or its affiliates. All rights reserved.
    36.6 + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
    36.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    36.8   *
    36.9   * This code is free software; you can redistribute it and/or modify it

    37.1 --- a/test/tools/pack200/Utils.java	Tue May 24 14:11:38 2011 -0700
    37.2 +++ b/test/tools/pack200/Utils.java	Wed May 25 13:32:36 2011 -0700
    37.3 @@ -1,5 +1,5 @@
    37.4  /*
    37.5 - * Copyright (c) 2007, 2010 Oracle and/or its affiliates. All rights reserved.
    37.6 + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
    37.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    37.8   *
    37.9   * This code is free software; you can redistribute it and/or modify it