diff --git a/src/share/classes/com/sun/jarsigner/package.html b/src/share/classes/com/sun/jarsigner/package.html
--- a/src/share/classes/com/sun/jarsigner/package.html
+++ b/src/share/classes/com/sun/jarsigner/package.html
@@ -20,9 +20,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
Jarsigner Signing Mechanism Package
diff --git a/src/share/classes/com/sun/java/swing/plaf/nimbus/package.html b/src/share/classes/com/sun/java/swing/plaf/nimbus/package.html
--- a/src/share/classes/com/sun/java/swing/plaf/nimbus/package.html
+++ b/src/share/classes/com/sun/java/swing/plaf/nimbus/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/java/util/jar/pack/package.html b/src/share/classes/com/sun/java/util/jar/pack/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jdi/connect/package.html b/src/share/classes/com/sun/jdi/connect/package.html
--- a/src/share/classes/com/sun/jdi/connect/package.html
+++ b/src/share/classes/com/sun/jdi/connect/package.html
@@ -22,9 +22,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jdi/connect/spi/package.html b/src/share/classes/com/sun/jdi/connect/spi/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jdi/event/package.html b/src/share/classes/com/sun/jdi/event/package.html
--- a/src/share/classes/com/sun/jdi/event/package.html
+++ b/src/share/classes/com/sun/jdi/event/package.html
@@ -22,9 +22,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jdi/package.html b/src/share/classes/com/sun/jdi/package.html
--- a/src/share/classes/com/sun/jdi/package.html
+++ b/src/share/classes/com/sun/jdi/package.html
@@ -22,9 +22,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jdi/request/package.html b/src/share/classes/com/sun/jdi/request/package.html
--- a/src/share/classes/com/sun/jdi/request/package.html
+++ b/src/share/classes/com/sun/jdi/request/package.html
@@ -22,9 +22,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jmx/defaults/package.html b/src/share/classes/com/sun/jmx/defaults/package.html
--- a/src/share/classes/com/sun/jmx/defaults/package.html
+++ b/src/share/classes/com/sun/jmx/defaults/package.html
@@ -22,9 +22,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jmx/interceptor/package.html b/src/share/classes/com/sun/jmx/interceptor/package.html
--- a/src/share/classes/com/sun/jmx/interceptor/package.html
+++ b/src/share/classes/com/sun/jmx/interceptor/package.html
@@ -22,9 +22,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jmx/mbeanserver/package.html b/src/share/classes/com/sun/jmx/mbeanserver/package.html
--- a/src/share/classes/com/sun/jmx/mbeanserver/package.html
+++ b/src/share/classes/com/sun/jmx/mbeanserver/package.html
@@ -22,9 +22,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jmx/remote/internal/package.html b/src/share/classes/com/sun/jmx/remote/internal/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html b/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jmx/snmp/agent/package.html b/src/share/classes/com/sun/jmx/snmp/agent/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jmx/snmp/daemon/package.html b/src/share/classes/com/sun/jmx/snmp/daemon/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jmx/snmp/defaults/package.html b/src/share/classes/com/sun/jmx/snmp/defaults/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jmx/snmp/internal/package.html b/src/share/classes/com/sun/jmx/snmp/internal/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jmx/snmp/mpm/package.html b/src/share/classes/com/sun/jmx/snmp/mpm/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jmx/snmp/package.html b/src/share/classes/com/sun/jmx/snmp/package.html
--- a/src/share/classes/com/sun/jmx/snmp/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/jmx/snmp/tasks/package.html b/src/share/classes/com/sun/jmx/snmp/tasks/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/management/mgmt-overview.html b/src/share/classes/com/sun/management/mgmt-overview.html
--- a/src/share/classes/com/sun/management/mgmt-overview.html
+++ b/src/share/classes/com/sun/management/mgmt-overview.html
@@ -24,9 +24,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/management/package.html b/src/share/classes/com/sun/management/package.html
--- a/src/share/classes/com/sun/management/package.html
+++ b/src/share/classes/com/sun/management/package.html
@@ -22,9 +22,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/net/ssl/package.html b/src/share/classes/com/sun/net/ssl/package.html
--- a/src/share/classes/com/sun/net/ssl/package.html
+++ b/src/share/classes/com/sun/net/ssl/package.html
@@ -23,9 +23,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/com/sun/rowset/providers/package.html b/src/share/classes/com/sun/rowset/providers/package.html
--- a/src/share/classes/com/sun/rowset/providers/package.html
+++ b/src/share/classes/com/sun/rowset/providers/package.html
@@ -28,9 +28,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
javax.sql.rowset.providers Package
diff --git a/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html b/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/security/acl/package.html b/src/share/classes/java/security/acl/package.html
--- a/src/share/classes/java/security/acl/package.html
+++ b/src/share/classes/java/security/acl/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/security/package.html b/src/share/classes/java/security/package.html
--- a/src/share/classes/java/security/package.html
+++ b/src/share/classes/java/security/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/security/spec/package.html b/src/share/classes/java/security/spec/package.html
--- a/src/share/classes/java/security/spec/package.html
+++ b/src/share/classes/java/security/spec/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/sql/package.html b/src/share/classes/java/sql/package.html
--- a/src/share/classes/java/sql/package.html
+++ b/src/share/classes/java/sql/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/text/package.html b/src/share/classes/java/text/package.html
--- a/src/share/classes/java/text/package.html
+++ b/src/share/classes/java/text/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/text/spi/package.html b/src/share/classes/java/text/spi/package.html
--- a/src/share/classes/java/text/spi/package.html
+++ b/src/share/classes/java/text/spi/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java b/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
--- a/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
+++ b/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
@@ -28,9 +28,6 @@
* Expert Group. Adapted and released, under explicit permission,
* from JDK ArrayList.java which carries the following copyright:
*
- * Copyright 1997 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
*/
package java.util.concurrent;
diff --git a/src/share/classes/java/util/jar/package.html b/src/share/classes/java/util/jar/package.html
--- a/src/share/classes/java/util/jar/package.html
+++ b/src/share/classes/java/util/jar/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/util/logging/package.html b/src/share/classes/java/util/logging/package.html
--- a/src/share/classes/java/util/logging/package.html
+++ b/src/share/classes/java/util/logging/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/util/package.html b/src/share/classes/java/util/package.html
--- a/src/share/classes/java/util/package.html
+++ b/src/share/classes/java/util/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/util/prefs/package.html b/src/share/classes/java/util/prefs/package.html
--- a/src/share/classes/java/util/prefs/package.html
+++ b/src/share/classes/java/util/prefs/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/util/regex/package.html b/src/share/classes/java/util/regex/package.html
--- a/src/share/classes/java/util/regex/package.html
+++ b/src/share/classes/java/util/regex/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/util/spi/package.html b/src/share/classes/java/util/spi/package.html
--- a/src/share/classes/java/util/spi/package.html
+++ b/src/share/classes/java/util/spi/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/java/util/zip/package.html b/src/share/classes/java/util/zip/package.html
--- a/src/share/classes/java/util/zip/package.html
+++ b/src/share/classes/java/util/zip/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/accessibility/package.html b/src/share/classes/javax/accessibility/package.html
--- a/src/share/classes/javax/accessibility/package.html
+++ b/src/share/classes/javax/accessibility/package.html
@@ -22,9 +22,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/crypto/interfaces/package.html b/src/share/classes/javax/crypto/interfaces/package.html
--- a/src/share/classes/javax/crypto/interfaces/package.html
+++ b/src/share/classes/javax/crypto/interfaces/package.html
@@ -18,9 +18,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/crypto/package.html b/src/share/classes/javax/crypto/package.html
--- a/src/share/classes/javax/crypto/package.html
+++ b/src/share/classes/javax/crypto/package.html
@@ -18,9 +18,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/crypto/spec/package.html b/src/share/classes/javax/crypto/spec/package.html
--- a/src/share/classes/javax/crypto/spec/package.html
+++ b/src/share/classes/javax/crypto/spec/package.html
@@ -18,9 +18,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/imageio/event/package.html b/src/share/classes/javax/imageio/event/package.html
--- a/src/share/classes/javax/imageio/event/package.html
+++ b/src/share/classes/javax/imageio/event/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html b/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
BMP Metadata Format Specification
diff --git a/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html b/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
GIF Metadata Format Specification
diff --git a/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html b/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
JPEG Metadata Format Specification and Usage Notes
diff --git a/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html b/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
PNG Metadata Format Specification
diff --git a/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html b/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
Standard Metadata Format Specification
diff --git a/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html b/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
WBMP Metadata Format Specification
diff --git a/src/share/classes/javax/imageio/metadata/package.html b/src/share/classes/javax/imageio/metadata/package.html
--- a/src/share/classes/javax/imageio/metadata/package.html
+++ b/src/share/classes/javax/imageio/metadata/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/imageio/package.html b/src/share/classes/javax/imageio/package.html
--- a/src/share/classes/javax/imageio/package.html
+++ b/src/share/classes/javax/imageio/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/imageio/plugins/bmp/package.html b/src/share/classes/javax/imageio/plugins/bmp/package.html
--- a/src/share/classes/javax/imageio/plugins/bmp/package.html
+++ b/src/share/classes/javax/imageio/plugins/bmp/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/imageio/plugins/jpeg/package.html b/src/share/classes/javax/imageio/plugins/jpeg/package.html
--- a/src/share/classes/javax/imageio/plugins/jpeg/package.html
+++ b/src/share/classes/javax/imageio/plugins/jpeg/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/imageio/spi/package.html b/src/share/classes/javax/imageio/spi/package.html
--- a/src/share/classes/javax/imageio/spi/package.html
+++ b/src/share/classes/javax/imageio/spi/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/imageio/stream/package.html b/src/share/classes/javax/imageio/stream/package.html
--- a/src/share/classes/javax/imageio/stream/package.html
+++ b/src/share/classes/javax/imageio/stream/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/management/build.xml b/src/share/classes/javax/management/build.xml
--- a/src/share/classes/javax/management/build.xml
+++ b/src/share/classes/javax/management/build.xml
@@ -50,8 +50,7 @@
-->
- Copyright 2006 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms.
-
+ Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
Description: JMX API Version 1.4 - Source Code from Java SE 6
diff --git a/src/share/classes/javax/management/loading/package.html b/src/share/classes/javax/management/loading/package.html
--- a/src/share/classes/javax/management/loading/package.html
+++ b/src/share/classes/javax/management/loading/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/management/modelmbean/package.html b/src/share/classes/javax/management/modelmbean/package.html
--- a/src/share/classes/javax/management/modelmbean/package.html
+++ b/src/share/classes/javax/management/modelmbean/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/management/monitor/package.html b/src/share/classes/javax/management/monitor/package.html
--- a/src/share/classes/javax/management/monitor/package.html
+++ b/src/share/classes/javax/management/monitor/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/management/openmbean/package.html b/src/share/classes/javax/management/openmbean/package.html
--- a/src/share/classes/javax/management/openmbean/package.html
+++ b/src/share/classes/javax/management/openmbean/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/management/package.html b/src/share/classes/javax/management/package.html
--- a/src/share/classes/javax/management/package.html
+++ b/src/share/classes/javax/management/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/management/relation/package.html b/src/share/classes/javax/management/relation/package.html
--- a/src/share/classes/javax/management/relation/package.html
+++ b/src/share/classes/javax/management/relation/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/management/remote/package.html b/src/share/classes/javax/management/remote/package.html
--- a/src/share/classes/javax/management/remote/package.html
+++ b/src/share/classes/javax/management/remote/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/management/remote/rmi/package.html b/src/share/classes/javax/management/remote/rmi/package.html
--- a/src/share/classes/javax/management/remote/rmi/package.html
+++ b/src/share/classes/javax/management/remote/rmi/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/management/timer/package.html b/src/share/classes/javax/management/timer/package.html
--- a/src/share/classes/javax/management/timer/package.html
+++ b/src/share/classes/javax/management/timer/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/naming/directory/package.html b/src/share/classes/javax/naming/directory/package.html
--- a/src/share/classes/javax/naming/directory/package.html
+++ b/src/share/classes/javax/naming/directory/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/naming/event/package.html b/src/share/classes/javax/naming/event/package.html
--- a/src/share/classes/javax/naming/event/package.html
+++ b/src/share/classes/javax/naming/event/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/naming/ldap/package.html b/src/share/classes/javax/naming/ldap/package.html
--- a/src/share/classes/javax/naming/ldap/package.html
+++ b/src/share/classes/javax/naming/ldap/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/naming/package.html b/src/share/classes/javax/naming/package.html
--- a/src/share/classes/javax/naming/package.html
+++ b/src/share/classes/javax/naming/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/naming/spi/package.html b/src/share/classes/javax/naming/spi/package.html
--- a/src/share/classes/javax/naming/spi/package.html
+++ b/src/share/classes/javax/naming/spi/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/net/package.html b/src/share/classes/javax/net/package.html
--- a/src/share/classes/javax/net/package.html
+++ b/src/share/classes/javax/net/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/net/ssl/package.html b/src/share/classes/javax/net/ssl/package.html
--- a/src/share/classes/javax/net/ssl/package.html
+++ b/src/share/classes/javax/net/ssl/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/print/attribute/package.html b/src/share/classes/javax/print/attribute/package.html
--- a/src/share/classes/javax/print/attribute/package.html
+++ b/src/share/classes/javax/print/attribute/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/print/attribute/standard/package.html b/src/share/classes/javax/print/attribute/standard/package.html
--- a/src/share/classes/javax/print/attribute/standard/package.html
+++ b/src/share/classes/javax/print/attribute/standard/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/print/event/package.html b/src/share/classes/javax/print/event/package.html
--- a/src/share/classes/javax/print/event/package.html
+++ b/src/share/classes/javax/print/event/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/print/package.html b/src/share/classes/javax/print/package.html
--- a/src/share/classes/javax/print/package.html
+++ b/src/share/classes/javax/print/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/rmi/ssl/package.html b/src/share/classes/javax/rmi/ssl/package.html
--- a/src/share/classes/javax/rmi/ssl/package.html
+++ b/src/share/classes/javax/rmi/ssl/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/script/package.html b/src/share/classes/javax/script/package.html
--- a/src/share/classes/javax/script/package.html
+++ b/src/share/classes/javax/script/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/security/auth/callback/package.html b/src/share/classes/javax/security/auth/callback/package.html
--- a/src/share/classes/javax/security/auth/callback/package.html
+++ b/src/share/classes/javax/security/auth/callback/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/security/auth/kerberos/package.html b/src/share/classes/javax/security/auth/kerberos/package.html
--- a/src/share/classes/javax/security/auth/kerberos/package.html
+++ b/src/share/classes/javax/security/auth/kerberos/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/security/auth/login/package.html b/src/share/classes/javax/security/auth/login/package.html
--- a/src/share/classes/javax/security/auth/login/package.html
+++ b/src/share/classes/javax/security/auth/login/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/security/auth/package.html b/src/share/classes/javax/security/auth/package.html
--- a/src/share/classes/javax/security/auth/package.html
+++ b/src/share/classes/javax/security/auth/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/security/auth/spi/package.html b/src/share/classes/javax/security/auth/spi/package.html
--- a/src/share/classes/javax/security/auth/spi/package.html
+++ b/src/share/classes/javax/security/auth/spi/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/security/auth/x500/package.html b/src/share/classes/javax/security/auth/x500/package.html
--- a/src/share/classes/javax/security/auth/x500/package.html
+++ b/src/share/classes/javax/security/auth/x500/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/security/cert/package.html b/src/share/classes/javax/security/cert/package.html
--- a/src/share/classes/javax/security/cert/package.html
+++ b/src/share/classes/javax/security/cert/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/security/sasl/package.html b/src/share/classes/javax/security/sasl/package.html
--- a/src/share/classes/javax/security/sasl/package.html
+++ b/src/share/classes/javax/security/sasl/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/sound/midi/package.html b/src/share/classes/javax/sound/midi/package.html
--- a/src/share/classes/javax/sound/midi/package.html
+++ b/src/share/classes/javax/sound/midi/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/sound/midi/spi/package.html b/src/share/classes/javax/sound/midi/spi/package.html
--- a/src/share/classes/javax/sound/midi/spi/package.html
+++ b/src/share/classes/javax/sound/midi/spi/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/sound/sampled/package.html b/src/share/classes/javax/sound/sampled/package.html
--- a/src/share/classes/javax/sound/sampled/package.html
+++ b/src/share/classes/javax/sound/sampled/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/sound/sampled/spi/package.html b/src/share/classes/javax/sound/sampled/spi/package.html
--- a/src/share/classes/javax/sound/sampled/spi/package.html
+++ b/src/share/classes/javax/sound/sampled/spi/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/sql/package.html b/src/share/classes/javax/sql/package.html
--- a/src/share/classes/javax/sql/package.html
+++ b/src/share/classes/javax/sql/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/sql/rowset/package.html b/src/share/classes/javax/sql/rowset/package.html
--- a/src/share/classes/javax/sql/rowset/package.html
+++ b/src/share/classes/javax/sql/rowset/package.html
@@ -24,9 +24,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
javax.sql.rowset Package
diff --git a/src/share/classes/javax/sql/rowset/serial/package.html b/src/share/classes/javax/sql/rowset/serial/package.html
--- a/src/share/classes/javax/sql/rowset/serial/package.html
+++ b/src/share/classes/javax/sql/rowset/serial/package.html
@@ -27,9 +27,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
javax.sql.rowset.serial
diff --git a/src/share/classes/javax/sql/rowset/spi/package.html b/src/share/classes/javax/sql/rowset/spi/package.html
--- a/src/share/classes/javax/sql/rowset/spi/package.html
+++ b/src/share/classes/javax/sql/rowset/spi/package.html
@@ -27,9 +27,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
javax.sql.rowset.spi
diff --git a/src/share/classes/javax/swing/border/package.html b/src/share/classes/javax/swing/border/package.html
--- a/src/share/classes/javax/swing/border/package.html
+++ b/src/share/classes/javax/swing/border/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/colorchooser/package.html b/src/share/classes/javax/swing/colorchooser/package.html
--- a/src/share/classes/javax/swing/colorchooser/package.html
+++ b/src/share/classes/javax/swing/colorchooser/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/event/package.html b/src/share/classes/javax/swing/event/package.html
--- a/src/share/classes/javax/swing/event/package.html
+++ b/src/share/classes/javax/swing/event/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/filechooser/package.html b/src/share/classes/javax/swing/filechooser/package.html
--- a/src/share/classes/javax/swing/filechooser/package.html
+++ b/src/share/classes/javax/swing/filechooser/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/package.html b/src/share/classes/javax/swing/package.html
--- a/src/share/classes/javax/swing/package.html
+++ b/src/share/classes/javax/swing/package.html
@@ -22,9 +22,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/plaf/basic/package.html b/src/share/classes/javax/swing/plaf/basic/package.html
--- a/src/share/classes/javax/swing/plaf/basic/package.html
+++ b/src/share/classes/javax/swing/plaf/basic/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/plaf/metal/package.html b/src/share/classes/javax/swing/plaf/metal/package.html
--- a/src/share/classes/javax/swing/plaf/metal/package.html
+++ b/src/share/classes/javax/swing/plaf/metal/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/plaf/multi/package.html b/src/share/classes/javax/swing/plaf/multi/package.html
--- a/src/share/classes/javax/swing/plaf/multi/package.html
+++ b/src/share/classes/javax/swing/plaf/multi/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/plaf/package.html b/src/share/classes/javax/swing/plaf/package.html
--- a/src/share/classes/javax/swing/plaf/package.html
+++ b/src/share/classes/javax/swing/plaf/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html b/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/plaf/synth/package.html b/src/share/classes/javax/swing/plaf/synth/package.html
--- a/src/share/classes/javax/swing/plaf/synth/package.html
+++ b/src/share/classes/javax/swing/plaf/synth/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/table/package.html b/src/share/classes/javax/swing/table/package.html
--- a/src/share/classes/javax/swing/table/package.html
+++ b/src/share/classes/javax/swing/table/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/text/html/package.html b/src/share/classes/javax/swing/text/html/package.html
--- a/src/share/classes/javax/swing/text/html/package.html
+++ b/src/share/classes/javax/swing/text/html/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/text/html/parser/package.html b/src/share/classes/javax/swing/text/html/parser/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/text/package.html b/src/share/classes/javax/swing/text/package.html
--- a/src/share/classes/javax/swing/text/package.html
+++ b/src/share/classes/javax/swing/text/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/text/rtf/package.html b/src/share/classes/javax/swing/text/rtf/package.html
--- a/src/share/classes/javax/swing/text/rtf/package.html
+++ b/src/share/classes/javax/swing/text/rtf/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/tree/package.html b/src/share/classes/javax/swing/tree/package.html
--- a/src/share/classes/javax/swing/tree/package.html
+++ b/src/share/classes/javax/swing/tree/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/swing/undo/package.html b/src/share/classes/javax/swing/undo/package.html
--- a/src/share/classes/javax/swing/undo/package.html
+++ b/src/share/classes/javax/swing/undo/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/xml/crypto/dom/package.html b/src/share/classes/javax/xml/crypto/dom/package.html
--- a/src/share/classes/javax/xml/crypto/dom/package.html
+++ b/src/share/classes/javax/xml/crypto/dom/package.html
@@ -20,9 +20,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/xml/crypto/dsig/dom/package.html b/src/share/classes/javax/xml/crypto/dsig/dom/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html b/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/xml/crypto/dsig/package.html b/src/share/classes/javax/xml/crypto/dsig/package.html
--- a/src/share/classes/javax/xml/crypto/dsig/package.html
+++ b/src/share/classes/javax/xml/crypto/dsig/package.html
@@ -20,9 +20,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/xml/crypto/dsig/spec/package.html b/src/share/classes/javax/xml/crypto/dsig/spec/package.html
--- 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 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/javax/xml/crypto/package.html b/src/share/classes/javax/xml/crypto/package.html
--- a/src/share/classes/javax/xml/crypto/package.html
+++ b/src/share/classes/javax/xml/crypto/package.html
@@ -20,9 +20,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/org/ietf/jgss/package.html b/src/share/classes/org/ietf/jgss/package.html
--- a/src/share/classes/org/ietf/jgss/package.html
+++ b/src/share/classes/org/ietf/jgss/package.html
@@ -21,9 +21,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/share/classes/overview-core.html b/src/share/classes/overview-core.html
--- a/src/share/classes/overview-core.html
+++ b/src/share/classes/overview-core.html
@@ -22,9 +22,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
-->
diff --git a/src/solaris/classes/sun/awt/X11/keysym2ucs.h b/src/solaris/classes/sun/awt/X11/keysym2ucs.h
--- 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-2007 Sun Microsystems, Inc. All Rights Reserved.
+tojava * Copyright (c) 2005, 2007, 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
diff --git a/test/java/lang/ClassLoader/getdotresource.sh b/test/java/lang/ClassLoader/getdotresource.sh
--- a/test/java/lang/ClassLoader/getdotresource.sh
+++ b/test/java/lang/ClassLoader/getdotresource.sh
@@ -1,7 +1,7 @@
#! /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,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
@@ -33,4 +33,5 @@
if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi
# now start the test
-${TESTJAVA}/bin/java -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetDotResource
\ No newline at end of file
+${TESTJAVA}/bin/java -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetDotResource
+
diff --git a/test/java/lang/Runtime/exec/setcwd.sh b/test/java/lang/Runtime/exec/setcwd.sh
--- a/test/java/lang/Runtime/exec/setcwd.sh
+++ b/test/java/lang/Runtime/exec/setcwd.sh
@@ -1,7 +1,7 @@
#! /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,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
@@ -37,4 +37,5 @@
cp ${TESTCLASSES}/SetCwd.class foo
# now start the test
-${TESTJAVA}/bin/java SetCwd
\ No newline at end of file
+${TESTJAVA}/bin/java SetCwd
+
diff --git a/test/java/util/ResourceBundle/Bug4083270Test.properties b/test/java/util/ResourceBundle/Bug4083270Test.properties
--- a/test/java/util/ResourceBundle/Bug4083270Test.properties
+++ b/test/java/util/ResourceBundle/Bug4083270Test.properties
@@ -1,5 +1,5 @@
#
-# 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,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
-Bug4179221Test=Bug4179221Test
\ No newline at end of file
+Bug4179221Test=Bug4179221Test
+
diff --git a/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java b/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java
--- a/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java
+++ b/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java
@@ -1,12 +1,12 @@
/*
- * 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,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
/* @test
@@ -110,4 +110,5 @@
if(max > 0.01)
fail("Interpolation failed, error="+max);
}
-}
\ No newline at end of file
+}
+
diff --git a/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java b/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java
--- a/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java
+++ b/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java
@@ -1,12 +1,12 @@
/*
- * 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,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
/* @test
@@ -110,4 +110,5 @@
if(max > 0.001)
fail("Interpolation failed, error="+max);
}
-}
\ No newline at end of file
+}
+
diff --git a/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java b/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java
--- a/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java
+++ b/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java
@@ -1,12 +1,12 @@
/*
- * 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,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
/* @test
@@ -110,4 +110,5 @@
if(max > 0.2)
fail("Interpolation failed, error="+max);
}
-}
\ No newline at end of file
+}
+
diff --git a/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java b/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java
--- a/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java
+++ b/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java
@@ -1,12 +1,12 @@
/*
- * 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,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
/* @test
@@ -110,4 +110,5 @@
if(max > 0.2)
fail("Interpolation failed, error="+max);
}
-}
\ No newline at end of file
+}
+
diff --git a/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java b/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java
--- a/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java
+++ b/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java
@@ -1,12 +1,12 @@
/*
- * 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,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
/* @test
@@ -45,4 +45,5 @@
}
synth.close();
}
-}
\ No newline at end of file
+}
+
diff --git a/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java b/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java
--- a/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java
+++ b/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java
@@ -1,12 +1,12 @@
/*
- * 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,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
/* @test
@@ -110,4 +110,5 @@
if(max > 0.0001)
fail("Interpolation failed, error="+max);
}
-}
\ No newline at end of file
+}
+
diff --git a/test/sun/net/www/protocol/jar/getcontenttype.sh b/test/sun/net/www/protocol/jar/getcontenttype.sh
--- a/test/sun/net/www/protocol/jar/getcontenttype.sh
+++ b/test/sun/net/www/protocol/jar/getcontenttype.sh
@@ -1,7 +1,7 @@
#! /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,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
@@ -33,4 +33,5 @@
if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi
# now start the test
-${TESTJAVA}/bin/java -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetContentType
\ No newline at end of file
+${TESTJAVA}/bin/java -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetContentType
+