aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/macosx/native/sun/font/CCharToGlyphMapper.m8
-rw-r--r--src/share/classes/java/util/function/BinaryOperator.java2
-rw-r--r--src/share/classes/java/util/function/Block.java2
-rw-r--r--src/share/classes/java/util/function/DoubleBlock.java2
-rw-r--r--src/share/classes/java/util/function/Function.java2
-rw-r--r--src/share/classes/java/util/function/IntBlock.java2
-rw-r--r--src/share/classes/java/util/function/LongBlock.java2
-rw-r--r--src/share/classes/java/util/function/Predicate.java2
-rw-r--r--src/share/classes/sun/java2d/pipe/ParallelogramPipe.java2
-rw-r--r--src/share/classes/sun/tools/jcmd/JCmd.java3
-rw-r--r--src/share/native/java/util/zip/zlib-1.2.5/gzlib.c3
-rw-r--r--src/solaris/native/common/jdk_util_md.h2
-rw-r--r--src/solaris/native/sun/tools/attach/BsdVirtualMachine.c12
-rw-r--r--src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java2
-rw-r--r--src/windows/native/common/jdk_util_md.h2
-rw-r--r--test/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java2
-rw-r--r--test/java/awt/Focus/6981400/Test1.java2
-rw-r--r--test/java/awt/Focus/6981400/Test2.java2
-rw-r--r--test/java/awt/Focus/6981400/Test3.java2
-rw-r--r--test/java/awt/Frame/ResizeAfterSetFont/ResizeAfterSetFont.java2
-rw-r--r--test/java/awt/JAWT/JAWT.sh2
-rw-r--r--test/java/awt/JAWT/Makefile.cygwin2
-rw-r--r--test/java/awt/JAWT/Makefile.unix2
-rw-r--r--test/java/awt/JAWT/Makefile.win2
-rw-r--r--test/java/awt/JAWT/MyCanvas.java2
-rw-r--r--test/java/awt/JAWT/myfile.c2
-rw-r--r--test/java/awt/JAWT/myfile.cpp2
-rw-r--r--test/java/awt/TextArea/DisposeTest/TestDispose.java2
-rw-r--r--test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java2
-rw-r--r--test/java/awt/TextField/DisposeTest/TestDispose.java2
-rw-r--r--test/java/lang/Integer/Unsigned.java6
-rw-r--r--test/java/lang/Long/Unsigned.java6
-rw-r--r--test/java/lang/Math/CubeRootTests.java2
-rw-r--r--test/java/lang/Math/Expm1Tests.java2
-rw-r--r--test/java/lang/Math/HyperbolicTests.java2
-rw-r--r--test/java/lang/Math/Log10Tests.java2
-rw-r--r--test/java/lang/Math/Log1pTests.java2
-rw-r--r--test/java/lang/Math/Tests.java2
-rw-r--r--test/java/lang/StringBuffer/TestSynchronization.java2
-rw-r--r--test/java/lang/invoke/remote/RemoteExample.java12
-rw-r--r--test/java/math/BigDecimal/FloatDoubleValueTests.java2
-rw-r--r--test/java/math/BigDecimal/StrippingZerosTest.java2
-rw-r--r--test/java/net/Inet4Address/PingThis.java2
-rw-r--r--test/java/net/ProxySelector/MultiThreadedSystemProxies.java2
-rw-r--r--test/java/security/Signature/VerifyRangeCheckOverflow.java2
-rw-r--r--test/java/util/AbstractCollection/ToArrayTest.java2
-rw-r--r--test/java/util/Map/EntryHashCode.java2
-rw-r--r--test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java2
-rw-r--r--test/java/util/logging/LoggerResourceBundleRace.java2
-rw-r--r--test/java/util/logging/LoggingDeadlock2.java2
-rw-r--r--test/java/util/logging/LoggingDeadlock3.java2
-rw-r--r--test/java/util/logging/SimpleFormatterFormat.java2
-rw-r--r--test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB.xml6
-rw-r--r--test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB_ja.xml6
-rw-r--r--test/javax/swing/JComponent/7154030/bug7154030.java2
-rw-r--r--test/javax/swing/JTabbedPane/4310381/bug4310381.java2
-rw-r--r--test/javax/swing/JTable/4235420/bug4235420.java2
-rw-r--r--test/javax/swing/JTable/6788484/bug6788484.java2
-rw-r--r--test/javax/swing/JTable/7055065/bug7055065.java2
-rw-r--r--test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java2
-rw-r--r--test/javax/swing/JTextArea/7049024/bug7049024.java2
-rw-r--r--test/javax/swing/border/Test7022041.java9
-rw-r--r--test/javax/swing/text/DefaultCaret/6938583/bug6938583.java2
-rw-r--r--test/sun/management/AgentCMETest.java2
-rw-r--r--test/sun/management/jmxremote/startstop/JMXStartStopTest.sh2
-rw-r--r--test/sun/nio/ch/SelProvider.java2
-rw-r--r--test/sun/rmi/rmic/classpath/RMICClassPathTest.java2
-rw-r--r--test/sun/security/krb5/auto/ReplayCache.java8
-rw-r--r--test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java2
-rw-r--r--test/sun/tools/jps/jps-V_2.sh2
-rw-r--r--test/tools/jar/JarBackSlash.java2
-rw-r--r--test/tools/launcher/UnicodeTest.java2
72 files changed, 103 insertions, 98 deletions
diff --git a/src/macosx/native/sun/font/CCharToGlyphMapper.m b/src/macosx/native/sun/font/CCharToGlyphMapper.m
index e0ceb0173..77eb3b88f 100644
--- a/src/macosx/native/sun/font/CCharToGlyphMapper.m
+++ b/src/macosx/native/sun/font/CCharToGlyphMapper.m
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -16,9 +16,9 @@
* 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * 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.
*/
#import <JavaNativeFoundation/JavaNativeFoundation.h>
diff --git a/src/share/classes/java/util/function/BinaryOperator.java b/src/share/classes/java/util/function/BinaryOperator.java
index 929a2de68..37653b63b 100644
--- a/src/share/classes/java/util/function/BinaryOperator.java
+++ b/src/share/classes/java/util/function/BinaryOperator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, 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
diff --git a/src/share/classes/java/util/function/Block.java b/src/share/classes/java/util/function/Block.java
index 6b28d1868..e468396be 100644
--- a/src/share/classes/java/util/function/Block.java
+++ b/src/share/classes/java/util/function/Block.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, 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
diff --git a/src/share/classes/java/util/function/DoubleBlock.java b/src/share/classes/java/util/function/DoubleBlock.java
index 80574de09..d5abd87b8 100644
--- a/src/share/classes/java/util/function/DoubleBlock.java
+++ b/src/share/classes/java/util/function/DoubleBlock.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, 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
diff --git a/src/share/classes/java/util/function/Function.java b/src/share/classes/java/util/function/Function.java
index a65136249..ce8ab1ed2 100644
--- a/src/share/classes/java/util/function/Function.java
+++ b/src/share/classes/java/util/function/Function.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, 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
diff --git a/src/share/classes/java/util/function/IntBlock.java b/src/share/classes/java/util/function/IntBlock.java
index 27f44d6cd..e0163163e 100644
--- a/src/share/classes/java/util/function/IntBlock.java
+++ b/src/share/classes/java/util/function/IntBlock.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, 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
diff --git a/src/share/classes/java/util/function/LongBlock.java b/src/share/classes/java/util/function/LongBlock.java
index fe1ef6508..d9af3660f 100644
--- a/src/share/classes/java/util/function/LongBlock.java
+++ b/src/share/classes/java/util/function/LongBlock.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, 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
diff --git a/src/share/classes/java/util/function/Predicate.java b/src/share/classes/java/util/function/Predicate.java
index 4fea49c5a..f4e6196fb 100644
--- a/src/share/classes/java/util/function/Predicate.java
+++ b/src/share/classes/java/util/function/Predicate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, 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
diff --git a/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java b/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java
index 57a9372ec..3b6b99647 100644
--- a/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java
+++ b/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2011, 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
diff --git a/src/share/classes/sun/tools/jcmd/JCmd.java b/src/share/classes/sun/tools/jcmd/JCmd.java
index 4690a5bc4..8c5a2c502 100644
--- a/src/share/classes/sun/tools/jcmd/JCmd.java
+++ b/src/share/classes/sun/tools/jcmd/JCmd.java
@@ -1,8 +1,7 @@
/*
* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *com.sun.tools.attach.AttachNotSupportedException
-
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
diff --git a/src/share/native/java/util/zip/zlib-1.2.5/gzlib.c b/src/share/native/java/util/zip/zlib-1.2.5/gzlib.c
index d28512696..9a3db2efe 100644
--- a/src/share/native/java/util/zip/zlib-1.2.5/gzlib.c
+++ b/src/share/native/java/util/zip/zlib-1.2.5/gzlib.c
@@ -1,4 +1,5 @@
-/* NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+/*
+ * 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
diff --git a/src/solaris/native/common/jdk_util_md.h b/src/solaris/native/common/jdk_util_md.h
index 6361fe01e..b2472b3db 100644
--- a/src/solaris/native/common/jdk_util_md.h
+++ b/src/solaris/native/common/jdk_util_md.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
diff --git a/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c b/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c
index 9d46ad3fb..cf3ff2030 100644
--- a/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c
+++ b/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c
@@ -1,12 +1,12 @@
/*
- * Copyright 2005, 2012, Oracle and/or its affiliates. All Rights Reserved.
+ * Copyright (c) 2005, 2012, 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. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * 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.
*/
#include "jni.h"
diff --git a/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java b/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java
index 57a12a888..089278b66 100644
--- a/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java
+++ b/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007,2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2011, 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
diff --git a/src/windows/native/common/jdk_util_md.h b/src/windows/native/common/jdk_util_md.h
index 0bb914935..67c45a286 100644
--- a/src/windows/native/common/jdk_util_md.h
+++ b/src/windows/native/common/jdk_util_md.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
diff --git a/test/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java b/test/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java
index 3354f286f..c3f013c29 100644
--- a/test/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java
+++ b/test/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/awt/Focus/6981400/Test1.java b/test/java/awt/Focus/6981400/Test1.java
index 2be6e9788..670206397 100644
--- a/test/java/awt/Focus/6981400/Test1.java
+++ b/test/java/awt/Focus/6981400/Test1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/awt/Focus/6981400/Test2.java b/test/java/awt/Focus/6981400/Test2.java
index c41fbbd6b..fc14db233 100644
--- a/test/java/awt/Focus/6981400/Test2.java
+++ b/test/java/awt/Focus/6981400/Test2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/awt/Focus/6981400/Test3.java b/test/java/awt/Focus/6981400/Test3.java
index 268cbdf4d..a4a37b16b 100644
--- a/test/java/awt/Focus/6981400/Test3.java
+++ b/test/java/awt/Focus/6981400/Test3.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/awt/Frame/ResizeAfterSetFont/ResizeAfterSetFont.java b/test/java/awt/Frame/ResizeAfterSetFont/ResizeAfterSetFont.java
index 32ed472aa..56a931861 100644
--- a/test/java/awt/Frame/ResizeAfterSetFont/ResizeAfterSetFont.java
+++ b/test/java/awt/Frame/ResizeAfterSetFont/ResizeAfterSetFont.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/awt/JAWT/JAWT.sh b/test/java/awt/JAWT/JAWT.sh
index 607ab2fb6..70ff02b8f 100644
--- a/test/java/awt/JAWT/JAWT.sh
+++ b/test/java/awt/JAWT/JAWT.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
diff --git a/test/java/awt/JAWT/Makefile.cygwin b/test/java/awt/JAWT/Makefile.cygwin
index 82cecfe29..326d58179 100644
--- a/test/java/awt/JAWT/Makefile.cygwin
+++ b/test/java/awt/JAWT/Makefile.cygwin
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
diff --git a/test/java/awt/JAWT/Makefile.unix b/test/java/awt/JAWT/Makefile.unix
index b0dc136fc..2b3f47cb6 100644
--- a/test/java/awt/JAWT/Makefile.unix
+++ b/test/java/awt/JAWT/Makefile.unix
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
diff --git a/test/java/awt/JAWT/Makefile.win b/test/java/awt/JAWT/Makefile.win
index 82a0b0e8a..327fb2501 100644
--- a/test/java/awt/JAWT/Makefile.win
+++ b/test/java/awt/JAWT/Makefile.win
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
diff --git a/test/java/awt/JAWT/MyCanvas.java b/test/java/awt/JAWT/MyCanvas.java
index 359ade439..4bf0741cb 100644
--- a/test/java/awt/JAWT/MyCanvas.java
+++ b/test/java/awt/JAWT/MyCanvas.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/awt/JAWT/myfile.c b/test/java/awt/JAWT/myfile.c
index b6ef750d9..1a1028965 100644
--- a/test/java/awt/JAWT/myfile.c
+++ b/test/java/awt/JAWT/myfile.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/awt/JAWT/myfile.cpp b/test/java/awt/JAWT/myfile.cpp
index f5c3007eb..fc5b278ab 100644
--- a/test/java/awt/JAWT/myfile.cpp
+++ b/test/java/awt/JAWT/myfile.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/awt/TextArea/DisposeTest/TestDispose.java b/test/java/awt/TextArea/DisposeTest/TestDispose.java
index eaa912db9..91c795fbf 100644
--- a/test/java/awt/TextArea/DisposeTest/TestDispose.java
+++ b/test/java/awt/TextArea/DisposeTest/TestDispose.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java b/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java
index 188cd3fde..d3de49545 100644
--- a/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java
+++ b/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/awt/TextField/DisposeTest/TestDispose.java b/test/java/awt/TextField/DisposeTest/TestDispose.java
index a8a2fdaa9..6ef00cd21 100644
--- a/test/java/awt/TextField/DisposeTest/TestDispose.java
+++ b/test/java/awt/TextField/DisposeTest/TestDispose.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/lang/Integer/Unsigned.java b/test/java/lang/Integer/Unsigned.java
index c7b831d65..09be7bfdd 100644
--- a/test/java/lang/Integer/Unsigned.java
+++ b/test/java/lang/Integer/Unsigned.java
@@ -16,9 +16,9 @@
* 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * 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.
*/
/*
diff --git a/test/java/lang/Long/Unsigned.java b/test/java/lang/Long/Unsigned.java
index 22e50e61d..2ccbc8d50 100644
--- a/test/java/lang/Long/Unsigned.java
+++ b/test/java/lang/Long/Unsigned.java
@@ -16,9 +16,9 @@
* 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * 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.
*/
/*
diff --git a/test/java/lang/Math/CubeRootTests.java b/test/java/lang/Math/CubeRootTests.java
index 9b180d11b..abb221f1a 100644
--- a/test/java/lang/Math/CubeRootTests.java
+++ b/test/java/lang/Math/CubeRootTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
diff --git a/test/java/lang/Math/Expm1Tests.java b/test/java/lang/Math/Expm1Tests.java
index b10934e4f..e575710c6 100644
--- a/test/java/lang/Math/Expm1Tests.java
+++ b/test/java/lang/Math/Expm1Tests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
diff --git a/test/java/lang/Math/HyperbolicTests.java b/test/java/lang/Math/HyperbolicTests.java
index 0899df89d..fb9abba9a 100644
--- a/test/java/lang/Math/HyperbolicTests.java
+++ b/test/java/lang/Math/HyperbolicTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
diff --git a/test/java/lang/Math/Log10Tests.java b/test/java/lang/Math/Log10Tests.java
index a9f169a56..c7ff242be 100644
--- a/test/java/lang/Math/Log10Tests.java
+++ b/test/java/lang/Math/Log10Tests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
diff --git a/test/java/lang/Math/Log1pTests.java b/test/java/lang/Math/Log1pTests.java
index f15a92b58..56a80047a 100644
--- a/test/java/lang/Math/Log1pTests.java
+++ b/test/java/lang/Math/Log1pTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
diff --git a/test/java/lang/Math/Tests.java b/test/java/lang/Math/Tests.java
index 6b39c8a01..7dd6d6807 100644
--- a/test/java/lang/Math/Tests.java
+++ b/test/java/lang/Math/Tests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
diff --git a/test/java/lang/StringBuffer/TestSynchronization.java b/test/java/lang/StringBuffer/TestSynchronization.java
index 75b4b82f3..cde4a285d 100644
--- a/test/java/lang/StringBuffer/TestSynchronization.java
+++ b/test/java/lang/StringBuffer/TestSynchronization.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/lang/invoke/remote/RemoteExample.java b/test/java/lang/invoke/remote/RemoteExample.java
index 0829a6525..801d9b72d 100644
--- a/test/java/lang/invoke/remote/RemoteExample.java
+++ b/test/java/lang/invoke/remote/RemoteExample.java
@@ -1,12 +1,12 @@
/*
- * Copyright 2009-2010 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2009, 2010, 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. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * 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.
*/
package test.java.lang.invoke.remote;
diff --git a/test/java/math/BigDecimal/FloatDoubleValueTests.java b/test/java/math/BigDecimal/FloatDoubleValueTests.java
index f8f3f9a7c..c615b7651 100644
--- a/test/java/math/BigDecimal/FloatDoubleValueTests.java
+++ b/test/java/math/BigDecimal/FloatDoubleValueTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, 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
diff --git a/test/java/math/BigDecimal/StrippingZerosTest.java b/test/java/math/BigDecimal/StrippingZerosTest.java
index c76d0ca99..d0b1753ab 100644
--- a/test/java/math/BigDecimal/StrippingZerosTest.java
+++ b/test/java/math/BigDecimal/StrippingZerosTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
diff --git a/test/java/net/Inet4Address/PingThis.java b/test/java/net/Inet4Address/PingThis.java
index 515a873fc..d302df54b 100644
--- a/test/java/net/Inet4Address/PingThis.java
+++ b/test/java/net/Inet4Address/PingThis.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/net/ProxySelector/MultiThreadedSystemProxies.java b/test/java/net/ProxySelector/MultiThreadedSystemProxies.java
index 63a385cb0..59d04d8bb 100644
--- a/test/java/net/ProxySelector/MultiThreadedSystemProxies.java
+++ b/test/java/net/ProxySelector/MultiThreadedSystemProxies.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/security/Signature/VerifyRangeCheckOverflow.java b/test/java/security/Signature/VerifyRangeCheckOverflow.java
index 9077cc2c1..b68d8ca9b 100644
--- a/test/java/security/Signature/VerifyRangeCheckOverflow.java
+++ b/test/java/security/Signature/VerifyRangeCheckOverflow.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/util/AbstractCollection/ToArrayTest.java b/test/java/util/AbstractCollection/ToArrayTest.java
index 1cbf66fdf..fd19f1672 100644
--- a/test/java/util/AbstractCollection/ToArrayTest.java
+++ b/test/java/util/AbstractCollection/ToArrayTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/util/Map/EntryHashCode.java b/test/java/util/Map/EntryHashCode.java
index 98ef36500..d3efc8c7d 100644
--- a/test/java/util/Map/EntryHashCode.java
+++ b/test/java/util/Map/EntryHashCode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java b/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java
index c1b81c286..c96c43b5b 100644
--- a/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java
+++ b/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/java/util/logging/LoggerResourceBundleRace.java b/test/java/util/logging/LoggerResourceBundleRace.java
index e159a2dde..aabbc140f 100644
--- a/test/java/util/logging/LoggerResourceBundleRace.java
+++ b/test/java/util/logging/LoggerResourceBundleRace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, 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
diff --git a/test/java/util/logging/LoggingDeadlock2.java b/test/java/util/logging/LoggingDeadlock2.java
index 8c83ae90c..de328e768 100644
--- a/test/java/util/logging/LoggingDeadlock2.java
+++ b/test/java/util/logging/LoggingDeadlock2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2012, 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
diff --git a/test/java/util/logging/LoggingDeadlock3.java b/test/java/util/logging/LoggingDeadlock3.java
index 73162d58b..4bbb3d377 100644
--- a/test/java/util/logging/LoggingDeadlock3.java
+++ b/test/java/util/logging/LoggingDeadlock3.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, 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
diff --git a/test/java/util/logging/SimpleFormatterFormat.java b/test/java/util/logging/SimpleFormatterFormat.java
index 4fafba3b7..a041c0d3c 100644
--- a/test/java/util/logging/SimpleFormatterFormat.java
+++ b/test/java/util/logging/SimpleFormatterFormat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, 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
diff --git a/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB.xml b/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB.xml
index ef00b6466..689df75b8 100644
--- a/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB.xml
+++ b/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB.xml
@@ -5,13 +5,13 @@
This code is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation. Oracle designates this
- particular file as subject to the Classpath exception as provided
+ published by the Free Software Foundation. Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
by Oracle in the LICENSE file that accompanied this code.
This code is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ 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).
diff --git a/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB_ja.xml b/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB_ja.xml
index 08b55b21b..fb273f53c 100644
--- a/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB_ja.xml
+++ b/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB_ja.xml
@@ -5,13 +5,13 @@
This code is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation. Oracle designates this
- particular file as subject to the Classpath exception as provided
+ published by the Free Software Foundation. Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
by Oracle in the LICENSE file that accompanied this code.
This code is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ 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).
diff --git a/test/javax/swing/JComponent/7154030/bug7154030.java b/test/javax/swing/JComponent/7154030/bug7154030.java
index 50007435b..ade828061 100644
--- a/test/javax/swing/JComponent/7154030/bug7154030.java
+++ b/test/javax/swing/JComponent/7154030/bug7154030.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/javax/swing/JTabbedPane/4310381/bug4310381.java b/test/javax/swing/JTabbedPane/4310381/bug4310381.java
index aa5702001..ccc3bc094 100644
--- a/test/javax/swing/JTabbedPane/4310381/bug4310381.java
+++ b/test/javax/swing/JTabbedPane/4310381/bug4310381.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/javax/swing/JTable/4235420/bug4235420.java b/test/javax/swing/JTable/4235420/bug4235420.java
index 388bb0760..dafd5ca58 100644
--- a/test/javax/swing/JTable/4235420/bug4235420.java
+++ b/test/javax/swing/JTable/4235420/bug4235420.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/javax/swing/JTable/6788484/bug6788484.java b/test/javax/swing/JTable/6788484/bug6788484.java
index 392bc9450..cf7c65b6b 100644
--- a/test/javax/swing/JTable/6788484/bug6788484.java
+++ b/test/javax/swing/JTable/6788484/bug6788484.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, 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
diff --git a/test/javax/swing/JTable/7055065/bug7055065.java b/test/javax/swing/JTable/7055065/bug7055065.java
index 119d9a576..0e611e42a 100644
--- a/test/javax/swing/JTable/7055065/bug7055065.java
+++ b/test/javax/swing/JTable/7055065/bug7055065.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java b/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java
index 51ea97726..da9262f95 100644
--- a/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java
+++ b/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/javax/swing/JTextArea/7049024/bug7049024.java b/test/javax/swing/JTextArea/7049024/bug7049024.java
index e6398b2f0..ce9797a42 100644
--- a/test/javax/swing/JTextArea/7049024/bug7049024.java
+++ b/test/javax/swing/JTextArea/7049024/bug7049024.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
diff --git a/test/javax/swing/border/Test7022041.java b/test/javax/swing/border/Test7022041.java
index cccd90ed1..1a8b12c7c 100644
--- a/test/javax/swing/border/Test7022041.java
+++ b/test/javax/swing/border/Test7022041.java
@@ -1,11 +1,12 @@
/*
- * Copyright 2012 Red Hat, Inc. All Rights Reserved.
* Copyright (c) 2012, 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.
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,6 +17,10 @@
* 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.
*/
import java.awt.Color;
diff --git a/test/javax/swing/text/DefaultCaret/6938583/bug6938583.java b/test/javax/swing/text/DefaultCaret/6938583/bug6938583.java
index c5c487139..d7dc176ea 100644
--- a/test/javax/swing/text/DefaultCaret/6938583/bug6938583.java
+++ b/test/javax/swing/text/DefaultCaret/6938583/bug6938583.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
diff --git a/test/sun/management/AgentCMETest.java b/test/sun/management/AgentCMETest.java
index f8bfd5355..fa4769630 100644
--- a/test/sun/management/AgentCMETest.java
+++ b/test/sun/management/AgentCMETest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh b/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh
index 6d48e1720..886ef2f05 100644
--- a/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh
+++ b/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, 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
diff --git a/test/sun/nio/ch/SelProvider.java b/test/sun/nio/ch/SelProvider.java
index 1674120b5..259a098cc 100644
--- a/test/sun/nio/ch/SelProvider.java
+++ b/test/sun/nio/ch/SelProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, 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
diff --git a/test/sun/rmi/rmic/classpath/RMICClassPathTest.java b/test/sun/rmi/rmic/classpath/RMICClassPathTest.java
index a79d21b83..f4c64b75d 100644
--- a/test/sun/rmi/rmic/classpath/RMICClassPathTest.java
+++ b/test/sun/rmi/rmic/classpath/RMICClassPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/sun/security/krb5/auto/ReplayCache.java b/test/sun/security/krb5/auto/ReplayCache.java
index 1f6411cfd..c29219ad2 100644
--- a/test/sun/security/krb5/auto/ReplayCache.java
+++ b/test/sun/security/krb5/auto/ReplayCache.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2012, 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
@@ -16,9 +16,9 @@
* 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * 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.
*/
/*
diff --git a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java
index dc50bc9f2..360dfeeb3 100644
--- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java
+++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
diff --git a/test/sun/tools/jps/jps-V_2.sh b/test/sun/tools/jps/jps-V_2.sh
index fe0cc400c..2e670d2e6 100644
--- a/test/sun/tools/jps/jps-V_2.sh
+++ b/test/sun/tools/jps/jps-V_2.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011,Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2011, 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
diff --git a/test/tools/jar/JarBackSlash.java b/test/tools/jar/JarBackSlash.java
index 406291317..5975e4e54 100644
--- a/test/tools/jar/JarBackSlash.java
+++ b/test/tools/jar/JarBackSlash.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/test/tools/launcher/UnicodeTest.java b/test/tools/launcher/UnicodeTest.java
index d44582df1..15213f168 100644
--- a/test/tools/launcher/UnicodeTest.java
+++ b/test/tools/launcher/UnicodeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2012, 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