--- a/jdk/make/common/Release.gmk Thu May 27 10:57:25 2010 -0700
+++ b/jdk/make/common/Release.gmk Wed Jun 02 15:39:48 2010 -0700
@@ -648,7 +648,9 @@
JAR_MANIFEST_FILE=$(ABS_TEMPDIR)/manifest.tmp
$(JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
$(prep-target)
- $(SED) -e "s/@@RELEASE@@/$(RELEASE)/" $(MAINMANIFEST) >> $@
+ $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
+ -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
+ $(MAINMANIFEST) >> $@
$(ECHO) >> $@
$(CAT) $(BEANMANIFEST) >> $@
--- a/jdk/make/common/Subdirs.gmk Thu May 27 10:57:25 2010 -0700
+++ b/jdk/make/common/Subdirs.gmk Wed Jun 02 15:39:48 2010 -0700
@@ -19,7 +19,7 @@
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
-# have any questions
+# questions.
#
#
--- a/jdk/make/common/shared/Defs.gmk Thu May 27 10:57:25 2010 -0700
+++ b/jdk/make/common/shared/Defs.gmk Wed Jun 02 15:39:48 2010 -0700
@@ -214,7 +214,7 @@
PRODUCT_NAME = Java(TM)
PRODUCT_SUFFIX = SE Runtime Environment
JDK_RC_PLATFORM_NAME = Platform SE
- COMPANY_NAME = Sun Microsystems, Inc.
+ COMPANY_NAME = Oracle
endif
RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX)
--- a/jdk/make/java/nio/Makefile Thu May 27 10:57:25 2010 -0700
+++ b/jdk/make/java/nio/Makefile Wed Jun 02 15:39:48 2010 -0700
@@ -818,7 +818,7 @@
GENSOR_EXE = $(TEMPDIR)/genSocketOptionRegistry$(EXE_SUFFIX)
SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSOR_SRC) | \
- $(NAWK) '/^.*Copyright.*Sun/ { print $$3 }')
+ $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
$(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC)
$(install-non-module-file)
@@ -830,7 +830,7 @@
$(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
$(prep-target)
- NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh $(SOR_COPYRIGHT_YEARS) > $@
+ NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@
$(GENSOR_EXE) >> $@
#
@@ -852,7 +852,7 @@
GENUC_EXE = $(TEMPDIR)/genUnixConstants
GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \
- $(NAWK) '/^.*Copyright.*Sun/ { print $$3 }')
+ $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
$(GENUC_EXE) : $(GENUC_SRC)
$(prep-target)
@@ -860,7 +860,7 @@
$(SFS_GEN)/UnixConstants.java: $(GENUC_EXE)
$(prep-target)
- NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh $(GENUC_COPYRIGHT_YEARS) > $@
+ NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@
$(GENUC_EXE) >> $@
GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c
@@ -868,7 +868,7 @@
GENSC_EXE = $(TEMPDIR)/genSolarisConstants
GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \
- $(NAWK) '/^.*Copyright.*Sun/ { print $$3 }')
+ $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
$(GENSC_EXE) : $(GENSC_SRC)
$(prep-target)
@@ -876,7 +876,7 @@
$(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE)
$(prep-target)
- NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh $(GENSC_COPYRIGHT_YEARS) > $@
+ NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@
$(GENSC_EXE) >> $@
.PHONY: sources
--- a/jdk/make/java/nio/addNotices.sh Thu May 27 10:57:25 2010 -0700
+++ b/jdk/make/java/nio/addNotices.sh Wed Jun 02 15:39:48 2010 -0700
@@ -28,7 +28,7 @@
# a java comment block. If this script is invoked with a copyright
# year/year range, the java comment block will contain a Sun copyright.
-COPYRIGHT_YEARS=$1
+COPYRIGHT_YEARS="$1"
cat <<__END__
/*
@@ -36,10 +36,10 @@
if [ "x$COPYRIGHT_YEARS" != x ]; then
cat <<__END__
- * Copyright $COPYRIGHT_YEARS Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) $COPYRIGHT_YEARS Oracle and/or its affiliates. All rights reserved.
__END__
fi
-$NAWK ' /^#.*Copyright.*Sun/ { next }
+$NAWK ' /^#.*Copyright.*Oracle/ { next }
/^#([^!]|$)/ { sub(/^#/, " *"); print }
/^$/ { print " */"; exit } ' $0
--- a/jdk/make/java/nio/genCharsetProvider.sh Thu May 27 10:57:25 2010 -0700
+++ b/jdk/make/java/nio/genCharsetProvider.sh Wed Jun 02 15:39:48 2010 -0700
@@ -36,7 +36,7 @@
DST=$1; shift
eval `$NAWK <$SPEC '
- /^[ \t]*copyright / { printf "COPYRIGHT_YEARS=%s\n", $2; }
+ /^[ \t]*copyright / { printf "COPYRIGHT_YEARS=\"%s %s\"\n", $2, $3; }
/^[ \t]*package / { printf "PKG=%s\n", $2; }
/^[ \t]*class / { printf "CLASS=%s\n", $2; }
'`
--- a/jdk/make/tools/manifest.mf Thu May 27 10:57:25 2010 -0700
+++ b/jdk/make/tools/manifest.mf Wed Jun 02 15:39:48 2010 -0700
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Specification-Title: Java Platform API Specification
Specification-Version: 1.6
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: Oracle
Implementation-Title: Java Runtime Environment
Implementation-Version: @@RELEASE@@
-Implementation-Vendor: Sun Microsystems, Inc.
+Implementation-Vendor: @@COMPANY_NAME@@
--- a/jdk/src/share/classes/com/sun/jarsigner/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jarsigner/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<head>
<title>Jarsigner Signing Mechanism Package</title>
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/com/sun/jdi/connect/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jdi/connect/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/com/sun/jdi/connect/spi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jdi/connect/spi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/com/sun/jdi/event/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jdi/event/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/com/sun/jdi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jdi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/com/sun/jdi/request/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jdi/request/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/com/sun/jmx/defaults/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/defaults/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/com/sun/jmx/interceptor/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/interceptor/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/com/sun/jmx/remote/internal/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/remote/internal/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</HEAD>
<BODY>
--- a/jdk/src/share/classes/com/sun/jmx/snmp/agent/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/agent/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</HEAD>
<BODY>
--- a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/daemon/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</HEAD>
<BODY>
--- a/jdk/src/share/classes/com/sun/jmx/snmp/defaults/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/defaults/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</HEAD>
<BODY>
--- a/jdk/src/share/classes/com/sun/jmx/snmp/internal/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/internal/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</HEAD>
<BODY>
--- a/jdk/src/share/classes/com/sun/jmx/snmp/mpm/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/mpm/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</HEAD>
<BODY>
--- a/jdk/src/share/classes/com/sun/jmx/snmp/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</HEAD>
<BODY>
--- a/jdk/src/share/classes/com/sun/jmx/snmp/tasks/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/tasks/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</HEAD>
<BODY>
--- a/jdk/src/share/classes/com/sun/management/mgmt-overview.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/management/mgmt-overview.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/com/sun/management/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/management/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/com/sun/net/ssl/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/net/ssl/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
--- a/jdk/src/share/classes/com/sun/rowset/providers/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/rowset/providers/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<title>javax.sql.rowset.providers Package</title>
</head>
--- a/jdk/src/share/classes/com/sun/servicetag/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/servicetag/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
--- a/jdk/src/share/classes/com/sun/servicetag/resources/register.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/register.html Wed Jun 02 15:39:48 2010 -0700
@@ -25,9 +25,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.
-->
<style type="text/css">
--- a/jdk/src/share/classes/com/sun/servicetag/resources/register_ja.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/register_ja.html Wed Jun 02 15:39:48 2010 -0700
@@ -25,9 +25,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.
-->
<style type="text/css">
--- a/jdk/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html Wed Jun 02 15:39:48 2010 -0700
@@ -25,9 +25,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.
-->
<style type="text/css">
--- a/jdk/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<html>
--- a/jdk/src/share/classes/java/nio/channels/exceptions Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/nio/channels/exceptions Wed Jun 02 15:39:48 2010 -0700
@@ -28,7 +28,7 @@
SINCE=1.4
PACKAGE=java.nio.channels
# This year should only change if the generated source is modified.
-COPYRIGHT_YEARS=2000-2007
+COPYRIGHT_YEARS="2000, 2007,"
SUPER=java.io.IOException
--- a/jdk/src/share/classes/java/nio/charset/exceptions Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/nio/charset/exceptions Wed Jun 02 15:39:48 2010 -0700
@@ -28,7 +28,7 @@
SINCE=1.4
PACKAGE=java.nio.charset
# This year should only change if the generated source is modified.
-COPYRIGHT_YEARS=2000-2007
+COPYRIGHT_YEARS="2000, 2007,"
SUPER=java.io.IOException
--- a/jdk/src/share/classes/java/nio/exceptions Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/nio/exceptions Wed Jun 02 15:39:48 2010 -0700
@@ -28,7 +28,7 @@
SINCE=1.4
PACKAGE=java.nio
# This year should only change if the generated source is modified.
-COPYRIGHT_YEARS=2000-2007
+COPYRIGHT_YEARS="2000, 2007,"
SUPER=RuntimeException
--- a/jdk/src/share/classes/java/security/acl/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/security/acl/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/java/security/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/security/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/java/security/spec/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/security/spec/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/java/sql/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/sql/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/java/text/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/text/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/java/text/spi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/text/spi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/java/util/jar/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/util/jar/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/java/util/logging/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/util/logging/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/java/util/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/util/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/java/util/prefs/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/util/prefs/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/java/util/regex/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/util/regex/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/java/util/spi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/util/spi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/java/util/zip/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/java/util/zip/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/accessibility/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/accessibility/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</HEAD>
<BODY BGCOLOR="#FFFFFF">
--- a/jdk/src/share/classes/javax/crypto/interfaces/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/crypto/interfaces/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
--- a/jdk/src/share/classes/javax/crypto/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/crypto/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
--- a/jdk/src/share/classes/javax/crypto/spec/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/crypto/spec/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
--- a/jdk/src/share/classes/javax/imageio/event/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/event/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<title>BMP Metadata Format Specification</title>
--- a/jdk/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<title>GIF Metadata Format Specification</title>
--- a/jdk/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<title>JPEG Metadata Format Specification and Usage Notes</title>
--- a/jdk/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<title>PNG Metadata Format Specification</title>
--- a/jdk/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<title>Standard Metadata Format Specification</title>
--- a/jdk/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<title>WBMP Metadata Format Specification</title>
--- a/jdk/src/share/classes/javax/imageio/metadata/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/metadata/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/imageio/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/imageio/plugins/bmp/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/plugins/bmp/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/imageio/plugins/jpeg/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/plugins/jpeg/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/imageio/spi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/spi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/imageio/stream/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/imageio/stream/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/management/build.xml Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/management/build.xml Wed Jun 02 15:39:48 2010 -0700
@@ -51,7 +51,7 @@
-->
<description>
- Copyright 2006 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms.
+ Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
Description: JMX API Version 1.4 - Source Code from Java SE 6
</description>
--- a/jdk/src/share/classes/javax/management/loading/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/management/loading/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/management/modelmbean/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/management/modelmbean/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/management/monitor/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/management/monitor/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/management/openmbean/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/management/openmbean/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/management/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/management/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/management/relation/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/management/relation/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/management/remote/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/management/remote/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/management/remote/rmi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/management/remote/rmi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/management/timer/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/management/timer/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/naming/directory/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/naming/directory/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/naming/event/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/naming/event/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/naming/ldap/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/naming/ldap/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/naming/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/naming/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/naming/spi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/naming/spi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/net/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/net/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/net/ssl/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/net/ssl/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/print/attribute/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/print/attribute/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/print/attribute/standard/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/print/attribute/standard/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/print/event/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/print/event/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/print/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/print/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/rmi/ssl/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/rmi/ssl/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/script/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/script/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/security/auth/callback/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/security/auth/callback/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/security/auth/kerberos/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/security/auth/kerberos/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/security/auth/login/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/security/auth/login/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/security/auth/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/security/auth/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/security/auth/spi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/security/auth/spi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/security/auth/x500/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/security/auth/x500/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/security/cert/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/security/cert/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/security/sasl/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/security/sasl/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/sound/midi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/sound/midi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/sound/midi/spi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/sound/midi/spi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/sound/sampled/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/sound/sampled/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/sound/sampled/spi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/sound/sampled/spi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/sql/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/sql/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/sql/rowset/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/sql/rowset/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<title>javax.sql.rowset Package</title>
--- a/jdk/src/share/classes/javax/sql/rowset/serial/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<title>javax.sql.rowset.serial</title>
</head>
--- a/jdk/src/share/classes/javax/sql/rowset/spi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<title>javax.sql.rowset.spi</title>
--- a/jdk/src/share/classes/javax/swing/border/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/border/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/colorchooser/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/colorchooser/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
<body bgcolor="white">
--- a/jdk/src/share/classes/javax/swing/event/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/event/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/filechooser/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/filechooser/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
<META NAME="Author" Content="Eric Armstrong">
--- a/jdk/src/share/classes/javax/swing/plaf/basic/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/plaf/metal/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/plaf/multi/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/multi/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/plaf/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/plaf/synth/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
--- a/jdk/src/share/classes/javax/swing/table/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/table/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/text/html/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/text/html/parser/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/parser/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/text/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/text/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/text/rtf/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/text/rtf/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/tree/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/tree/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/swing/undo/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/undo/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/xml/crypto/dom/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/xml/crypto/dom/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/xml/crypto/dsig/dom/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/xml/crypto/dsig/dom/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/xml/crypto/dsig/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/xml/crypto/dsig/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/xml/crypto/dsig/spec/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/xml/crypto/dsig/spec/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/javax/xml/crypto/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/javax/xml/crypto/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/org/ietf/jgss/package.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/org/ietf/jgss/package.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/overview-core.html Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/overview-core.html Wed Jun 02 15:39:48 2010 -0700
@@ -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.
-->
</head>
--- a/jdk/src/share/classes/sun/nio/cs/standard-charsets Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/share/classes/sun/nio/cs/standard-charsets Wed Jun 02 15:39:48 2010 -0700
@@ -35,7 +35,7 @@
# which is lazy initialized.
# This year should only change if the generated source is modified.
-copyright 2000
+copyright 2000, 2007,
package sun.nio.cs
class StandardCharsets
--- a/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h Thu May 27 10:57:25 2010 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h Wed Jun 02 15:39:48 2010 -0700
@@ -39,7 +39,7 @@
*/
tojava /*
-tojava * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
+tojava * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
tojava * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
tojava *
tojava * This code is free software; you can redistribute it and/or modify it
--- a/jdk/test/java/awt/font/LineBreakMeasurer/FRCTest.java Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/java/awt/font/LineBreakMeasurer/FRCTest.java Wed Jun 02 15:39:48 2010 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-9 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jdk/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java Wed Jun 02 15:39:48 2010 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -16,9 +16,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
/*
@@ -92,4 +92,4 @@
return op;
}
-}
\ No newline at end of file
+}
--- a/jdk/test/java/beans/XMLEncoder/java_awt_Component.java Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/java/beans/XMLEncoder/java_awt_Component.java Wed Jun 02 15:39:48 2010 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -16,9 +16,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
/*
@@ -55,4 +55,5 @@
public static final class MyComponent extends Component {
}
-}
\ No newline at end of file
+}
+
--- a/jdk/test/java/lang/ClassLoader/getdotresource.sh Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/java/lang/ClassLoader/getdotresource.sh Wed Jun 02 15:39:48 2010 -0700
@@ -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
+
--- a/jdk/test/java/lang/Runtime/exec/setcwd.sh Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/java/lang/Runtime/exec/setcwd.sh Wed Jun 02 15:39:48 2010 -0700
@@ -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
+
--- a/jdk/test/java/util/ResourceBundle/Bug4083270Test.properties Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4083270Test.properties Wed Jun 02 15:39:48 2010 -0700
@@ -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
+
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Test.java Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Test.java Wed Jun 02 15:39:48 2010 -0700
@@ -32,10 +32,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
* This software is the confidential and proprietary information
* of Sun Microsystems, Inc. ("Confidential Information"). You
* shall not disclose such Confidential Information and shall use
--- a/jdk/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java Wed Jun 02 15:39:48 2010 -0700
@@ -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
+}
+
--- a/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java Wed Jun 02 15:39:48 2010 -0700
@@ -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
+}
+
--- a/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java Wed Jun 02 15:39:48 2010 -0700
@@ -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
+}
+
--- a/jdk/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java Wed Jun 02 15:39:48 2010 -0700
@@ -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
+}
+
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java Wed Jun 02 15:39:48 2010 -0700
@@ -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
+}
+
--- a/jdk/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java Wed Jun 02 15:39:48 2010 -0700
@@ -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
+}
+
--- a/jdk/test/javax/swing/JTable/Test6888156.java Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/javax/swing/JTable/Test6888156.java Wed Jun 02 15:39:48 2010 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -16,9 +16,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * 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
@@ -95,4 +95,5 @@
t.test(new javax.swing.plaf.nimbus.NimbusLookAndFeel());
t.test(new com.sun.java.swing.plaf.gtk.GTKLookAndFeel());
}
-}
\ No newline at end of file
+}
+
--- a/jdk/test/sun/net/www/protocol/jar/getcontenttype.sh Thu May 27 10:57:25 2010 -0700
+++ b/jdk/test/sun/net/www/protocol/jar/getcontenttype.sh Wed Jun 02 15:39:48 2010 -0700
@@ -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
+