6956202: Fix a few missed rebranding issues, please contact lines etc.

Reviewed-by: jjg, darcy, weijun

6956202: Fix a few missed rebranding issues, please contact lines etc.
Reviewed-by: jjg, darcy, weijun
04e4de5e · ohair · 869b1bd5 · 04e4de5e · 04e4de5e · 04e4de5e
141 changed file
--- a/make/common/Subdirs.gmk
+++ b/make/common/Subdirs.gmk
@@ -19,7 +19,7 @@
 #
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
-# have any questions
+# questions.
 #
 #

--- a/src/share/classes/com/sun/jarsigner/package.html
+++ b/src/share/classes/com/sun/jarsigner/package.html
@@ -20,9 +20,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
  <head>
    <title>Jarsigner Signing Mechanism Package</title>

--- a/src/share/classes/com/sun/java/util/jar/pack/package.html
+++ b/src/share/classes/com/sun/java/util/jar/pack/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/com/sun/jdi/connect/package.html
+++ b/src/share/classes/com/sun/jdi/connect/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/com/sun/jdi/connect/spi/package.html
+++ b/src/share/classes/com/sun/jdi/connect/spi/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/com/sun/jdi/event/package.html
+++ b/src/share/classes/com/sun/jdi/event/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/com/sun/jdi/package.html
+++ b/src/share/classes/com/sun/jdi/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/com/sun/jdi/request/package.html
+++ b/src/share/classes/com/sun/jdi/request/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/com/sun/jmx/defaults/package.html
+++ b/src/share/classes/com/sun/jmx/defaults/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/com/sun/jmx/interceptor/package.html
+++ b/src/share/classes/com/sun/jmx/interceptor/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/com/sun/jmx/mbeanserver/package.html
+++ b/src/share/classes/com/sun/jmx/mbeanserver/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/com/sun/jmx/remote/internal/package.html
+++ b/src/share/classes/com/sun/jmx/remote/internal/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </HEAD>
 <BODY>

--- a/src/share/classes/com/sun/jmx/snmp/agent/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/agent/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </HEAD>
 <BODY>

--- a/src/share/classes/com/sun/jmx/snmp/daemon/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/daemon/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </HEAD>
 <BODY>

--- a/src/share/classes/com/sun/jmx/snmp/defaults/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/defaults/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </HEAD>
 <BODY>

--- a/src/share/classes/com/sun/jmx/snmp/internal/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/internal/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </HEAD>
 <BODY>

--- a/src/share/classes/com/sun/jmx/snmp/mpm/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/mpm/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </HEAD>
 <BODY>

--- a/src/share/classes/com/sun/jmx/snmp/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </HEAD>
 <BODY>

--- a/src/share/classes/com/sun/jmx/snmp/tasks/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/tasks/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </HEAD>
 <BODY>

--- a/src/share/classes/com/sun/management/mgmt-overview.html
+++ b/src/share/classes/com/sun/management/mgmt-overview.html
@@ -24,9 +24,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
  </head>

--- a/src/share/classes/com/sun/management/package.html
+++ b/src/share/classes/com/sun/management/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/com/sun/net/ssl/package.html
+++ b/src/share/classes/com/sun/net/ssl/package.html
@@ -23,9 +23,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->

--- a/src/share/classes/com/sun/rowset/providers/package.html
+++ b/src/share/classes/com/sun/rowset/providers/package.html
@@ -28,9 +28,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
  <title>javax.sql.rowset.providers Package</title>
 </head>

--- a/src/share/classes/com/sun/servicetag/package.html
+++ b/src/share/classes/com/sun/servicetag/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->

--- a/src/share/classes/com/sun/servicetag/resources/register.html
+++ b/src/share/classes/com/sun/servicetag/resources/register.html
@@ -25,9 +25,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <style type="text/css">

--- a/src/share/classes/com/sun/servicetag/resources/register_ja.html
+++ b/src/share/classes/com/sun/servicetag/resources/register_ja.html
@@ -25,9 +25,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <style type="text/css">

--- a/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html
+++ b/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html
@@ -25,9 +25,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <style type="text/css">

--- a/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html
+++ b/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html
@@ -18,9 +18,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <html>

--- a/src/share/classes/java/security/acl/package.html
+++ b/src/share/classes/java/security/acl/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/java/security/package.html
+++ b/src/share/classes/java/security/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/java/security/spec/package.html
+++ b/src/share/classes/java/security/spec/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/java/sql/package.html
+++ b/src/share/classes/java/sql/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/java/text/package.html
+++ b/src/share/classes/java/text/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/java/text/spi/package.html
+++ b/src/share/classes/java/text/spi/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/java/util/jar/package.html
+++ b/src/share/classes/java/util/jar/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/java/util/logging/package.html
+++ b/src/share/classes/java/util/logging/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/java/util/package.html
+++ b/src/share/classes/java/util/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/java/util/prefs/package.html
+++ b/src/share/classes/java/util/prefs/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/java/util/regex/package.html
+++ b/src/share/classes/java/util/regex/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/java/util/spi/package.html
+++ b/src/share/classes/java/util/spi/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/java/util/zip/package.html
+++ b/src/share/classes/java/util/zip/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/accessibility/package.html
+++ b/src/share/classes/javax/accessibility/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </HEAD>
 <BODY BGCOLOR="#FFFFFF">

--- a/src/share/classes/javax/crypto/interfaces/package.html
+++ b/src/share/classes/javax/crypto/interfaces/package.html
@@ -18,9 +18,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">

--- a/src/share/classes/javax/crypto/package.html
+++ b/src/share/classes/javax/crypto/package.html
@@ -18,9 +18,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">

--- a/src/share/classes/javax/crypto/spec/package.html
+++ b/src/share/classes/javax/crypto/spec/package.html
@@ -18,9 +18,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">

--- a/src/share/classes/javax/imageio/event/package.html
+++ b/src/share/classes/javax/imageio/event/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html
+++ b/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <title>BMP Metadata Format Specification</title>

--- a/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
+++ b/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <title>GIF Metadata Format Specification</title>

--- a/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
+++ b/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <title>JPEG Metadata Format Specification and Usage Notes</title>

--- a/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html
+++ b/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <title>PNG Metadata Format Specification</title>

--- a/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html
+++ b/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <title>Standard Metadata Format Specification</title>

--- a/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html
+++ b/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <title>WBMP Metadata Format Specification</title>

--- a/src/share/classes/javax/imageio/metadata/package.html
+++ b/src/share/classes/javax/imageio/metadata/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/imageio/package.html
+++ b/src/share/classes/javax/imageio/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/imageio/plugins/bmp/package.html
+++ b/src/share/classes/javax/imageio/plugins/bmp/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/imageio/plugins/jpeg/package.html
+++ b/src/share/classes/javax/imageio/plugins/jpeg/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/imageio/spi/package.html
+++ b/src/share/classes/javax/imageio/spi/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/imageio/stream/package.html
+++ b/src/share/classes/javax/imageio/stream/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/management/build.xml
+++ b/src/share/classes/javax/management/build.xml
@@ -51,7 +51,7 @@
     -->
    <description>
-	Copyright 2006 Sun Microsystems, Inc.  All rights reserved. Use is subject to license terms.
+        Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
        Description: JMX API Version 1.4 - Source Code from Java SE 6
    </description>

--- a/src/share/classes/javax/management/loading/package.html
+++ b/src/share/classes/javax/management/loading/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/management/modelmbean/package.html
+++ b/src/share/classes/javax/management/modelmbean/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/management/monitor/package.html
+++ b/src/share/classes/javax/management/monitor/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/management/openmbean/package.html
+++ b/src/share/classes/javax/management/openmbean/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/management/package.html
+++ b/src/share/classes/javax/management/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
        -->
    </head>
    <body bgcolor="white">

--- a/src/share/classes/javax/management/relation/package.html
+++ b/src/share/classes/javax/management/relation/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/management/remote/package.html
+++ b/src/share/classes/javax/management/remote/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/management/remote/rmi/package.html
+++ b/src/share/classes/javax/management/remote/rmi/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/management/timer/package.html
+++ b/src/share/classes/javax/management/timer/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/naming/directory/package.html
+++ b/src/share/classes/javax/naming/directory/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/naming/event/package.html
+++ b/src/share/classes/javax/naming/event/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/naming/ldap/package.html
+++ b/src/share/classes/javax/naming/ldap/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/naming/package.html
+++ b/src/share/classes/javax/naming/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/naming/spi/package.html
+++ b/src/share/classes/javax/naming/spi/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/net/package.html
+++ b/src/share/classes/javax/net/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/net/ssl/package.html
+++ b/src/share/classes/javax/net/ssl/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/print/attribute/package.html
+++ b/src/share/classes/javax/print/attribute/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/print/attribute/standard/package.html
+++ b/src/share/classes/javax/print/attribute/standard/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/print/event/package.html
+++ b/src/share/classes/javax/print/event/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/print/package.html
+++ b/src/share/classes/javax/print/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/rmi/ssl/package.html
+++ b/src/share/classes/javax/rmi/ssl/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/script/package.html
+++ b/src/share/classes/javax/script/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/security/auth/callback/package.html
+++ b/src/share/classes/javax/security/auth/callback/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/security/auth/kerberos/package.html
+++ b/src/share/classes/javax/security/auth/kerberos/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/security/auth/login/package.html
+++ b/src/share/classes/javax/security/auth/login/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/security/auth/package.html
+++ b/src/share/classes/javax/security/auth/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/security/auth/spi/package.html
+++ b/src/share/classes/javax/security/auth/spi/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/security/auth/x500/package.html
+++ b/src/share/classes/javax/security/auth/x500/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/security/cert/package.html
+++ b/src/share/classes/javax/security/cert/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/security/sasl/package.html
+++ b/src/share/classes/javax/security/sasl/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/sound/midi/package.html
+++ b/src/share/classes/javax/sound/midi/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/sound/midi/spi/package.html
+++ b/src/share/classes/javax/sound/midi/spi/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/sound/sampled/package.html
+++ b/src/share/classes/javax/sound/sampled/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/sound/sampled/spi/package.html
+++ b/src/share/classes/javax/sound/sampled/spi/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/sql/package.html
+++ b/src/share/classes/javax/sql/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/sql/rowset/package.html
+++ b/src/share/classes/javax/sql/rowset/package.html
@@ -24,9 +24,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
  <title>javax.sql.rowset Package</title>

--- a/src/share/classes/javax/sql/rowset/serial/package.html
+++ b/src/share/classes/javax/sql/rowset/serial/package.html
@@ -27,9 +27,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 <title>javax.sql.rowset.serial</title>
 </head>

--- a/src/share/classes/javax/sql/rowset/spi/package.html
+++ b/src/share/classes/javax/sql/rowset/spi/package.html
@@ -27,9 +27,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
  <title>javax.sql.rowset.spi</title>

--- a/src/share/classes/javax/swing/border/package.html
+++ b/src/share/classes/javax/swing/border/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/colorchooser/package.html
+++ b/src/share/classes/javax/swing/colorchooser/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>
 <body bgcolor="white">

--- a/src/share/classes/javax/swing/event/package.html
+++ b/src/share/classes/javax/swing/event/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/filechooser/package.html
+++ b/src/share/classes/javax/swing/filechooser/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/package.html
+++ b/src/share/classes/javax/swing/package.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
        <META NAME="Author" Content="Eric Armstrong">

--- a/src/share/classes/javax/swing/plaf/basic/package.html
+++ b/src/share/classes/javax/swing/plaf/basic/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/plaf/metal/package.html
+++ b/src/share/classes/javax/swing/plaf/metal/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/plaf/multi/package.html
+++ b/src/share/classes/javax/swing/plaf/multi/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/plaf/nimbus/package.html
+++ b/src/share/classes/javax/swing/plaf/nimbus/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/plaf/package.html
+++ b/src/share/classes/javax/swing/plaf/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
+++ b/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/plaf/synth/package.html
+++ b/src/share/classes/javax/swing/plaf/synth/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->

--- a/src/share/classes/javax/swing/table/package.html
+++ b/src/share/classes/javax/swing/table/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/text/html/package.html
+++ b/src/share/classes/javax/swing/text/html/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/text/html/parser/package.html
+++ b/src/share/classes/javax/swing/text/html/parser/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/text/package.html
+++ b/src/share/classes/javax/swing/text/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/text/rtf/package.html
+++ b/src/share/classes/javax/swing/text/rtf/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/tree/package.html
+++ b/src/share/classes/javax/swing/tree/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/swing/undo/package.html
+++ b/src/share/classes/javax/swing/undo/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/xml/crypto/dom/package.html
+++ b/src/share/classes/javax/xml/crypto/dom/package.html
@@ -20,9 +20,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/xml/crypto/dsig/dom/package.html
+++ b/src/share/classes/javax/xml/crypto/dsig/dom/package.html
@@ -20,9 +20,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html
+++ b/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html
@@ -20,9 +20,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/xml/crypto/dsig/package.html
+++ b/src/share/classes/javax/xml/crypto/dsig/package.html
@@ -20,9 +20,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/xml/crypto/dsig/spec/package.html
+++ b/src/share/classes/javax/xml/crypto/dsig/spec/package.html
@@ -20,9 +20,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/javax/xml/crypto/package.html
+++ b/src/share/classes/javax/xml/crypto/package.html
@@ -20,9 +20,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/org/ietf/jgss/package.html
+++ b/src/share/classes/org/ietf/jgss/package.html
@@ -21,9 +21,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/share/classes/overview-core.html
+++ b/src/share/classes/overview-core.html
@@ -22,9 +22,9 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-CA 95054 USA or visit www.sun.com if you need additional information or
+or visit www.oracle.com if you need additional information or have any
-have any questions.
+questions.
 -->
 </head>

--- a/src/solaris/classes/sun/awt/X11/keysym2ucs.h
+++ b/src/solaris/classes/sun/awt/X11/keysym2ucs.h
@@ -39,7 +39,7 @@
 */
 tojava /*
-tojava  * Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
+tojava  * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
 tojava  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 tojava  *
 tojava  * This code is free software; you can redistribute it and/or modify it

--- a/test/java/awt/font/LineBreakMeasurer/FRCTest.java
+++ b/test/java/awt/font/LineBreakMeasurer/FRCTest.java
 /*
- * Copyright 2008-9 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2008, 2009, 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

--- a/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java
+++ b/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java
 /*
- * 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,
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * CA 95054 USA or visit www.sun.com if you need additional information or
+ * or visit www.oracle.com if you need additional information or have any
- * have any questions.
+ * questions.
 */
 /*

--- a/test/java/beans/XMLEncoder/java_awt_Component.java
+++ b/test/java/beans/XMLEncoder/java_awt_Component.java
 /*
- * 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,
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * CA 95054 USA or visit www.sun.com if you need additional information or
+ * or visit www.oracle.com if you need additional information or have any
- * have any questions.
+ * questions.
 */
 /*
@@ -56,3 +56,4 @@ public final class java_awt_Component extends AbstractTest<Component> {
    public static final class MyComponent extends Component {
    }
 }
--- a/test/java/lang/ClassLoader/getdotresource.sh
+++ b/test/java/lang/ClassLoader/getdotresource.sh
 #! /bin/sh
 #
-# Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 1999, 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
@@ -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,
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# CA 95054 USA or visit www.sun.com if you need additional information or
+# or visit www.oracle.com if you need additional information or have any
-# have any questions.
+# questions.
 #
 #
@@ -34,3 +34,4 @@ if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi
 # now start the test
 ${TESTJAVA}/bin/java -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetDotResource
--- a/test/java/lang/Runtime/exec/setcwd.sh
+++ b/test/java/lang/Runtime/exec/setcwd.sh
 #! /bin/sh
 #
-# Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 1999, 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
@@ -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,
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# CA 95054 USA or visit www.sun.com if you need additional information or
+# or visit www.oracle.com if you need additional information or have any
-# have any questions.
+# questions.
 #
 #
@@ -38,3 +38,4 @@ cp ${TESTCLASSES}/SetCwd.class foo
 # now start the test
 ${TESTJAVA}/bin/java SetCwd
--- a/test/java/util/ResourceBundle/Bug4083270Test.properties
+++ b/test/java/util/ResourceBundle/Bug4083270Test.properties
 # 
-# Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2007, 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,8 +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,
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# CA 95054 USA or visit www.sun.com if you need additional information or
+# or visit www.oracle.com if you need additional information or have any
-# have any questions.
+# questions.
 #
 Bug4179221Test=Bug4179221Test
--- a/test/java/util/ResourceBundle/Bug4168625Test.java
+++ b/test/java/util/ResourceBundle/Bug4168625Test.java
@@ -32,10 +32,6 @@
 *
 * (C) Copyright IBM Corp. 1999 - All Rights Reserved
 *
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
 * This software is the confidential and proprietary information
 * of Sun Microsystems, Inc. ("Confidential Information").  You
 * shall not disclose such Confidential Information and shall use

--- a/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java
+++ b/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2007, 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,
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * CA 95054 USA or visit www.sun.com if you need additional information or
+ * or visit www.oracle.com if you need additional information or have any
- * have any questions.
+ * questions.
 */
 /* @test
@@ -111,3 +111,4 @@ public class Interpolate {
            fail("Interpolation failed, error="+max);
    }
 }
--- a/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java
+++ b/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2007, 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,
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * CA 95054 USA or visit www.sun.com if you need additional information or
+ * or visit www.oracle.com if you need additional information or have any
- * have any questions.
+ * questions.
 */
 /* @test
@@ -111,3 +111,4 @@ public class Interpolate {
            fail("Interpolation failed, error="+max);
    }
 }
--- a/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java
+++ b/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2007, 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,
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * CA 95054 USA or visit www.sun.com if you need additional information or
+ * or visit www.oracle.com if you need additional information or have any
- * have any questions.
+ * questions.
 */
 /* @test
@@ -111,3 +111,4 @@ public class Interpolate {
            fail("Interpolation failed, error="+max);
    }
 }
--- a/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java
+++ b/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2007, 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,
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * CA 95054 USA or visit www.sun.com if you need additional information or
+ * or visit www.oracle.com if you need additional information or have any
- * have any questions.
+ * questions.
 */
 /* @test
@@ -111,3 +111,4 @@ public class Interpolate {
            fail("Interpolation failed, error="+max);
    }
 }
--- a/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java
+++ b/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2009, 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,
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * CA 95054 USA or visit www.sun.com if you need additional information or
+ * or visit www.oracle.com if you need additional information or have any
- * have any questions.
+ * questions.
 */
 /* @test
@@ -46,3 +46,4 @@ public class GetMidiDevice {
        synth.close();
    }
 }
--- a/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java
+++ b/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2007, 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,
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * CA 95054 USA or visit www.sun.com if you need additional information or
+ * or visit www.oracle.com if you need additional information or have any
- * have any questions.
+ * questions.
 */
 /* @test
@@ -111,3 +111,4 @@ public class Interpolate {
            fail("Interpolation failed, error="+max);
    }
 }
--- a/test/javax/swing/JTable/Test6888156.java
+++ b/test/javax/swing/JTable/Test6888156.java
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2007, 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,
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * CA 95054 USA or visit www.sun.com if you need additional information or
+ * or visit www.oracle.com if you need additional information or have any
- * have any questions.
+ * questions.
 */
 /* @test
@@ -96,3 +96,4 @@ public class Test6888156 {
        t.test(new com.sun.java.swing.plaf.gtk.GTKLookAndFeel());
    }
 }
--- a/test/sun/net/www/protocol/jar/getcontenttype.sh
+++ b/test/sun/net/www/protocol/jar/getcontenttype.sh
 #! /bin/sh
 #
-# Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 1999, 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
@@ -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,
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# CA 95054 USA or visit www.sun.com if you need additional information or
+# or visit www.oracle.com if you need additional information or have any
-# have any questions.
+# questions.
 #
 #
@@ -34,3 +34,4 @@ if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi
 # now start the test
 ${TESTJAVA}/bin/java -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetContentType