diff --git a/build-defs.xml b/build-defs.xml
--- a/build-defs.xml
+++ b/build-defs.xml
@@ -3,1 +3,1 @@
- Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
@@ -8,1 +8,1 @@
- published by the Free Software Foundation.  Sun designates this
+ published by the Free Software Foundation.  Oracle designates this
@@ -10,1 +10,1 @@
- by Sun in the LICENSE file that accompanied this code.
+ by Oracle in the LICENSE file that accompanied this code.
@@ -22,3 +22,3 @@
- Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- CA 95054 USA or visit www.sun.com if you need additional information or
- have any questions.
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
diff --git a/build-drop-template.xml b/build-drop-template.xml
--- a/build-drop-template.xml
+++ b/build-drop-template.xml
@@ -3,1 +3,1 @@
- Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
@@ -8,1 +8,1 @@
- published by the Free Software Foundation.  Sun designates this
+ published by the Free Software Foundation.  Oracle designates this
@@ -10,1 +10,1 @@
- by Sun in the LICENSE file that accompanied this code.
+ by Oracle in the LICENSE file that accompanied this code.
@@ -22,3 +22,3 @@
- Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- CA 95054 USA or visit www.sun.com if you need additional information or
- have any questions.
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
diff --git a/build.properties b/build.properties
--- a/build.properties
+++ b/build.properties
@@ -2,1 +2,1 @@
-# Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
@@ -7,1 +7,1 @@
-# published by the Free Software Foundation.  Sun designates this
+# published by the Free Software Foundation.  Oracle designates this
@@ -9,1 +9,1 @@
-# by Sun in the LICENSE file that accompanied this code.
+# by Oracle in the LICENSE file that accompanied this code.
@@ -21,3 +21,3 @@
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -3,1 +3,1 @@
- Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
@@ -8,1 +8,1 @@
- published by the Free Software Foundation.  Sun designates this
+ published by the Free Software Foundation.  Oracle designates this
@@ -10,1 +10,1 @@
- by Sun in the LICENSE file that accompanied this code.
+ by Oracle in the LICENSE file that accompanied this code.
@@ -22,3 +22,3 @@
- Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- CA 95054 USA or visit www.sun.com if you need additional information or
- have any questions.
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
diff --git a/jaxp.properties b/jaxp.properties
--- a/jaxp.properties
+++ b/jaxp.properties
@@ -2,1 +2,1 @@
-# Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
@@ -7,1 +7,1 @@
-# published by the Free Software Foundation.  Sun designates this
+# published by the Free Software Foundation.  Oracle designates this
@@ -9,1 +9,1 @@
-# by Sun in the LICENSE file that accompanied this code.
+# by Oracle in the LICENSE file that accompanied this code.
@@ -21,3 +21,3 @@
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
diff --git a/make/Makefile b/make/Makefile
--- a/make/Makefile
+++ b/make/Makefile
@@ -2,1 +2,1 @@
-# Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
@@ -7,1 +7,1 @@
-# published by the Free Software Foundation.  Sun designates this
+# published by the Free Software Foundation.  Oracle designates this
@@ -9,1 +9,1 @@
-# by Sun in the LICENSE file that accompanied this code.
+# by Oracle in the LICENSE file that accompanied this code.
@@ -21,3 +21,3 @@
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
diff --git a/make/jprt.properties b/make/jprt.properties
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -2,1 +2,1 @@
-# Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
@@ -7,1 +7,1 @@
-# published by the Free Software Foundation.  Sun designates this
+# published by the Free Software Foundation.  Oracle designates this
@@ -9,1 +9,1 @@
-# by Sun in the LICENSE file that accompanied this code.
+# by Oracle in the LICENSE file that accompanied this code.
@@ -21,3 +21,3 @@
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.