--- a/make/netbeans/langtools/build.xml	Tue Dec 28 11:17:31 2010 -0800
+++ b/make/netbeans/langtools/build.xml	Mon Jan 03 10:38:47 2011 -0800
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright (c) 2007, 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
@@ -13,7 +13,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.
 

--- a/make/netbeans/langtools/nbproject/project.xml	Tue Dec 28 11:17:31 2010 -0800
+++ b/make/netbeans/langtools/nbproject/project.xml	Mon Jan 03 10:38:47 2011 -0800
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright (c) 2007, 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
@@ -13,7 +13,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.
 

--- a/make/netbeans/langtools/nbproject/standard-context-menu-items.ent	Tue Dec 28 11:17:31 2010 -0800
+++ b/make/netbeans/langtools/nbproject/standard-context-menu-items.ent	Mon Jan 03 10:38:47 2011 -0800
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright (c) 2007, 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
@@ -13,7 +13,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.
 

--- a/make/netbeans/langtools/nbproject/standard-ide-actions.ent	Tue Dec 28 11:17:31 2010 -0800
+++ b/make/netbeans/langtools/nbproject/standard-ide-actions.ent	Mon Jan 03 10:38:47 2011 -0800
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright (c) 2007, 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
@@ -13,7 +13,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.
 

--- a/make/tools/SelectTool/SelectToolTask.java	Tue Dec 28 11:17:31 2010 -0800
+++ b/make/tools/SelectTool/SelectToolTask.java	Mon Jan 03 10:38:47 2011 -0800
@@ -1,12 +1,12 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 import java.awt.GridBagConstraints;

--- a/test/tools/javac/6889255/T6889255.java	Tue Dec 28 11:17:31 2010 -0800
+++ b/test/tools/javac/6889255/T6889255.java	Mon Jan 03 10:38:47 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -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/test/tools/javac/T6595666.java	Tue Dec 28 11:17:31 2010 -0800
+++ b/test/tools/javac/T6595666.java	Mon Jan 03 10:38:47 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -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/test/tools/javac/policy/test3/Test.java	Tue Dec 28 11:17:31 2010 -0800
+++ b/test/tools/javac/policy/test3/Test.java	Mon Jan 03 10:38:47 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it