Merge

2017-07-05 17:14:07 +02:00 · 2017-07-05 17:14:07 +02:00 · 9dcbe9684a
commit 9dcbe9684a
parent 8e1ca50407 95eb263e96
3487 changed files with 14435 additions and 14262 deletions
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@ -69,3 +69,4 @@ cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85
 5f5c33d417f3a14706b09a4a95e65fa7b6fa54d6 jdk7-b92
 5fc102ff48f0e787ce9cc77249841d5ff0941b75 jdk7-b93
 d7f35c61afa092b6357c2c4bce3f298f16620f71 jdk7-b94
+fd3663286e77b9f13c39eee124db2beb079b3ca6 jdk7-b95
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@ -97,3 +97,4 @@ e0a1a502e402dbe7bf2d9102b4084a7e79a99a9b jdk7-b91
 9d865fc2f644fdd9a0108fd6407944ee610aadd9 jdk7-b93
 d38f45079fe98792a7381dbb4b64f5b589ec8c58 jdk7-b94
 8bfe9058ca4661779ac1d0572329f3943e68362e hs19-b01
+91d861ba858daca645993a1ab6ba2fa06a8f4a5b jdk7-b95
--- a/hotspot/ASSEMBLY_EXCEPTION
+++ b/hotspot/ASSEMBLY_EXCEPTION
@ -1,7 +1,7 @@

 OPENJDK ASSEMBLY EXCEPTION

-The OpenJDK source code made available by Sun at openjdk.java.net and
+The OpenJDK source code made available by Oracle at openjdk.java.net and
 openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the
 GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
 only ("GPL2"), with the following clarification and special exception.
@ -10,18 +10,18 @@ only ("GPL2"), with the following clarification and special exception.
    is making a combined work based on this library.  Thus, the terms
    and conditions of GPL2 cover the whole combination.

-    As a special exception, Sun gives you permission to link this
-    OpenJDK Code with certain code licensed by Sun as indicated at
+    As a special exception, Oracle gives you permission to link this
+    OpenJDK Code with certain code licensed by Oracle as indicated at
    http://openjdk.java.net/legal/exception-modules-2007-05-08.html
    ("Designated Exception Modules") to produce an executable,
    regardless of the license terms of the Designated Exception Modules,
    and to copy and distribute the resulting executable under GPL2,
    provided that the Designated Exception Modules continue to be
-    governed by the licenses under which they were offered by Sun.
+    governed by the licenses under which they were offered by Oracle.

-As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to
-build an executable that includes those portions of necessary code that Sun
-could not provide under GPL2 (or that Sun has provided under GPL2 with the
+As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code to
+build an executable that includes those portions of necessary code that Oracle
+could not provide under GPL2 (or that Oracle has provided under GPL2 with the
 Classpath exception).  If you modify or add to the OpenJDK code, that new
 GPL2 code may still be combined with Designated Exception Modules if the
 new code is made subject to this exception by its copyright holder.
--- a/hotspot/LICENSE
+++ b/hotspot/LICENSE
@ -325,11 +325,11 @@ License instead of this License.

 "CLASSPATH" EXCEPTION TO THE GPL

-Certain source files distributed by Sun Microsystems, Inc.  are subject to
+Certain source files distributed by Oracle and/or its affiliates, are subject to
 the following clarification and special exception to the GPL, but only where
-Sun has expressly included in the particular source file's header the words
-"Sun designates this particular file as subject to the "Classpath" exception
-as provided by Sun in the LICENSE file that accompanied this code."
+Oracle has expressly included in the particular source file's header the words
+"Oracle designates this particular file as subject to the "Classpath" exception
+as provided by Oracle in the LICENSE file that accompanied this code."

    Linking this library statically or dynamically with other modules is making
    a combined work based on this library.  Thus, the terms and conditions of
--- a/hotspot/THIRD_PARTY_README
+++ b/hotspot/THIRD_PARTY_README
@ -1126,7 +1126,7 @@ Project.
 %% This notice is provided with respect to Fast Infoset, which may be included with this software: 
 * Fast Infoset ver. 0.1 software ("Software") 
 * 
-* Copyright, 2004-2005 Sun Microsystems, Inc. All Rights Reserved. 
+* Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
 * 
 * Software is licensed under the Apache License, Version 2.0 (the "License"); 
 * you may not use this file except in compliance with the License. You may 
@ -1139,9 +1139,9 @@ Project.
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
 * License for the specific language governing permissions and limitations. 
 * 
-* Sun supports and benefits from the global community of open source 
+* Oracle supports and benefits from the global community of open source 
 * developers, and thanks the community for its important contributions and 
-* open standards-based technology, which Sun has adopted into many of its 
+* open standards-based technology, which Oracle has adopted into many of its 
 * products. 
 * 
 * Please note that portions of Software may be provided with notices and 
--- a/hotspot/agent/make/ClosureFinder.java
+++ b/hotspot/agent/make/ClosureFinder.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 2004, 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.
 *
 */

--- a/hotspot/agent/make/Makefile
+++ b/hotspot/agent/make/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2000, 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.
 #  
 #

--- a/hotspot/agent/make/bugspot.bat
+++ b/hotspot/agent/make/bugspot.bat
@ -1,5 +1,5 @@
 REM
-REM Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -16,9 +16,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/build.xml
+++ b/hotspot/agent/make/build.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright (c) 2002, 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
@ -17,9 +17,9 @@
 2 along with this work; if not, write to the Free Software Foundation,
 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

- Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- CA 95054 USA or visit www.sun.com if you need additional information or
- have any questions.
+ Please 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/hotspot/agent/make/clhsdbproc.sh
+++ b/hotspot/agent/make/clhsdbproc.sh
@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2005, 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.
 #  
 #

--- a/hotspot/agent/make/clhsdbproc64.sh
+++ b/hotspot/agent/make/clhsdbproc64.sh
@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2005, 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.
 #  
 #

--- a/hotspot/agent/make/clhsdbwindbg.bat
+++ b/hotspot/agent/make/clhsdbwindbg.bat
@ -1,7 +1,7 @@
@echo off

 REM
-REM Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -18,9 +18,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/clhsdbwindbg64.bat
+++ b/hotspot/agent/make/clhsdbwindbg64.bat
@ -1,7 +1,7 @@
@echo off

 REM
-REM Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -18,9 +18,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/dumpflagsproc.sh
+++ b/hotspot/agent/make/dumpflagsproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/dumpflagsproc64.sh
+++ b/hotspot/agent/make/dumpflagsproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/dumpflagswindbg.bat
+++ b/hotspot/agent/make/dumpflagswindbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/dumpflagswindbg64.bat
+++ b/hotspot/agent/make/dumpflagswindbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/dumpsyspropsproc.sh
+++ b/hotspot/agent/make/dumpsyspropsproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/dumpsyspropsproc64.sh
+++ b/hotspot/agent/make/dumpsyspropsproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/dumpsyspropswindbg.bat
+++ b/hotspot/agent/make/dumpsyspropswindbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/dumpsyspropswindbg64.bat
+++ b/hotspot/agent/make/dumpsyspropswindbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/finalizerinfoproc.sh
+++ b/hotspot/agent/make/finalizerinfoproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2004, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/finalizerinfoproc64.sh
+++ b/hotspot/agent/make/finalizerinfoproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2004, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/finalizerinfowindbg.bat
+++ b/hotspot/agent/make/finalizerinfowindbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/finalizerinfowindbg64.bat
+++ b/hotspot/agent/make/finalizerinfowindbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/grantAll.policy
+++ b/hotspot/agent/make/grantAll.policy
@ -1,5 +1,5 @@
 //
-// Copyright 2000 Sun Microsystems, Inc.  All Rights Reserved.
+// Copyright (c) 2000, 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.
 //  
 //

--- a/hotspot/agent/make/heapdumpproc.sh
+++ b/hotspot/agent/make/heapdumpproc.sh
@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright 2004-2005 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2004, 2005, 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.
 #  
 #

--- a/hotspot/agent/make/heapdumpproc64.sh
+++ b/hotspot/agent/make/heapdumpproc64.sh
@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright 2004-2005 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2004, 2005, 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.
 #  
 #

--- a/hotspot/agent/make/heapdumpwindbg.bat
+++ b/hotspot/agent/make/heapdumpwindbg.bat
@ -1,7 +1,7 @@
@echo off

 REM
-REM Copyright 2004-2005 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -18,9 +18,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/heapdumpwindbg64.bat
+++ b/hotspot/agent/make/heapdumpwindbg64.bat
@ -1,7 +1,7 @@
@echo off

 REM
-REM Copyright 2004-2005 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -18,9 +18,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/heapsumproc.sh
+++ b/hotspot/agent/make/heapsumproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/heapsumproc64.sh
+++ b/hotspot/agent/make/heapsumproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/heapsumwindbg.bat
+++ b/hotspot/agent/make/heapsumwindbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/heapsumwindbg64.bat
+++ b/hotspot/agent/make/heapsumwindbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/hsdb.bat
+++ b/hotspot/agent/make/hsdb.bat
@ -1,5 +1,5 @@
 REM
-REM Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -16,9 +16,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/hsdb.sh
+++ b/hotspot/agent/make/hsdb.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/hsdbproc.sh
+++ b/hotspot/agent/make/hsdbproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/hsdbproc64.sh
+++ b/hotspot/agent/make/hsdbproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/hsdbwindbg.bat
+++ b/hotspot/agent/make/hsdbwindbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/hsdbwindbg64.bat
+++ b/hotspot/agent/make/hsdbwindbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/jcoreproc.sh
+++ b/hotspot/agent/make/jcoreproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/jcoreproc64.sh
+++ b/hotspot/agent/make/jcoreproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/jcorewindbg.bat
+++ b/hotspot/agent/make/jcorewindbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/jcorewindbg64.bat
+++ b/hotspot/agent/make/jcorewindbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/jdbcore.sh
+++ b/hotspot/agent/make/jdbcore.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/jdbcore64.sh
+++ b/hotspot/agent/make/jdbcore64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/jdbproc.sh
+++ b/hotspot/agent/make/jdbproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/jdbproc64.sh
+++ b/hotspot/agent/make/jdbproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/jhistoproc.sh
+++ b/hotspot/agent/make/jhistoproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/jhistoproc64.sh
+++ b/hotspot/agent/make/jhistoproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/jhistowindbg.bat
+++ b/hotspot/agent/make/jhistowindbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/jhistowindbg64.bat
+++ b/hotspot/agent/make/jhistowindbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/jsdbproc.sh
+++ b/hotspot/agent/make/jsdbproc.sh
@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2004, 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.
 #  
 #

--- a/hotspot/agent/make/jsdbproc64.sh
+++ b/hotspot/agent/make/jsdbproc64.sh
@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2004, 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.
 #  
 #

--- a/hotspot/agent/make/jsdbwindbg.bat
+++ b/hotspot/agent/make/jsdbwindbg.bat
@ -1,7 +1,7 @@
@echo off

 REM
-REM Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -18,9 +18,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/jsdbwindbg64.bat
+++ b/hotspot/agent/make/jsdbwindbg64.bat
@ -1,7 +1,7 @@
@echo off

 REM
-REM Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -18,9 +18,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/jstackproc.sh
+++ b/hotspot/agent/make/jstackproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/jstackproc64.sh
+++ b/hotspot/agent/make/jstackproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/jstackwindbg.bat
+++ b/hotspot/agent/make/jstackwindbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/jstackwindbg64.bat
+++ b/hotspot/agent/make/jstackwindbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/permstatproc.sh
+++ b/hotspot/agent/make/permstatproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 2004, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/permstatproc64.sh
+++ b/hotspot/agent/make/permstatproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 2004, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/permstatwindbg.bat
+++ b/hotspot/agent/make/permstatwindbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/permstatwindbg64.bat
+++ b/hotspot/agent/make/permstatwindbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/pmapproc.sh
+++ b/hotspot/agent/make/pmapproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/pmapproc64.sh
+++ b/hotspot/agent/make/pmapproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/pmapwindbg.bat
+++ b/hotspot/agent/make/pmapwindbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/pmapwindbg64.bat
+++ b/hotspot/agent/make/pmapwindbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/pstackproc.sh
+++ b/hotspot/agent/make/pstackproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/pstackproc64.sh
+++ b/hotspot/agent/make/pstackproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/pstackwindbg.bat
+++ b/hotspot/agent/make/pstackwindbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/pstackwindbg64.bat
+++ b/hotspot/agent/make/pstackwindbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/saenv.bat
+++ b/hotspot/agent/make/saenv.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/saenv.sh
+++ b/hotspot/agent/make/saenv.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/saenv64.bat
+++ b/hotspot/agent/make/saenv64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/saenv64.sh
+++ b/hotspot/agent/make/saenv64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/soqlproc.sh
+++ b/hotspot/agent/make/soqlproc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/soqlproc64.sh
+++ b/hotspot/agent/make/soqlproc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/soqlwindbg.bat
+++ b/hotspot/agent/make/soqlwindbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/soqlwindbg64.bat
+++ b/hotspot/agent/make/soqlwindbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/start-debug-server-proc.sh
+++ b/hotspot/agent/make/start-debug-server-proc.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/start-debug-server-proc64.sh
+++ b/hotspot/agent/make/start-debug-server-proc64.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/make/start-debug-server-windbg.bat
+++ b/hotspot/agent/make/start-debug-server-windbg.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/start-debug-server-windbg64.bat
+++ b/hotspot/agent/make/start-debug-server-windbg64.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/start-rmiregistry.bat
+++ b/hotspot/agent/make/start-rmiregistry.bat
@ -1,6 +1,6 @@
@echo off
 REM
-REM Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+REM Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@ -17,9 +17,9 @@ REM You should have received a copy of the GNU General Public License version
 REM 2 along with this work; if not, write to the Free Software Foundation,
 REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 REM
-REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-REM CA 95054 USA or visit www.sun.com if you need additional information or
-REM have any questions.
+REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+REM or visit www.oracle.com if you need additional information or have any
+REM questions.
 REM  
 REM

--- a/hotspot/agent/make/start-rmiregistry.sh
+++ b/hotspot/agent/make/start-rmiregistry.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2000-2003 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2000, 2003, 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
@ -17,9 +17,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please 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/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c
+++ b/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c
@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2002, 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.
 *
 */

--- a/hotspot/agent/src/os/linux/Makefile
+++ b/hotspot/agent/src/os/linux/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright 2002-2009 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 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
@ -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.
 #  
 #

--- a/hotspot/agent/src/os/linux/elfmacros.h
+++ b/hotspot/agent/src/os/linux/elfmacros.h
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 2006, 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.
 *
 */

--- a/hotspot/agent/src/os/linux/libproc.h
+++ b/hotspot/agent/src/os/linux/libproc.h
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 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.
 *
 */

--- a/hotspot/agent/src/os/linux/libproc_impl.c
+++ b/hotspot/agent/src/os/linux/libproc_impl.c
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 2006, 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.
 *
 */
 #include <stdarg.h>
--- a/hotspot/agent/src/os/linux/libproc_impl.h
+++ b/hotspot/agent/src/os/linux/libproc_impl.h
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 2005, 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.
 *
 */

--- a/hotspot/agent/src/os/linux/mapfile
+++ b/hotspot/agent/src/os/linux/mapfile
@ -1,7 +1,7 @@
 #

 #
-# Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2003, 2006, 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.
 #  
 #

--- a/hotspot/agent/src/os/linux/proc_service.h
+++ b/hotspot/agent/src/os/linux/proc_service.h
@ -1,5 +1,5 @@
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 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.
 *
 */

--- a/hotspot/agent/src/os/linux/ps_core.c
+++ b/hotspot/agent/src/os/linux/ps_core.c
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 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
@ -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.
 *
 */

--- a/hotspot/agent/src/os/linux/ps_proc.c
+++ b/hotspot/agent/src/os/linux/ps_proc.c
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 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.
 *
 */

--- a/hotspot/agent/src/os/linux/salibelf.c
+++ b/hotspot/agent/src/os/linux/salibelf.c
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 2006, 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.
 *
 */

--- a/hotspot/agent/src/os/linux/salibelf.h
+++ b/hotspot/agent/src/os/linux/salibelf.h
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 2005, 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.
 *
 */

--- a/hotspot/agent/src/os/linux/symtab.c
+++ b/hotspot/agent/src/os/linux/symtab.c
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 2005, 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.
 *
 */

--- a/hotspot/agent/src/os/linux/symtab.h
+++ b/hotspot/agent/src/os/linux/symtab.h
@ -1,5 +1,5 @@
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 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.
 *
 */

--- a/Show More
+++ b/Show More