# HG changeset patch # User ohair # Date 1274930884 25200 # Node ID 32769076610901252140296eee48d86b08ba3d16 # Parent 654298d26561b76dfe3cfcffbbd7078080837300 6956202: Fix a few missed rebranding issues, please contact lines etc. Reviewed-by: jjg, darcy, weijun diff -r 654298d26561 -r 327690766109 jdk/make/common/Subdirs.gmk --- a/jdk/make/common/Subdirs.gmk Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/make/common/Subdirs.gmk Wed May 26 20:28:04 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. # # diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jarsigner/package.html --- a/jdk/src/share/classes/com/sun/jarsigner/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jarsigner/package.html Wed May 26 20:28:04 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. --> Jarsigner Signing Mechanism Package diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/java/util/jar/pack/package.html --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jdi/connect/package.html --- a/jdk/src/share/classes/com/sun/jdi/connect/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jdi/connect/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jdi/connect/spi/package.html --- a/jdk/src/share/classes/com/sun/jdi/connect/spi/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jdi/connect/spi/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jdi/event/package.html --- a/jdk/src/share/classes/com/sun/jdi/event/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jdi/event/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jdi/package.html --- a/jdk/src/share/classes/com/sun/jdi/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jdi/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jdi/request/package.html --- a/jdk/src/share/classes/com/sun/jdi/request/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jdi/request/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jmx/defaults/package.html --- a/jdk/src/share/classes/com/sun/jmx/defaults/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jmx/defaults/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jmx/interceptor/package.html --- a/jdk/src/share/classes/com/sun/jmx/interceptor/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jmx/interceptor/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jmx/mbeanserver/package.html --- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jmx/remote/internal/package.html --- a/jdk/src/share/classes/com/sun/jmx/remote/internal/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jmx/remote/internal/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html --- a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jmx/snmp/agent/package.html --- a/jdk/src/share/classes/com/sun/jmx/snmp/agent/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/agent/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jmx/snmp/daemon/package.html --- a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/daemon/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jmx/snmp/defaults/package.html --- a/jdk/src/share/classes/com/sun/jmx/snmp/defaults/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/defaults/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jmx/snmp/internal/package.html --- a/jdk/src/share/classes/com/sun/jmx/snmp/internal/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/internal/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jmx/snmp/mpm/package.html --- a/jdk/src/share/classes/com/sun/jmx/snmp/mpm/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/mpm/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jmx/snmp/package.html --- a/jdk/src/share/classes/com/sun/jmx/snmp/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/jmx/snmp/tasks/package.html --- a/jdk/src/share/classes/com/sun/jmx/snmp/tasks/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/tasks/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/management/mgmt-overview.html --- a/jdk/src/share/classes/com/sun/management/mgmt-overview.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/management/mgmt-overview.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/management/package.html --- a/jdk/src/share/classes/com/sun/management/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/management/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/net/ssl/package.html --- a/jdk/src/share/classes/com/sun/net/ssl/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/net/ssl/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/rowset/providers/package.html --- a/jdk/src/share/classes/com/sun/rowset/providers/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/rowset/providers/package.html Wed May 26 20:28:04 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. --> javax.sql.rowset.providers Package diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/servicetag/package.html --- a/jdk/src/share/classes/com/sun/servicetag/package.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/servicetag/package.html Wed May 26 20:28:04 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. --> diff -r 654298d26561 -r 327690766109 jdk/src/share/classes/com/sun/servicetag/resources/register.html --- a/jdk/src/share/classes/com/sun/servicetag/resources/register.html Wed Jul 05 17:13:36 2017 +0200 +++ b/jdk/src/share/classes/com/sun/servicetag/resources/register.html Wed May 26 20:28:04 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. -->