6943119: Rebrand source copyright notices

Reviewed-by: darcy, weijun

56 files changed, 112 insertions, 112 deletions

diff --git a/src/share/demo/jvmti/hprof/README.txt b/src/share/demo/jvmti/hprof/README.txt
index db1a4ec939..cfefddb9b6 100644
--- a/src/share/demo/jvmti/hprof/README.txt
+++ b/src/share/demo/jvmti/hprof/README.txt
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/debug_malloc.c b/src/share/demo/jvmti/hprof/debug_malloc.c
index 80dd90a642..ea7fecece6 100644
--- a/src/share/demo/jvmti/hprof/debug_malloc.c
+++ b/src/share/demo/jvmti/hprof/debug_malloc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/debug_malloc.h b/src/share/demo/jvmti/hprof/debug_malloc.h
index ac349b5678..1325f94e6a 100644
--- a/src/share/demo/jvmti/hprof/debug_malloc.h
+++ b/src/share/demo/jvmti/hprof/debug_malloc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof.h b/src/share/demo/jvmti/hprof/hprof.h
index 4d0cdb644b..a577f883a7 100644
--- a/src/share/demo/jvmti/hprof/hprof.h
+++ b/src/share/demo/jvmti/hprof/hprof.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_b_spec.h b/src/share/demo/jvmti/hprof/hprof_b_spec.h
index 52d868935d..c9a2c346f4 100644
--- a/src/share/demo/jvmti/hprof/hprof_b_spec.h
+++ b/src/share/demo/jvmti/hprof/hprof_b_spec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_blocks.c b/src/share/demo/jvmti/hprof/hprof_blocks.c
index e7eeb813aa..140566584f 100644
--- a/src/share/demo/jvmti/hprof/hprof_blocks.c
+++ b/src/share/demo/jvmti/hprof/hprof_blocks.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_blocks.h b/src/share/demo/jvmti/hprof/hprof_blocks.h
index 81762f9376..cf3157a49a 100644
--- a/src/share/demo/jvmti/hprof/hprof_blocks.h
+++ b/src/share/demo/jvmti/hprof/hprof_blocks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_check.c b/src/share/demo/jvmti/hprof/hprof_check.c
index f944ae2458..b26a413d5b 100644
--- a/src/share/demo/jvmti/hprof/hprof_check.c
+++ b/src/share/demo/jvmti/hprof/hprof_check.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_check.h b/src/share/demo/jvmti/hprof/hprof_check.h
index a054410275..2861306454 100644
--- a/src/share/demo/jvmti/hprof/hprof_check.h
+++ b/src/share/demo/jvmti/hprof/hprof_check.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_class.c b/src/share/demo/jvmti/hprof/hprof_class.c
index 0a047b6fdd..8ffc41e640 100644
--- a/src/share/demo/jvmti/hprof/hprof_class.c
+++ b/src/share/demo/jvmti/hprof/hprof_class.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_class.h b/src/share/demo/jvmti/hprof/hprof_class.h
index dcdb16cf77..270bf083da 100644
--- a/src/share/demo/jvmti/hprof/hprof_class.h
+++ b/src/share/demo/jvmti/hprof/hprof_class.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_cpu.c b/src/share/demo/jvmti/hprof/hprof_cpu.c
index e2c3c6f9fd..77262898e6 100644
--- a/src/share/demo/jvmti/hprof/hprof_cpu.c
+++ b/src/share/demo/jvmti/hprof/hprof_cpu.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_cpu.h b/src/share/demo/jvmti/hprof/hprof_cpu.h
index cf1a3aed73..b22744f9a5 100644
--- a/src/share/demo/jvmti/hprof/hprof_cpu.h
+++ b/src/share/demo/jvmti/hprof/hprof_cpu.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_error.c b/src/share/demo/jvmti/hprof/hprof_error.c
index b83ffb3df2..c7ddd62218 100644
--- a/src/share/demo/jvmti/hprof/hprof_error.c
+++ b/src/share/demo/jvmti/hprof/hprof_error.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_error.h b/src/share/demo/jvmti/hprof/hprof_error.h
index f6bd91d04c..968c31ff44 100644
--- a/src/share/demo/jvmti/hprof/hprof_error.h
+++ b/src/share/demo/jvmti/hprof/hprof_error.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_event.c b/src/share/demo/jvmti/hprof/hprof_event.c
index e0a207701a..734d8afe81 100644
--- a/src/share/demo/jvmti/hprof/hprof_event.c
+++ b/src/share/demo/jvmti/hprof/hprof_event.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_event.h b/src/share/demo/jvmti/hprof/hprof_event.h
index 3775aa1129..207f875ba3 100644
--- a/src/share/demo/jvmti/hprof/hprof_event.h
+++ b/src/share/demo/jvmti/hprof/hprof_event.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_frame.c b/src/share/demo/jvmti/hprof/hprof_frame.c
index 871f05a92c..23a1606654 100644
--- a/src/share/demo/jvmti/hprof/hprof_frame.c
+++ b/src/share/demo/jvmti/hprof/hprof_frame.c
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_frame.h b/src/share/demo/jvmti/hprof/hprof_frame.h
index b5e917e3af..5f9798c356 100644
--- a/src/share/demo/jvmti/hprof/hprof_frame.h
+++ b/src/share/demo/jvmti/hprof/hprof_frame.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_init.c b/src/share/demo/jvmti/hprof/hprof_init.c
index f177386aff..9ac1733874 100644
--- a/src/share/demo/jvmti/hprof/hprof_init.c
+++ b/src/share/demo/jvmti/hprof/hprof_init.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_init.h b/src/share/demo/jvmti/hprof/hprof_init.h
index e4d29e3c58..413e3e02f3 100644
--- a/src/share/demo/jvmti/hprof/hprof_init.h
+++ b/src/share/demo/jvmti/hprof/hprof_init.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_io.c b/src/share/demo/jvmti/hprof/hprof_io.c
index fe4eebeb0c..9d9c0ae94b 100644
--- a/src/share/demo/jvmti/hprof/hprof_io.c
+++ b/src/share/demo/jvmti/hprof/hprof_io.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_io.h b/src/share/demo/jvmti/hprof/hprof_io.h
index 87dc833d23..29cae3a316 100644
--- a/src/share/demo/jvmti/hprof/hprof_io.h
+++ b/src/share/demo/jvmti/hprof/hprof_io.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_ioname.c b/src/share/demo/jvmti/hprof/hprof_ioname.c
index 22b6d0a3e2..4935e21290 100644
--- a/src/share/demo/jvmti/hprof/hprof_ioname.c
+++ b/src/share/demo/jvmti/hprof/hprof_ioname.c
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_ioname.h b/src/share/demo/jvmti/hprof/hprof_ioname.h
index 5e8d6facfc..c070491443 100644
--- a/src/share/demo/jvmti/hprof/hprof_ioname.h
+++ b/src/share/demo/jvmti/hprof/hprof_ioname.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_listener.c b/src/share/demo/jvmti/hprof/hprof_listener.c
index 8591bd432a..05d4768a31 100644
--- a/src/share/demo/jvmti/hprof/hprof_listener.c
+++ b/src/share/demo/jvmti/hprof/hprof_listener.c
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_listener.h b/src/share/demo/jvmti/hprof/hprof_listener.h
index ce9a00fbce..d077f4f338 100644
--- a/src/share/demo/jvmti/hprof/hprof_listener.h
+++ b/src/share/demo/jvmti/hprof/hprof_listener.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_loader.c b/src/share/demo/jvmti/hprof/hprof_loader.c
index adbe52b1aa..eaabed68ba 100644
--- a/src/share/demo/jvmti/hprof/hprof_loader.c
+++ b/src/share/demo/jvmti/hprof/hprof_loader.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_loader.h b/src/share/demo/jvmti/hprof/hprof_loader.h
index 31d9fa50e6..ec40c327b7 100644
--- a/src/share/demo/jvmti/hprof/hprof_loader.h
+++ b/src/share/demo/jvmti/hprof/hprof_loader.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_md.h b/src/share/demo/jvmti/hprof/hprof_md.h
index 690fe1f350..9396381c61 100644
--- a/src/share/demo/jvmti/hprof/hprof_md.h
+++ b/src/share/demo/jvmti/hprof/hprof_md.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_monitor.c b/src/share/demo/jvmti/hprof/hprof_monitor.c
index d62f7547ac..81c9dc11b2 100644
--- a/src/share/demo/jvmti/hprof/hprof_monitor.c
+++ b/src/share/demo/jvmti/hprof/hprof_monitor.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_monitor.h b/src/share/demo/jvmti/hprof/hprof_monitor.h
index e2478a225a..752c1c11c9 100644
--- a/src/share/demo/jvmti/hprof/hprof_monitor.h
+++ b/src/share/demo/jvmti/hprof/hprof_monitor.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_object.c b/src/share/demo/jvmti/hprof/hprof_object.c
index 170cfc4063..619cf3fcd2 100644
--- a/src/share/demo/jvmti/hprof/hprof_object.c
+++ b/src/share/demo/jvmti/hprof/hprof_object.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_object.h b/src/share/demo/jvmti/hprof/hprof_object.h
index 3d3fa4f7f8..efa643ad48 100644
--- a/src/share/demo/jvmti/hprof/hprof_object.h
+++ b/src/share/demo/jvmti/hprof/hprof_object.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_reference.c b/src/share/demo/jvmti/hprof/hprof_reference.c
index 6015009af0..fafaf822ff 100644
--- a/src/share/demo/jvmti/hprof/hprof_reference.c
+++ b/src/share/demo/jvmti/hprof/hprof_reference.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_reference.h b/src/share/demo/jvmti/hprof/hprof_reference.h
index 7b6888a929..c6b36f042d 100644
--- a/src/share/demo/jvmti/hprof/hprof_reference.h
+++ b/src/share/demo/jvmti/hprof/hprof_reference.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_site.c b/src/share/demo/jvmti/hprof/hprof_site.c
index 60ea640dbe..b90cf4f107 100644
--- a/src/share/demo/jvmti/hprof/hprof_site.c
+++ b/src/share/demo/jvmti/hprof/hprof_site.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_site.h b/src/share/demo/jvmti/hprof/hprof_site.h
index 7a5c816302..cf6f04c933 100644
--- a/src/share/demo/jvmti/hprof/hprof_site.h
+++ b/src/share/demo/jvmti/hprof/hprof_site.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_stack.c b/src/share/demo/jvmti/hprof/hprof_stack.c
index 8a78ea4dcf..f283866878 100644
--- a/src/share/demo/jvmti/hprof/hprof_stack.c
+++ b/src/share/demo/jvmti/hprof/hprof_stack.c
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_stack.h b/src/share/demo/jvmti/hprof/hprof_stack.h
index 8dd422cf84..7aaa8ae0f3 100644
--- a/src/share/demo/jvmti/hprof/hprof_stack.h
+++ b/src/share/demo/jvmti/hprof/hprof_stack.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_string.c b/src/share/demo/jvmti/hprof/hprof_string.c
index 4d6abd7e59..1937488741 100644
--- a/src/share/demo/jvmti/hprof/hprof_string.c
+++ b/src/share/demo/jvmti/hprof/hprof_string.c
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_string.h b/src/share/demo/jvmti/hprof/hprof_string.h
index fc9ef49e56..ed58c98256 100644
--- a/src/share/demo/jvmti/hprof/hprof_string.h
+++ b/src/share/demo/jvmti/hprof/hprof_string.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_table.c b/src/share/demo/jvmti/hprof/hprof_table.c
index b680bc28e3..d78719c717 100644
--- a/src/share/demo/jvmti/hprof/hprof_table.c
+++ b/src/share/demo/jvmti/hprof/hprof_table.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_table.h b/src/share/demo/jvmti/hprof/hprof_table.h
index 0bb175b49e..e2ded55b47 100644
--- a/src/share/demo/jvmti/hprof/hprof_table.h
+++ b/src/share/demo/jvmti/hprof/hprof_table.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_tag.c b/src/share/demo/jvmti/hprof/hprof_tag.c
index 8e4cb36402..d2cdcdaa79 100644
--- a/src/share/demo/jvmti/hprof/hprof_tag.c
+++ b/src/share/demo/jvmti/hprof/hprof_tag.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_tag.h b/src/share/demo/jvmti/hprof/hprof_tag.h
index a292b59224..54e339a6ae 100644
--- a/src/share/demo/jvmti/hprof/hprof_tag.h
+++ b/src/share/demo/jvmti/hprof/hprof_tag.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_tls.c b/src/share/demo/jvmti/hprof/hprof_tls.c
index 70cc3edba4..9925b649a4 100644
--- a/src/share/demo/jvmti/hprof/hprof_tls.c
+++ b/src/share/demo/jvmti/hprof/hprof_tls.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_tls.h b/src/share/demo/jvmti/hprof/hprof_tls.h
index edbfd871df..8bd5ceebdc 100644
--- a/src/share/demo/jvmti/hprof/hprof_tls.h
+++ b/src/share/demo/jvmti/hprof/hprof_tls.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_trace.c b/src/share/demo/jvmti/hprof/hprof_trace.c
index c887844fb6..bc6e2f02da 100644
--- a/src/share/demo/jvmti/hprof/hprof_trace.c
+++ b/src/share/demo/jvmti/hprof/hprof_trace.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_trace.h b/src/share/demo/jvmti/hprof/hprof_trace.h
index 0f91acd54f..06b87ae6aa 100644
--- a/src/share/demo/jvmti/hprof/hprof_trace.h
+++ b/src/share/demo/jvmti/hprof/hprof_trace.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_tracker.c b/src/share/demo/jvmti/hprof/hprof_tracker.c
index fe0637ec7d..0d07e55e81 100644
--- a/src/share/demo/jvmti/hprof/hprof_tracker.c
+++ b/src/share/demo/jvmti/hprof/hprof_tracker.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_tracker.h b/src/share/demo/jvmti/hprof/hprof_tracker.h
index 4ca2746974..4c35b209c9 100644
--- a/src/share/demo/jvmti/hprof/hprof_tracker.h
+++ b/src/share/demo/jvmti/hprof/hprof_tracker.h
@@ -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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_util.c b/src/share/demo/jvmti/hprof/hprof_util.c
index b25e5636e7..2948483b0f 100644
--- a/src/share/demo/jvmti/hprof/hprof_util.c
+++ b/src/share/demo/jvmti/hprof/hprof_util.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/hprof_util.h b/src/share/demo/jvmti/hprof/hprof_util.h
index e26464dee6..aebf2a18e9 100644
--- a/src/share/demo/jvmti/hprof/hprof_util.h
+++ b/src/share/demo/jvmti/hprof/hprof_util.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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- *   - Neither the name of Sun Microsystems nor the names of its
+ *   - Neither the name of Oracle nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
diff --git a/src/share/demo/jvmti/hprof/jvm.hprof.txt b/src/share/demo/jvmti/hprof/jvm.hprof.txt
index fe2d8bbed7..3c8e5fcdb0 100644
--- a/src/share/demo/jvmti/hprof/jvm.hprof.txt
+++ b/src/share/demo/jvmti/hprof/jvm.hprof.txt
@@ -1,4 +1,4 @@
-Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -11,7 +11,7 @@ are met:
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
 
-  - Neither the name of Sun Microsystems nor the names of its
+  - Neither the name of Oracle nor the names of its
     contributors may be used to endorse or promote products derived
     from this software without specific prior written permission.
 
diff --git a/src/share/demo/jvmti/hprof/sample.makefile.txt b/src/share/demo/jvmti/hprof/sample.makefile.txt
index 9ef36a1daa..4b7499e407 100644
--- a/src/share/demo/jvmti/hprof/sample.makefile.txt
+++ b/src/share/demo/jvmti/hprof/sample.makefile.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2004-2005 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
 #     notice, this list of conditions and the following disclaimer in the
 #     documentation and/or other materials provided with the distribution.
 #
-#   - Neither the name of Sun Microsystems nor the names of its
+#   - Neither the name of Oracle nor the names of its
 #     contributors may be used to endorse or promote products derived
 #     from this software without specific prior written permission.
 #