Merge
authorlana
Tue, 04 Jan 2011 17:10:35 -0800
changeset 7847 5d1dad3342a3
parent 7846 f72ce57eb9c1 (current diff)
parent 7683 aa894c225b1a (diff)
child 7848 884a6d60b235
Merge
jdk/make/common/internal/BinaryPlugs.gmk
langtools/make/Makefile
langtools/src/share/classes/com/sun/tools/javac/file/Paths.java
langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
langtools/test/tools/javac/nio/compileTest/CompileTest.java
--- a/.hgtags	Thu Dec 23 12:29:21 2010 -0800
+++ b/.hgtags	Tue Jan 04 17:10:35 2011 -0800
@@ -97,3 +97,4 @@
 8c840d3ab24f8d0f422b991638acb44b6ab1d98c jdk7-b120
 0ce0a2c3a6926677dc507839a820ab6625541e5a jdk7-b121
 6f09ea1c034f087916d2a8cf0d22be768400118f jdk7-b122
+142129d8599d1f56b29387e7f9a5fad53b6d61df jdk7-b123
--- a/.hgtags-top-repo	Thu Dec 23 12:29:21 2010 -0800
+++ b/.hgtags-top-repo	Tue Jan 04 17:10:35 2011 -0800
@@ -97,3 +97,4 @@
 366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
 2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121
 f1591eed71f64f6eba79fb7426f5616cc4dfea73 jdk7-b122
+ed6950da30cf1e8904b4bdb034d471647942271f jdk7-b123
--- a/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -156,12 +156,6 @@
   clobber:: deploy-clobber
 endif
 
-ifeq ($(BUILD_JDK), true)
-  ifeq ($(BUNDLE_RULES_AVAILABLE), true)
-    generic_build_repo_series:: openjdk-binary-plugs-bundles
-  endif
-endif
-
 # The debug build, fastdebug or debug. Needs special handling.
 #  Note that debug builds do NOT do INSTALL steps, but must be done
 #  after the product build and before the INSTALL step of the product build.
@@ -301,7 +295,6 @@
   ifeq ($(BUILD_JDK), true)
     ifeq ($(BUNDLE_RULES_AVAILABLE), true)
 
-OPENJDK_PLUGS=$(ABS_OUTPUTDIR)/$(OPENJDK_BINARY_PLUGS_INAME)
 OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output
 OPENJDK_BUILD_NAME \
   = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE)
@@ -330,7 +323,6 @@
 	  GENERATE_DOCS=false \
 	  ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \
 	  ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \
-	  ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \
 	  ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \
 	  ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \
 		product_build )
@@ -456,7 +448,6 @@
 DEVTOOLS_PATH.desc         = Directory containing zip and gnumake
 CUPS_HEADERS_PATH.desc     = Include directory location for CUPS header files
 DXSDK_PATH.desc            = Root directory of DirectX SDK
-MSDEVTOOLS_PATH.desc       = Root directory of VC++ tools (e.g. rc.exe)
 MSVCRT_DLL_PATH.desc       = Directory containing mscvrt.dll
 
 # Make variables to print out (description and value)
@@ -487,12 +478,10 @@
 
 VARIABLE_PRINTVAL_LIST +=       \
     DXSDK_PATH                  \
-    MSDEVTOOLS_PATH             \
     MSVCRT_DLL_PATH
 
 VARIABLE_CHECKDIR_LIST +=       \
     DXSDK_PATH                  \
-    MSDEVTOOLS_PATH             \
     MSVCRT_DLL_PATH
 
 endif
@@ -548,7 +537,7 @@
 "
 
 ################################################################
-# Source and binary plug bundling
+# Source bundling
 ################################################################
 ifeq ($(BUNDLE_RULES_AVAILABLE), true)
   include $(BUNDLE_RULES)
--- a/README	Thu Dec 23 12:29:21 2010 -0800
+++ b/README	Tue Jan 04 17:10:35 2011 -0800
@@ -1,28 +1,38 @@
 README:
-  This file should be located at the top of the OpenJDK Mercurial repository
-  forest. This top or enclosing repository will include a "make" directory,
-  and a Makefile at the very top of the repository.
-  It should also include the 6 repositories: "jdk", "hotspot", "langtools",
-  "corba", "jaxws"  and "jaxp".
+  This file should be located at the top of the OpenJDK Mercurial root
+  repository. This root repository will include a "make" directory,
+  and a Makefile for building the entire OpenJDK.
+  A full OpenJDK repository set (forest) should also include the following
+  6 nested repositories:
+    "jdk", "hotspot", "langtools", "corba", "jaxws"  and "jaxp".
+  There are also several source downloads for the jax* repositories that
+  will be needed.
+
+  This one root repository can be obtained with something like:
+    hg clone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7
+  To make sure you have all the nested repositories, you can run:
+    cd openjdk7 && sh ./get_source.sh
+  (This is identical to using the Mercurial Forest Extension command 
+   'hg fclone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7').
+  People unfamiliar with Mercurial should read the first few chapters of
+  the Mercurial book: http://hgbook.red-bean.com/read/
 
   See http://openjdk.java.net/ for more information about the OpenJDK.
 
 Simple Build Instructions:
-
-  1. Download and install a JDK 6 from
-     http://java.sun.com/javase/downloads/index.jsp
-     Set the environment variable ALT_BOOTDIR to the location of this JDK 6.
+  
+  0. Get the necessary system software/packages installed on your system, see
+     http://hg.openjdk.java.net/jdk7/build/raw-file/tip/README-builds.html
 
-  2. Download and install the Binary Plugs for the most recent JDK7 from
-     http://download.java.net/openjdk/jdk7/
-     Set the environment variable ALT_BINARY_PLUGS_PATH to the location of
-     these binary plugs.
-     
-  3. Check the sanity of doing a build with the current machine:
+  1. If you don't have a jdk6 installed, download and install a JDK 6 from
+     http://java.sun.com/javase/downloads/index.jsp
+     Set the environment variable ALT_BOOTDIR to the location of JDK 6.
+
+  2. Check the sanity of doing a build with your current system:
        gnumake sanity
      See README-builds.html if you run into problems.
   
-  4. Do a complete build of the jdk:
+  3. Do a complete build of the OpenJDK:
        gnumake all
      The resulting JDK image should be found in build/*/j2sdk-image
 
--- a/README-builds.html	Thu Dec 23 12:29:21 2010 -0800
+++ b/README-builds.html	Tue Jan 04 17:10:35 2011 -0800
@@ -24,12 +24,12 @@
         <h2><a name="introduction">Introduction</a></h2>
         <blockquote>
             <p>
-            This README file contains build instructions for the 
-            <a href="http://openjdk.java.net"  target="_blank">OpenJDK</a>.
-            Building the source code for the 
-            OpenJDK
-            requires
-            a certain degree of technical expertise.
+                This README file contains build instructions for the
+                <a href="http://openjdk.java.net"  target="_blank">OpenJDK</a>.
+                Building the source code for the
+                OpenJDK
+                requires
+                a certain degree of technical expertise.
         </blockquote>
         <!-- ------------------------------------------------------ -->
         <hr>
@@ -37,18 +37,23 @@
         <blockquote>
             <ul>
                 <li><a href="#introduction">Introduction</a></li>
+                <li><a href="#hg">Use of Mercurial</a>
+                    <ul>
+                        <li><a href="#get_source">Getting the Source</a></li>
+                    </ul>
+                </li>
                 <li><a href="#MBE">Minimum Build Environments</a></li>
                 <li><a href="#SDBE">Specific Developer Build Environments</a>
                     <ul>
                         <li><a href="#fedora">Fedora Linux</a> </li>
                         <li><a href="#centos">CentOS Linux</a> </li>
-		        <li><a href="#debian">Debian GNU/Linux</a></li>
-			<li><a href="#ubuntu">Ubuntu Linux</a> </li>
-		        <li><a href="#opensuse">OpenSUSE</a></li>
-		        <li><a href="#mandriva">Mandriva</a></li>
-		        <li><a href="#opensolaris">OpenSolaris</a></li>
+                        <li><a href="#debian">Debian GNU/Linux</a></li>
+                        <li><a href="#ubuntu">Ubuntu Linux</a> </li>
+                        <li><a href="#opensuse">OpenSUSE</a></li>
+                        <li><a href="#mandriva">Mandriva</a></li>
+                        <li><a href="#opensolaris">OpenSolaris</a></li>
                     </ul>
-		</li>
+                </li>
                 <li><a href="#directories">Source Directory Structure</a> </li>
                 <li><a href="#building">Build Information</a>
                     <ul>
@@ -56,42 +61,42 @@
                         <li><a href="#linux">Basic Linux System Setup</a> </li>
                         <li><a href="#solaris">Basic Solaris System Setup</a> </li>
                         <li><a href="#windows">Basic Windows System Setup</a> </li>
-                        <li><a href="#dependencies">Build Dependencies</a> </li>
-                        <ul>
-                            <li><a href="#bootjdk">Bootstrap JDK</a> </li>
-                            <li><a href="#binaryplugs">Binary Plugs</a> </li>
-                            <li><a href="#importjdk">Optional Import JDK</a> </li>
-                            <li><a href="#ant">Ant</a> </li>
-                            <li><a href="#cacerts">Certificate Authority File (cacert)</a> </li>
-                            <li><a href="#compilers">Compilers</a> 
-                                <ul>
-                                    <li><a href="#msvc32">Microsoft Visual Studio Professional/Express for 32 bit</a> </li>
-                                    <li><a href="#msvc64">Microsoft Visual Studio Professional for 64 bit</a> </li>
-                                    <li><a href="#mssdk64">Microsoft Windows SDK for 64 bit</a> </li>
-                                    <li><a href="#gcc">Linux gcc/binutils</a> </li>
-                                    <li><a href="#studio">Sun Studio</a> </li>
-                                </ul>
-                            </li>
-                            <li><a href="#zip">Zip and Unzip</a> </li>
-                            <li><a href="#freetype">FreeType2 Fonts</a> </li>
-                            <li>Linux and Solaris:
-                                <ul>
-                                    <li><a href="#cups">CUPS Include files</a> </li>
-                                    <li><a href="#xrender">XRender Include files</a></li>
-                                </ul>
-                            </li>
-                            <li>Linux only:
-                                <ul>
-                                    <li><a href="#alsa">ALSA files</a> </li>
-                                </ul>
-                            </li>
-                            <li>Windows only:
-                                <ul>
-                                    <li>Unix Command Tools (<a href="#cygwin">CYGWIN</a>)</li>
-                                    <li><a href="#dxsdk">DirectX 9.0 SDK</a> </li>
-                                </ul>
-                            </li>
-                        </ul>
+                        <li><a href="#dependencies">Build Dependencies</a>
+                            <ul>
+                                <li><a href="#bootjdk">Bootstrap JDK</a> </li>
+                                <li><a href="#importjdk">Optional Import JDK</a> </li>
+                                <li><a href="#ant">Ant</a> </li>
+                                <li><a href="#cacerts">Certificate Authority File (cacert)</a> </li>
+                                <li><a href="#compilers">Compilers</a>
+                                    <ul>
+                                        <li><a href="#msvc32">Microsoft Visual Studio Professional/Express for 32 bit</a> </li>
+                                        <li><a href="#msvc64">Microsoft Visual Studio Professional for 64 bit</a> </li>
+                                        <li><a href="#mssdk64">Microsoft Windows SDK for 64 bit</a> </li>
+                                        <li><a href="#gcc">Linux gcc/binutils</a> </li>
+                                        <li><a href="#studio">Sun Studio</a> </li>
+                                    </ul>
+                                </li>
+                                <li><a href="#zip">Zip and Unzip</a> </li>
+                                <li><a href="#freetype">FreeType2 Fonts</a> </li>
+                                <li>Linux and Solaris:
+                                    <ul>
+                                        <li><a href="#cups">CUPS Include files</a> </li>
+                                        <li><a href="#xrender">XRender Include files</a></li>
+                                    </ul>
+                                </li>
+                                <li>Linux only:
+                                    <ul>
+                                        <li><a href="#alsa">ALSA files</a> </li>
+                                    </ul>
+                                </li>
+                                <li>Windows only:
+                                    <ul>
+                                        <li>Unix Command Tools (<a href="#cygwin">CYGWIN</a>)</li>
+                                        <li><a href="#dxsdk">DirectX 9.0 SDK</a> </li>
+                                    </ul>
+                                </li>
+                            </ul>
+                        </li>
                     </ul>
                 </li>
                 <li><a href="#creating">Creating the Build</a> </li>
@@ -100,6 +105,76 @@
                 <li><a href="#troubleshooting">Troubleshooting</a></li>
             </ul>
         </blockquote>
+
+        <!-- ------------------------------------------------------ -->
+        <hr>
+        <h2><a name="hg">Use of Mercurial</a></h2>
+        <blockquote>
+            The OpenJDK sources are maintained with the revision control system
+            <a href="http://mercurial.selenic.com/wiki/Mercurial">Mercurial</a>.
+            If you are new to Mercurial, please see the
+            <a href="http://mercurial.selenic.com/wiki/BeginnersGuides">Beginner Guides</a>
+            or refer to the <a href=""http://hgbook.red-bean.com/">Mercurial Book</a>.
+            The first few chapters of the book provide an excellent overview of
+            Mercurial, what it is and how it works.
+            <br>
+            For using Mercurial with the OpenJDK refer to the
+            <a href=""http://openjdk.java.net/guide/repositories.html#installConfig">
+               Developer Guide: Installing and Configuring Mercurial</a>
+            section for more information.
+            The Forest Extension is not part of the Mercurial install,
+            and is optional,
+            but can be obtained with the following commands:
+            <blockquote>
+                <tt>
+                    hg clone https://bitbucket.org/pmezard/hgforest-crew/overview/ <i>YourHgForest</i>
+                </tt>
+            </blockquote>
+            Once you have the file <tt>forest.py</tt>, you need to add these
+            lines to your <tt>${HOME}/.hgrc</tt> file:
+            <blockquote>
+                <tt>
+                    [extensions]
+                    <br>forest = <i>YourHgForest</i>/forest.py
+                </tt>
+            </blockquote>
+
+            <!-- ------------------------------------------------------ -->
+            <h3><a name="get_source">Getting the Source</a></h3>
+            <blockquote>
+                To get the entire set of OpenJDK Mercurial repositories
+                using the Forest Extension:
+                <blockquote>
+                    <tt>
+                        hg fclone http://openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i>
+                    </tt>
+                </blockquote>
+                To get the entire set of OpenJDK Mercurial repositories
+                without using the Forest Extension:
+                <blockquote>
+                    <tt>
+                        hg clone http://openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i>
+                        <br>cd <i>YourOpenJDK</i>
+                        <br>sh ./get_source.sh
+                    </tt>
+                </blockquote>
+                Once you have all the repositories, the
+                script <tt>make/scripts/hgforest.sh</tt>
+                can be used to repeat the same <tt>hg</tt>
+                command on every repository in the forest, e.g.
+                <blockquote>
+                    <tt>
+                        cd <i>YourOpenJDK</i>
+                        <br>sh ./make/scripts/hgforest.sh pull -u
+                    </tt>
+                </blockquote>
+                You may find this script <tt>make/scripts/hgforest.sh</tt> faster
+                than the <tt>hg</tt> forest commands provided by the
+                Forest Extension.
+            </blockquote>
+
+        </blockquote>
+
         <!-- ------------------------------------------------------ -->
         <hr>
         <h2><a name="MBE">Minimum Build Environments</a></h2>
@@ -116,8 +191,8 @@
             specific platforms, and in fact creating these specific platforms
             may be difficult due to the age of some of this software.
             <p>
-            The minimum OS and C/C++ compiler versions needed for building the
-            OpenJDK:
+                The minimum OS and C/C++ compiler versions needed for building the
+                OpenJDK:
             <p>
             <table border="1">
                 <thead>
@@ -146,7 +221,7 @@
                         <td>Solaris 10u2 + patches 
                             <br>
                             See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
-                            SunSolve</a> for patch downloads.
+                                SunSolve</a> for patch downloads.
                         </td>
                         <td>Sun Studio 12 Update 1 + patches</td>
                         <td>JDK 6u14 FCS </td>
@@ -156,7 +231,7 @@
                         <td>Solaris 10u2 + patches
                             <br>
                             See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
-                            SunSolve</a> for patch downloads.
+                                SunSolve</a> for patch downloads.
                         </td>
                         <td>Sun Studio 12 Update 1 + patches</td>
                         <td>JDK 6u14 FCS </td>
@@ -166,7 +241,7 @@
                         <td>Solaris 10u2 + patches
                             <br>
                             See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
-                            SunSolve</a> for patch downloads.
+                                SunSolve</a> for patch downloads.
                         </td>
                         <td>Sun Studio 12 Update 1 + patches</td>
                         <td>JDK 6u14 FCS </td>
@@ -176,7 +251,7 @@
                         <td>Solaris 10u2 + patches
                             <br>
                             See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
-                            SunSolve</a> for patch downloads.
+                                SunSolve</a> for patch downloads.
                         </td>
                         <td>Sun Studio 12 Update 1 + patches</td>
                         <td>JDK 6u14 FCS </td>
@@ -195,14 +270,14 @@
                     </tr>
                 </tbody>
             </table>
-	    <p>
+            <p>
 	    These same sources do indeed build on many more systems than the
 	    above older generation systems, again the above is just a minimum.
-	    <p>
+            <p>
 	    Compilation problems with newer or different C/C++ compilers is a
 	    common problem.
 	    Similarly, compilation problems related to changes to the
-	    <tt>/usr/include</tt> or system header files is also a
+                <tt>/usr/include</tt> or system header files is also a
 	    common problem with newer or unreleased OS versions.
 	    Please report these types of problems as bugs so that they
 	    can be dealt with accordingly.
@@ -217,57 +292,57 @@
         <!-- ------------------------------------------------------ -->
         <h3><a name="fedora">Fedora</a></h3>
         <blockquote>
-	  <h4>Fedora 9</h4>
-	  <p>
-	    <blockquote>
-              After installing <a href="http://fedoraproject.org">Fedora</a> 9 
+            <h4>Fedora 9</h4>
+            <p>
+            <blockquote>
+                After installing <a href="http://fedoraproject.org">Fedora</a> 9
 	      you need to install several build dependencies. The simplest
 	      way to do it is to execute the following commands as user 
-	      <tt>root</tt>:
-	      <p/>
-	      <code>yum-builddep java-openjdk</code>
-	      <p/>
-	      <code>yum install gcc gcc-c++</code>
-	      <p/>
+                <tt>root</tt>:
+                <p/>
+                <code>yum-builddep java-openjdk</code>
+                <p/>
+                <code>yum install gcc gcc-c++</code>
+                <p/>
 	      In addition, it's necessary to set a few environment variables for the build:
 
-	      <p/>
-	      <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code>
+                <p/>
+                <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code>
             </blockquote>
-	  <h4>Fedora 10</h4>
-	  <p>
-	    <blockquote>
-              After installing <a href="http://fedoraproject.org">Fedora</a> 10 
+            <h4>Fedora 10</h4>
+            <p>
+            <blockquote>
+                After installing <a href="http://fedoraproject.org">Fedora</a> 10
 	      you need to install several build dependencies. The simplest
 	      way to do it is to execute the following commands as user 
-	      <tt>root</tt>:
-	      <p/>
-	      <code>yum-builddep java-1.6.0-openjdk</code>
-	      <p/>
-	      <code>yum install gcc gcc-c++</code>
-	      <p/>
+                <tt>root</tt>:
+                <p/>
+                <code>yum-builddep java-1.6.0-openjdk</code>
+                <p/>
+                <code>yum install gcc gcc-c++</code>
+                <p/>
 	      In addition, it's necessary to set a few environment variables for the build:
 
-	      <p/>
-	      <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code>
+                <p/>
+                <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code>
             </blockquote>
-	  <h4>Fedora 11</h4>
-	  <p>
-	    <blockquote>
-              After installing <a href="http://fedoraproject.org">Fedora</a> 11 
+            <h4>Fedora 11</h4>
+            <p>
+            <blockquote>
+                After installing <a href="http://fedoraproject.org">Fedora</a> 11
 	      you need to install several build dependencies. The simplest
 	      way to do it is to execute the following commands as user 
-	      <tt>root</tt>:
-	      <p/>
-	      <code>yum-builddep java-1.6.0-openjdk</code>
-	      <p/>
-	      <code>yum install gcc gcc-c++</code>
-	      <p/>
+                <tt>root</tt>:
+                <p/>
+                <code>yum-builddep java-1.6.0-openjdk</code>
+                <p/>
+                <code>yum install gcc gcc-c++</code>
+                <p/>
 	      In addition, it's necessary to set a few environment variables for the build:
 
-	      <p/>
-	      <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code>
-             </blockquote>
+                <p/>
+                <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code>
+            </blockquote>
         </blockquote>
         <!-- ------------------------------------------------------ -->
         <h3><a name="centos">CentOS 5.2</a></h3>
@@ -285,7 +360,7 @@
                 </ul>
             </blockquote>
             <p>
-            Plus the following packages:
+                Plus the following packages:
             <blockquote>
                 <ul>
                     <li>cups devel: Cups Development Package</li>
@@ -295,188 +370,188 @@
                 </ul>
             </blockquote>
             <p>
-            The freetype 2.3 packages don't seem to be available,
-            but the freetype 2.3 sources can be downloaded, built,
-            and installed easily enough from
-            <a href="http://downloads.sourceforge.net/freetype">
-            the freetype site</a>.
-            Build and install with something like:
+                The freetype 2.3 packages don't seem to be available,
+                but the freetype 2.3 sources can be downloaded, built,
+                and installed easily enough from
+                <a href="http://downloads.sourceforge.net/freetype">
+                    the freetype site</a>.
+                Build and install with something like:
             <blockquote>
                 <tt>./configure && make && sudo -u root make install</tt>
             </blockquote>
             <p>
-            Mercurial packages could not be found easily, but a Google
-            search should find ones, and they usually include Python if
-            it's needed.
+                Mercurial packages could not be found easily, but a Google
+                search should find ones, and they usually include Python if
+                it's needed.
         </blockquote>
         <!-- ------------------------------------------------------ -->
         <h3><a name="debian">Debian</a></h3>
         <blockquote>
             <h4>Debian 5.0 (Lenny)</h4>
             <p>
-	      <blockquote>
+            <blockquote>
 		After installing <a href="http://debian.org">Debian</a> 5 
 		you need to install several build dependencies. 
 		The simplest way to install the build dependencies is to 
 		execute the following commands as user <tt>root</tt>:
-		<p/>
-		<code>aptitude build-dep openjdk-6</code>
-		<p/>
-		<code>aptitude install openjdk-6-jdk libmotif-dev</code>
-		<p/>
+                <p/>
+                <code>aptitude build-dep openjdk-6</code>
+                <p/>
+                <code>aptitude install openjdk-6-jdk libmotif-dev</code>
+                <p/>
 		In addition, it's necessary to set a few environment variables for the build:
-		<p/>
-		<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
-	      </blockquote>
+                <p/>
+                <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
+            </blockquote>
         </blockquote>
         <!-- ====================================================== -->
-	<h3><a name="ubuntu">Ubuntu</a></h3>
+        <h3><a name="ubuntu">Ubuntu</a></h3>
         <blockquote>
             <h4>Ubuntu 8.04</h4>
             <p>
-	      <blockquote>
+            <blockquote>
 		After installing <a href="http://ubuntu.org">Ubuntu</a> 8.04 
 		you need to install several build dependencies. 
-		<p/>
+                <p/>
 		First, you need to enable the universe repository in the 
 		Software Sources application and reload the repository 
 		information. The Software Sources application is available 
 		under the System/Administration menu. 
-		<p/>
+                <p/>
 		The simplest way to install the build dependencies is to 
 		execute the following commands:
-		<p/>
-		<code>sudo aptitude build-dep openjdk-6</code>
-		<p/>
-		<code>sudo aptitude install openjdk-6-jdk</code>
-		<p/>
+                <p/>
+                <code>sudo aptitude build-dep openjdk-6</code>
+                <p/>
+                <code>sudo aptitude install openjdk-6-jdk</code>
+                <p/>
 		In addition, it's necessary to set a few environment variables for the build:
-		<p/>
-		<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
-              </blockquote>
-           <h4>Ubuntu 8.10</h4>
+                <p/>
+                <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
+            </blockquote>
+            <h4>Ubuntu 8.10</h4>
             <p>
-	      <blockquote>
+            <blockquote>
 		After installing <a href="http://ubuntu.org">Ubuntu</a> 8.10 
 		you need to install several build dependencies. The simplest
 		way to do it is to execute the following commands:
-		<p/>
-		<code>sudo aptitude build-dep openjdk-6</code>
-		<p/>
-		<code>sudo aptitude install openjdk-6-jdk</code>
-		<p/>
+                <p/>
+                <code>sudo aptitude build-dep openjdk-6</code>
+                <p/>
+                <code>sudo aptitude install openjdk-6-jdk</code>
+                <p/>
 		In addition, it's necessary to set a few environment variables for the build:
-		<p/>
-		<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
-             </blockquote>
-           <h4>Ubuntu 9.04</h4>
+                <p/>
+                <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
+            </blockquote>
+            <h4>Ubuntu 9.04</h4>
             <p>
-	      <blockquote>
+            <blockquote>
 		After installing <a href="http://ubuntu.org">Ubuntu</a> 9.04 
 		you need to install several build dependencies. The simplest
 		way to do it is to execute the following commands:
-		<p/>
-		<code>sudo aptitude build-dep openjdk-6</code>
-		<p/>
-		<code>sudo aptitude install openjdk-6-jdk</code>
-		<p/>
+                <p/>
+                <code>sudo aptitude build-dep openjdk-6</code>
+                <p/>
+                <code>sudo aptitude install openjdk-6-jdk</code>
+                <p/>
 		In addition, it's necessary to set a few environment variables for the build:
-		<p/>
-		<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
-             </blockquote>
+                <p/>
+                <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
+            </blockquote>
         </blockquote>
         <!-- ====================================================== -->
         <h3><a name="opensuse">OpenSUSE</a></h3>
         <blockquote>
             <h4>OpenSUSE 11.1</h4>
             <p>
-	      <blockquote>
+            <blockquote>
 		After installing <a href="http://opensuse.org">OpenSUSE</a> 11.1 
 		you need to install several build dependencies. 
 		The simplest way to install the build dependencies is to 
 		execute the following commands:
-		<p/>
-		<code>sudo zypper source-install -d java-1_6_0-openjdk</code>
-		<p/>
-		<code>sudo zypper install make</code>
-		<p/>
+                <p/>
+                <code>sudo zypper source-install -d java-1_6_0-openjdk</code>
+                <p/>
+                <code>sudo zypper install make</code>
+                <p/>
 		In addition, it is necessary to set a few environment variables for the build:
-		<p/>
-		<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk</code>
-		<p/>
+                <p/>
+                <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk</code>
+                <p/>
 		Finally, you need to unset the <code>JAVA_HOME</code> environment variable:
-		<p/>
-		<code>export -n JAVA_HOME</code>
-	      </blockquote>
-	</blockquote>
+                <p/>
+                <code>export -n JAVA_HOME</code>
+            </blockquote>
+        </blockquote>
         <!-- ====================================================== -->
         <h3><a name="mandriva">Mandriva</a></h3>
         <blockquote>
             <h4>Mandriva Linux One 2009 Spring</h4>
             <p>
-	      <blockquote>
+            <blockquote>
 		After installing <a href="http://mandriva.org">Mandriva</a> Linux One 2009 Spring 
 		you need to install several build dependencies. 
 		The simplest way to install the build dependencies is to 
 		execute the following commands as user <tt>root</tt>:
-		<p/>
-		<code>urpmi java-1.6.0-openjdk-devel ant make gcc gcc-c++ freetype-devel zip unzip libcups2-devel libxrender1-devel libalsa2-devel libstc++-static-devel libxtst6-devel libxi-devel</code>
+                <p/>
+                <code>urpmi java-1.6.0-openjdk-devel ant make gcc gcc-c++ freetype-devel zip unzip libcups2-devel libxrender1-devel libalsa2-devel libstc++-static-devel libxtst6-devel libxi-devel</code>
                 <p/>
 		In addition, it is necessary to set a few environment variables for the build:
-		<p/>
-		<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk</code>
-	      </blockquote>
+                <p/>
+                <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk</code>
+            </blockquote>
         </blockquote>
         <!-- ====================================================== -->
         <h3><a name="opensolaris">OpenSolaris</a></h3>
         <blockquote>
             <h4>OpenSolaris 2009.06</h4>
             <p>
-	      <blockquote>
+            <blockquote>
 		After installing <a href="http://opensolaris.org">OpenSolaris</a> 2009.06 
 		you need to install several build dependencies. 
 		The simplest way to install the build dependencies is to 
 		execute the following commands:
-		<p/>
-		<code>pfexec pkg install SUNWgmake SUNWj6dev SUNWant sunstudioexpress SUNWcups SUNWzip SUNWunzip SUNWxwhl SUNWxorg-headers SUNWaudh SUNWfreetype2</code>
+                <p/>
+                <code>pfexec pkg install SUNWgmake SUNWj6dev SUNWant sunstudioexpress SUNWcups SUNWzip SUNWunzip SUNWxwhl SUNWxorg-headers SUNWaudh SUNWfreetype2</code>
                 <p/>
 		In addition, it is necessary to set a few environment variables for the build:
-		<p/>
-		<code>export LANG=C ALT_COMPILER_PATH=/opt/SunStudioExpress/bin/ ALT_CUPS_HEADERS_PATH=/usr/include/</code>
-		<p/>
+                <p/>
+                <code>export LANG=C ALT_COMPILER_PATH=/opt/SunStudioExpress/bin/ ALT_CUPS_HEADERS_PATH=/usr/include/</code>
+                <p/>
 		Finally, you need to make sure that the build process can find the Sun Studio compilers:
-		<p/>
-		<code>export PATH=$PATH:/opt/SunStudioExpress/bin/</code>
-	      </blockquote>
+                <p/>
+                <code>export PATH=$PATH:/opt/SunStudioExpress/bin/</code>
+            </blockquote>
         </blockquote>
         <!-- ------------------------------------------------------ -->  
         <hr>
         <h2><a name="directories">Source Directory Structure</a></h2>
         <blockquote>
             <p>
-            The source code for the OpenJDK is delivered in a set of
-            directories:
-            <tt>hotspot</tt>, 
-            <tt>langtools</tt>, 
-            <tt>corba</tt>, 
-            <tt>jaxws</tt>, 
-            <tt>jaxp</tt>, 
-            and
-            <tt>jdk</tt>.
-            The <tt>hotspot</tt> directory contains the source code and make
-            files for building the OpenJDK Hotspot Virtual Machine. 
-            The <tt>langtools</tt> directory contains the source code and make
-            files for building the OpenJDK javac and language tools.
-            The <tt>corba</tt> directory contains the source code and make
-            files for building the OpenJDK Corba files.
-            The <tt>jaxws</tt> directory contains the source code and make
-            files for building the OpenJDK JAXWS files.
-            The <tt>jaxp</tt> directory contains the source code and make
-            files for building the OpenJDK JAXP files.
-            The <tt>jdk</tt> directory contains the source code and make files for
-            building the OpenJDK runtime libraries and misc files.
-            The top level <tt>Makefile</tt>
-            is used to build the entire OpenJDK.
+                The source code for the OpenJDK is delivered in a set of
+                directories:
+                <tt>hotspot</tt>,
+                <tt>langtools</tt>,
+                <tt>corba</tt>,
+                <tt>jaxws</tt>,
+                <tt>jaxp</tt>,
+                and
+                <tt>jdk</tt>.
+                The <tt>hotspot</tt> directory contains the source code and make
+                files for building the OpenJDK Hotspot Virtual Machine.
+                The <tt>langtools</tt> directory contains the source code and make
+                files for building the OpenJDK javac and language tools.
+                The <tt>corba</tt> directory contains the source code and make
+                files for building the OpenJDK Corba files.
+                The <tt>jaxws</tt> directory contains the source code and make
+                files for building the OpenJDK JAXWS files.
+                The <tt>jaxp</tt> directory contains the source code and make
+                files for building the OpenJDK JAXP files.
+                The <tt>jdk</tt> directory contains the source code and make files for
+                building the OpenJDK runtime libraries and misc files.
+                The top level <tt>Makefile</tt>
+                is used to build the entire OpenJDK.
         </blockquote>
         <!-- ------------------------------------------------------ -->
         <hr>
@@ -495,10 +570,10 @@
             <tt>ALT_*</tt> variables (alternates)
             can be used to help the makefiles locate components.
             <p>
-            Refer to the bash/sh/ksh setup file
-            <tt>jdk/make/jdk_generic_profile.sh</tt>
-            if you need help in setting up your environment variables.
-            A build could be as simple as:
+                Refer to the bash/sh/ksh setup file
+                <tt>jdk/make/jdk_generic_profile.sh</tt>
+                if you need help in setting up your environment variables.
+                A build could be as simple as:
             <blockquote>
                 <pre><tt>
                 bash
@@ -507,12 +582,12 @@
                 </tt></pre>
             </blockquote>
             <p>
-            Of course ksh or sh would work too.
-            But some customization will probably be necessary.
-            The <tt>sanity</tt> rule will make some basic checks on build
-            dependencies and generate appropriate warning messages
-            regarding missing, out of date, or newer than expected components
-            found on your system.
+                Of course ksh or sh would work too.
+                But some customization will probably be necessary.
+                The <tt>sanity</tt> rule will make some basic checks on build
+                dependencies and generate appropriate warning messages
+                regarding missing, out of date, or newer than expected components
+                found on your system.
         </blockquote>
         <!-- ------------------------------------------------------ -->
         <hr>
@@ -559,14 +634,14 @@
                     version that has this problem fixed.
                     The older 3.80 version of make.exe can be downloaded with this
                     <a href="http://cygwin.paracoda.com/release/make/make-3.80-1.tar.bz2" target="_blank">
-                    link</a>.
+                        link</a>.
                     Use of this older 3.80 make.exe may require that you install the
                     libintl2.dll library or libintl2 cygwin package which is
                     no longer installed by default by the cygwin installer.
                     <br>
                     Also see the
                     <a href="http://developer.mozilla.org/en/docs/Windows_build_prerequisites_using_cygwin#make" target="_blank">
-                    mozilla developer center</a>
+                        mozilla developer center</a>
                     on this topic.
                     <br>
                     It's hoped that when make 3.82 starts shipping in a future cygwin
@@ -574,19 +649,19 @@
                     In addition to the above 3.80 make.exe you can download 
                     this
                     <a href="http://www.cmake.org/files/cygwin/make.exe">
-                    www.cmake.org make.exe</a> which will not have a libintl2.dll
+                        www.cmake.org make.exe</a> which will not have a libintl2.dll
                     dependency.
                 </li>
             </ul>
             <p>
-            Information on GNU make, and access to ftp download sites, are
-            available on the
-            <a href="http://www.gnu.org/software/make/make.html" target="_blank">
-                GNU make web site
-            </a>.
-            The latest source to GNU make is available at
-            <a href="http://ftp.gnu.org/pub/gnu/make/" target="_blank">
-            ftp.gnu.org/pub/gnu/make/</a>.
+                Information on GNU make, and access to ftp download sites, are
+                available on the
+                <a href="http://www.gnu.org/software/make/make.html" target="_blank">
+                    GNU make web site
+                </a>.
+                The latest source to GNU make is available at
+                <a href="http://ftp.gnu.org/pub/gnu/make/" target="_blank">
+                    ftp.gnu.org/pub/gnu/make/</a>.
         </blockquote>
         <!-- ------------------------------------------------------ -->
         <hr>
@@ -597,27 +672,27 @@
             is a Pentium class processor or better, at least 256 MB of RAM, and
             approximately 1.5 GB of free disk space.
             <p> 
-            <strong>X64 only:</strong>
-            The minimum recommended hardware for building the Linux
-            version is an AMD Opteron class processor, at least 512 MB of RAM, and
-            approximately 4 GB of free disk space.
+                <strong>X64 only:</strong>
+                The minimum recommended hardware for building the Linux
+                version is an AMD Opteron class processor, at least 512 MB of RAM, and
+                approximately 4 GB of free disk space.
             <p> 
-            The build will use the tools contained in 
-            <tt>/bin</tt> and 
-            <tt>/usr/bin</tt>
-            of a standard installation of the Linux operating environment. 
-            You should ensure that these directories are in your 
-            <tt>PATH</tt>.
+                The build will use the tools contained in
+                <tt>/bin</tt> and
+                <tt>/usr/bin</tt>
+                of a standard installation of the Linux operating environment.
+                You should ensure that these directories are in your
+                <tt>PATH</tt>.
             <p>
-            Note that some Linux systems have a habit of pre-populating
-            your environment variables for you, for example <tt>JAVA_HOME</tt>
-            might get pre-defined for you to refer to the JDK installed on
-            your Linux system. 
-            You will need to unset <tt>JAVA_HOME</tt>.
-            It's a good idea to run <tt>env</tt> and verify the
-            environment variables you are getting from the default system
-            settings make sense for building the 
-            OpenJDK.
+                Note that some Linux systems have a habit of pre-populating
+                your environment variables for you, for example <tt>JAVA_HOME</tt>
+                might get pre-defined for you to refer to the JDK installed on
+                your Linux system.
+                You will need to unset <tt>JAVA_HOME</tt>.
+                It's a good idea to run <tt>env</tt> and verify the
+                environment variables you are getting from the default system
+                settings make sense for building the
+                OpenJDK.
         </blockquote>
         <!-- ------------------------------------------------------ -->
         <h4><a name="linux_checklist">Basic Linux Check List</a></h4>
@@ -629,17 +704,12 @@
                     <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>.
                 </li>
                 <li>
-                    Install the
-                    <a href="#binaryplugs">Binary Plugs</a>, set
-                    <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>.
-                </li>
-                <li>
                     <a href="#importjdk">Optional Import JDK</a>, set
                     <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>.
                 </li>
                 <li>
                     Install or upgrade the <a href="#freetype">FreeType development
-                    package</a>.
+                        package</a>.
                 </li>
                 <li>
                     Install
@@ -660,23 +730,23 @@
             Approximately 1.4 GB of free disk
             space is needed for a 32-bit build.
             <p>
-            If you are building the 64-bit version, you should
-            run the command "isainfo -v" to verify that you have a
-            64-bit installation, it should say <tt>sparcv9</tt> or
-            <tt>amd64</tt>.
-            An additional 7 GB of free disk space is needed
-            for a 64-bit build.
+                If you are building the 64-bit version, you should
+                run the command "isainfo -v" to verify that you have a
+                64-bit installation, it should say <tt>sparcv9</tt> or
+                <tt>amd64</tt>.
+                An additional 7 GB of free disk space is needed
+                for a 64-bit build.
             <p> 
-            The build uses the tools contained in <tt>/usr/ccs/bin</tt>
-            and <tt>/usr/bin</tt> of a standard developer or full installation of
-            the Solaris operating environment.
+                The build uses the tools contained in <tt>/usr/ccs/bin</tt>
+                and <tt>/usr/bin</tt> of a standard developer or full installation of
+                the Solaris operating environment.
             <p> 
-            Solaris patches specific to the JDK can be downloaded from the 
-            <a href="http://sunsolve.sun.com/show.do?target=patches/JavaSE" target="_blank">
-            SunSolve JDK Solaris patches download page</a>.
-            You should ensure that the latest patch cluster for
-            your version of the Solaris operating environment has also
-            been installed.
+                Solaris patches specific to the JDK can be downloaded from the
+                <a href="http://sunsolve.sun.com/show.do?target=patches/JavaSE" target="_blank">
+                    SunSolve JDK Solaris patches download page</a>.
+                You should ensure that the latest patch cluster for
+                your version of the Solaris operating environment has also
+                been installed.
         </blockquote>
         <!-- ------------------------------------------------------ -->
         <h4><a name="solaris_checklist">Basic Solaris Check List</a></h4>
@@ -688,11 +758,6 @@
                     <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>.
                 </li>
                 <li>
-                    Install the
-                    <a href="#binaryplugs">Binary Plugs</a>, set
-                    <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>.
-                </li>
-                <li>
                     <a href="#importjdk">Optional Import JDK</a>, set
                     <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>.
                 </li>
@@ -731,10 +796,10 @@
                 because FAT32 doesn't support case-sensitivity in file names.
             </strong>
             <p> 
-            <strong>X64 only:</strong>
-            The minimum recommended hardware for building
-            the Windows X64 version is an AMD Opteron class processor, at least 1
-            GB of RAM, and approximately 10 GB of free disk space.
+                <strong>X64 only:</strong>
+                The minimum recommended hardware for building
+                the Windows X64 version is an AMD Opteron class processor, at least 1
+                GB of RAM, and approximately 10 GB of free disk space.
         </blockquote>
         <!-- ------------------------------------------------------ -->
         <h4><a name="paths">Windows Paths</a></h4>
@@ -753,18 +818,18 @@
             (called 'mixed'), e.g.
             <tt>cygpath -s -m "<i>path</i>"</tt>.
             <p>
-            The makefiles will try to translate any pathnames supplied
-            to it into the <tt>C:/</tt> style automatically.
+                The makefiles will try to translate any pathnames supplied
+                to it into the <tt>C:/</tt> style automatically.
             <p>
-            Note that use of CYGWIN creates a unique problem with regards to
-            setting <a href="#path"><tt>PATH</tt></a>. Normally on Windows
-            the <tt>PATH</tt> variable contains directories
-            separated with the ";" character (Solaris and Linux uses ":").
-            With CYGWIN, it uses ":", but that means that paths like "C:/path"
-            cannot be placed in the CYGWIN version  of <tt>PATH</tt> and
-            instead CYGWIN uses something like <tt>/cygdrive/c/path</tt>
-            which CYGWIN understands, but only CYGWIN understands.
-            So be careful with paths on Windows.
+                Note that use of CYGWIN creates a unique problem with regards to
+                setting <a href="#path"><tt>PATH</tt></a>. Normally on Windows
+                the <tt>PATH</tt> variable contains directories
+                separated with the ";" character (Solaris and Linux uses ":").
+                With CYGWIN, it uses ":", but that means that paths like "C:/path"
+                cannot be placed in the CYGWIN version  of <tt>PATH</tt> and
+                instead CYGWIN uses something like <tt>/cygdrive/c/path</tt>
+                which CYGWIN understands, but only CYGWIN understands.
+                So be careful with paths on Windows.
         </blockquote>
         <!-- ------------------------------------------------------ -->
         <h4><a name="windows_checklist">Basic Windows Check List</a></h4>
@@ -780,11 +845,6 @@
                     <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>.
                 </li>
                 <li>
-                    Install the
-                    <a href="#binaryplugs">Binary Plugs</a>, set
-                    <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>..
-                </li>
-                <li>
                     <a href="#importjdk">Optional Import JDK</a>, set
                     <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>.
                 </li>
@@ -828,7 +888,7 @@
                 JDK 6, this is often called a bootstrap JDK.
                 The JDK 6 binaries can be downloaded from Sun's 
                 <a href="http://java.sun.com/javase/downloads/index.jsp"
-		target="_blank">JDK 6 download site</a>.
+                   target="_blank">JDK 6 download site</a>.
                 For build performance reasons
                 is very important that this bootstrap JDK be made available on the
                 local disk of the machine doing the build.
@@ -841,44 +901,12 @@
                 in the <tt>PATH</tt> environment variable, although it's
                 not required.
                 <p>
-                <strong>Solaris:</strong>
-                Some pre-installed JDK images may be available to you in the
-                directory <tt>/usr/jdk/instances</tt>.
-                If you don't set
-                <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>
-                the makefiles will look in that location for a JDK it can use.
-            </blockquote>
-            <!-- ------------------------------------------------------ -->
-            <h4><a name="binaryplugs">Binary Plugs</a></h4>
-            <blockquote>
-                Not all of the source code that makes up the JDK is available
-                under an open-source license.
-                This is a temporary situation and these binary plugs will be
-                replaced with fully open source replacements as soon as possible.
-                So currently, in order to build a complete OpenJDK image,
-                you must first download and install the appropriate
-                binary plug bundles for the OpenJDK, go to the
-                <a href="http://openjdk.java.net" target="_blank">OpenJDK</a> site and select
-                the 
-                "<b>Bundles(7)</b>"
-                link and download the binaryplugs for
-                your particular platform.
-                The file downloaded is a jar file that must be extracted by running
-                the jar file with:
-                <blockquote>
-                    <pre>
-            <tt><b>java -jar jdk-7-ea-plug-b<i>nn</i>-<i>os</i>-<i>arch</i>-<i>dd</i>_<i>month</i>_<i>year</i>.jar</b></tt>
-                    </pre>
-                </blockquote>
-                A prompt will be issued for acceptance of these binary plug files.
-                During the OpenJDK build process these "binary plugs"
-                for the encumbered components will be copied into your
-                resulting OpenJDK binary build image.
-                These binary plug files are only for the purpose of
-                building an OpenJDK binary.
-                Make sure you set
-                <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>
-                to the root of this installation.
+                    <strong>Solaris:</strong>
+                    Some pre-installed JDK images may be available to you in the
+                    directory <tt>/usr/jdk/instances</tt>.
+                    If you don't set
+                    <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>
+                    the makefiles will look in that location for a JDK it can use.
             </blockquote>
             <!-- ------------------------------------------------------ -->
             <h4><a name="importjdk">Optional Import JDK</a></h4>
@@ -896,7 +924,7 @@
                 All OpenJDK builds require access to least Ant 1.6.5.
                 The Ant tool is available from the 
                 <a href="http://ant.apache.org" target="_blank">
-                Ant download site</a>.
+                    Ant download site</a>.
                 You should always make sure <tt>ant</tt> is in your PATH, and
                 on Windows you may also need to set 
                 <tt><a href="#ANT_HOME">ANT_HOME</a></tt>
@@ -908,7 +936,7 @@
             <h4><a name="cacerts">Certificate Authority File (cacert)</a></h4>
             <blockquote>
                 See <a href="http://en.wikipedia.org/wiki/Certificate_Authority" target="_blank">
-                http://en.wikipedia.org/wiki/Certificate_Authority</a>
+                    http://en.wikipedia.org/wiki/Certificate_Authority</a>
                 for a better understanding of the Certificate Authority (CA).
                 A certificates file named "cacerts"
                 represents a system-wide keystore with CA certificates. 
@@ -942,121 +970,121 @@
                 <blockquote>
                     At a minimum, the
                     <a href="http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index.htm" target="_blank">
-                    Sun Studio 12 Update 1 Compilers</a>
+                        Sun Studio 12 Update 1 Compilers</a>
                     (containing version 5.10 of the C and C++ compilers) is required,
 		    including specific patches.
-		    <p>
+                    <p>
 		    The Solaris SPARC patch list is:
-		    <ul>
-		    <li>
-                    118683-05: SunOS 5.10: Patch for profiling libraries and assembler
-                    </li>
-                    <li>
-                    119963-21: SunOS 5.10: Shared library patch for C++
-                    </li>
-                    <li>
-                    120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch
-                    </li>
-                    <li>
-                    128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler
-                    </li>
-                    <li>
-                    141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95
-                    </li>
-                    <li>
-                    141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler
-                    </li>
-                    <li>
-                    142371-01: Sun Studio 12.1 Update 1: Patch for dbx
-                    </li>
-                    <li>
-                    143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling
-                    </li>
-                    <li>
-                    143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95
-                    </li>
-                    <li>
-                    142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools
-                    </li>
+                    <ul>
+                        <li>
+                            118683-05: SunOS 5.10: Patch for profiling libraries and assembler
+                        </li>
+                        <li>
+                            119963-21: SunOS 5.10: Shared library patch for C++
+                        </li>
+                        <li>
+                            120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch
+                        </li>
+                        <li>
+                            128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler
+                        </li>
+                        <li>
+                            141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95
+                        </li>
+                        <li>
+                            141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler
+                        </li>
+                        <li>
+                            142371-01: Sun Studio 12.1 Update 1: Patch for dbx
+                        </li>
+                        <li>
+                            143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling
+                        </li>
+                        <li>
+                            143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95
+                        </li>
+                        <li>
+                            142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools
+                        </li>
                     </ul>
                     <p>
-                    The Solaris X86 patch list is:
+                        The Solaris X86 patch list is:
                     <ul>
-                    <li>
-                    119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler
-                    </li>
-                    <li>
-                    119964-21: SunOS 5.10_x86: Shared library patch for C++_x86
-                    </li>
-                    <li>
-                    120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch
-                    </li>
-                    <li>
-                    141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend
-                    </li>
-                    <li>
-                    128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler
-                    </li>
-                    <li>
-                    142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler
-                    </li>
-                    <li>
-                    142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools
-                    </li>
+                        <li>
+                            119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler
+                        </li>
+                        <li>
+                            119964-21: SunOS 5.10_x86: Shared library patch for C++_x86
+                        </li>
+                        <li>
+                            120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch
+                        </li>
+                        <li>
+                            141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend
+                        </li>
+                        <li>
+                            128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler
+                        </li>
+                        <li>
+                            142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler
+                        </li>
+                        <li>
+                            142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools
+                        </li>
                     </ul>
                     <p> 
-                    Set 
-                    <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a>
-                    to point to the location of
-                    the compiler binaries, and place this location in the <tt>PATH</tt>.
+                        Set
+                        <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a>
+                        to point to the location of
+                        the compiler binaries, and place this location in the <tt>PATH</tt>.
                     <p>
-                    The Oracle Solaris Studio Express compilers at:
-                    <a href="http://developers.sun.com/sunstudio/downloads/express.jsp" target="_blank">
-                    Oracle Solaris Studio Express Download site</a>
-                    are also an option, although these compilers have not
-                    been extensively used yet.
+                        The Oracle Solaris Studio Express compilers at:
+                        <a href="http://developers.sun.com/sunstudio/downloads/express.jsp" target="_blank">
+                            Oracle Solaris Studio Express Download site</a>
+                        are also an option, although these compilers have not
+                        been extensively used yet.
                 </blockquote>
                 <strong><a name="msvc32">Windows i586: Microsoft Visual Studio 2010 Compilers</a></strong>
                 <blockquote>
-<p>
-<b>BEGIN WARNING</b>: At this time (Spring/Summer 2010) JDK 7 is starting a transition to
-use the newest VS2010 Microsoft compilers. These build instructions are updated
-to show where we are going. We have a QA process to go through before
-official builds actually use VS2010. So for now, official builds are
-still using VS2003. No other compilers are known to build the entire JDK,
-including non-open portions.
-So for now you should be able to build with either VS2003 or VS2010.
-We do not guarantee that VS2008 will work, although there is sufficient
-makefile support to make at least basic JDK builds plausible.
-Visual Studio 2010 Express compilers are now able to build all the
-open source repositories, but this is 32 bit only. To build 64 bit
-Windows binaries use the the 7.1 Windows SDK.<b>END WARNING.</b>
-<p>
-                    The 32-bit OpenJDK Windows build
-                    requires 
-                    Microsoft Visual Studio C++ 2010 (VS2010) Professional
-                    Edition or Express compiler.
-                    The compiler and other tools are expected to reside
-                    in the location defined by the variable 
-                    <tt>VS100COMNTOOLS</tt> which
-                    is set by the Microsoft Visual Studio installer.
+                    <p>
+                        <b>BEGIN WARNING</b>: At this time (Spring/Summer 2010) JDK 7 is starting a transition to
+                        use the newest VS2010 Microsoft compilers. These build instructions are updated
+                        to show where we are going. We have a QA process to go through before
+                        official builds actually use VS2010. So for now, official builds are
+                        still using VS2003. No other compilers are known to build the entire JDK,
+                        including non-open portions.
+                        So for now you should be able to build with either VS2003 or VS2010.
+                        We do not guarantee that VS2008 will work, although there is sufficient
+                        makefile support to make at least basic JDK builds plausible.
+                        Visual Studio 2010 Express compilers are now able to build all the
+                        open source repositories, but this is 32 bit only. To build 64 bit
+                        Windows binaries use the the 7.1 Windows SDK.<b>END WARNING.</b>
+                    <p>
+                        The 32-bit OpenJDK Windows build
+                        requires
+                        Microsoft Visual Studio C++ 2010 (VS2010) Professional
+                        Edition or Express compiler.
+                        The compiler and other tools are expected to reside
+                        in the location defined by the variable
+                        <tt>VS100COMNTOOLS</tt> which
+                        is set by the Microsoft Visual Studio installer.
                     <p> 
-                    Once the compiler is installed, 
-                    it is recommended that you run <tt>VCVARS32.BAT</tt> 
-                    to set the compiler environment variables
-                    <tt>INCLUDE</tt>,
-                    <tt>LIB</tt>, and
-                    <tt>PATH</tt> 
-                    prior to building the 
-                    OpenJDK.
-                    The above environment variables <b>MUST</b> be set.
-                    This compiler also contains the Windows SDK v 7.0a,
-                    which is an update to the Windows 7 SDK.
+                        Once the compiler is installed,
+                        it is recommended that you run <tt>VCVARS32.BAT</tt>
+                        to set the compiler environment variables
+                        <tt>INCLUDE</tt>,
+                        <tt>LIB</tt>, and
+                        <tt>PATH</tt>
+                        prior to building the
+                        OpenJDK.
+                        The above environment variables <b>MUST</b> be set.
+                        This compiler also contains the Windows SDK v 7.0a,
+                        which is an update to the Windows 7 SDK.
                     <p>
-                    <b>WARNING:</b> Make sure you check out the
-                    <a href="#cygwin">CYGWIN link.exe WARNING</a>.
-                    The path <tt>/usr/bin</tt> must be after the path to the
-                    Visual Studio product.
+                        <b>WARNING:</b> Make sure you check out the
+                        <a href="#cygwin">CYGWIN link.exe WARNING</a>.
+                        The path <tt>/usr/bin</tt> must be after the path to the
+                        Visual Studio product.
                 </blockquote>
                 <strong><a name="msvc64">Windows x64: Microsoft Visual Studio 2010 Professional Compiler</a></strong>
                 <blockquote>
@@ -1069,22 +1097,22 @@
                     you have VS2010 Professional.
                 </blockquote>
                 <strong><a name="mssdk64">Windows x64: Microsoft Windows 7.1 SDK 64 bit compilers.</a></strong>
-                   For a free alternative for 64 bit builds, use the 7.1 SDK.
-                   Microsoft say that to set up your paths for this run
-<pre>
+                For a free alternative for 64 bit builds, use the 7.1 SDK.
+                Microsoft say that to set up your paths for this run
+                <pre>
     c:\Program Files\Microsoft SDKs\Windows\v7.1\bin\setenv.cmd /x64.
-</pre>
-                   What was tested is just directly setting up LIB, INCLUDE,
-                   PATH and based on the installation directories using the
-                   DOS short name appropriate for the system, (you will
-                   need to set them for yours, not just blindly copy this) eg :
-<pre>
+                </pre>
+                What was tested is just directly setting up LIB, INCLUDE,
+                PATH and based on the installation directories using the
+                DOS short name appropriate for the system, (you will
+                need to set them for yours, not just blindly copy this) eg :
+                <pre>
     set VSINSTALLDIR=c:\PROGRA~2\MICROS~1.0
     set WindowsSdkDir=c:\PROGRA~1\MICROS~1\Windows\v7.1
     set PATH=%VSINSTALLDIR%\vc\bin\amd64;%VSINSTALLDIR%\Common7\IDE;%WindowsSdkDir%\bin;%PATH%
     set INCLUDE=%VSINSTALLDIR%\vc\include;%WindowsSdkDir%\include
     set LIB=%VSINSTALLDIR%\vc\lib\amd64;%WindowsSdkDir%\lib\x64
-</pre>
+                </pre>
             </blockquote>
             <!-- ------------------------------------------------------ --> 
             <h4><a name="zip">Zip and Unzip</a></h4>
@@ -1110,41 +1138,41 @@
                 Companion CD/DVD, these often will be installed into 
                 <tt>/opt/sfw/cups</tt>.
                 <p>
-                <strong>Linux:</strong>
-                CUPS header files are required for building the 
-                OpenJDK on Linux.
-                The Linux header files are usually available from a "cups"
-                development package, it's recommended that you try and use
-                the package provided by the particular version of Linux that
-                you are using.
+                    <strong>Linux:</strong>
+                    CUPS header files are required for building the
+                    OpenJDK on Linux.
+                    The Linux header files are usually available from a "cups"
+                    development package, it's recommended that you try and use
+                    the package provided by the particular version of Linux that
+                    you are using.
                 <p>
-                The CUPS header files can always be downloaded from 
-                <a href="http://www.cups.org" target="_blank">www.cups.org</a>.
-                The variable 
-                <tt><a href="#ALT_CUPS_HEADERS_PATH">ALT_CUPS_HEADERS_PATH</a></tt>
-                can be used to override the default location of the
-                CUPS Header files.
+                    The CUPS header files can always be downloaded from
+                    <a href="http://www.cups.org" target="_blank">www.cups.org</a>.
+                    The variable
+                    <tt><a href="#ALT_CUPS_HEADERS_PATH">ALT_CUPS_HEADERS_PATH</a></tt>
+                    can be used to override the default location of the
+                    CUPS Header files.
             </blockquote>
             <!-- ------------------------------------------------------ -->
             <h4><a name="xrender">XRender Extension Headers (Solaris &amp; Linux)</a></h4>
             <blockquote>
                 <p>
-                <strong>Solaris:</strong>
-                XRender header files are required for building the 
-                OpenJDK on Solaris.
-                The XRender header file is included with the other X11 header files
-                in the package <strong>SFWxwinc</strong> on new enough versions of
-                Solaris and will be installed in
-	        <tt>/usr/X11/include/X11/extensions/Xrender.h</tt>
+                    <strong>Solaris:</strong>
+                    XRender header files are required for building the
+                    OpenJDK on Solaris.
+                    The XRender header file is included with the other X11 header files
+                    in the package <strong>SFWxwinc</strong> on new enough versions of
+                    Solaris and will be installed in
+                    <tt>/usr/X11/include/X11/extensions/Xrender.h</tt>
                 </p><p>
-                <strong>Linux:</strong>
-                XRender header files are required for building the 
-                OpenJDK on Linux.
-                The Linux header files are usually available from a "Xrender"
-                development package, it's recommended that you try and use
-                the package provided by the particular distribution of Linux that
-                you are using.
-	        </p>
+                    <strong>Linux:</strong>
+                    XRender header files are required for building the
+                    OpenJDK on Linux.
+                    The Linux header files are usually available from a "Xrender"
+                    development package, it's recommended that you try and use
+                    the package provided by the particular distribution of Linux that
+                    you are using.
+                </p>
             </blockquote>
             <!-- ------------------------------------------------------ -->
             <h4><a name="freetype">FreeType 2</a></h4>
@@ -1155,31 +1183,31 @@
                 Note that you need development version of package that 
                 includes both FreeType library and header files.
                 <p>
-                You can always download latest FreeType version from the
-                <a href="http://www.freetype.org" target="_blank">FreeType website</a>.
+                    You can always download latest FreeType version from the
+                    <a href="http://www.freetype.org" target="_blank">FreeType website</a>.
                 <p>
-                Makefiles will try to pick FreeType from /usr/lib and /usr/include.
-                In case it is installed elsewhere you will need to set environment
-                variables 
-                <tt><a href="#ALT_FREETYPE_LIB_PATH">ALT_FREETYPE_LIB_PATH</a></tt>
-                and 
-                <tt><a href="#ALT_FREETYPE_HEADERS_PATH">ALT_FREETYPE_HEADERS_PATH</a></tt>
-                to refer to place where library and header files are installed.
+                    Makefiles will try to pick FreeType from /usr/lib and /usr/include.
+                    In case it is installed elsewhere you will need to set environment
+                    variables
+                    <tt><a href="#ALT_FREETYPE_LIB_PATH">ALT_FREETYPE_LIB_PATH</a></tt>
+                    and
+                    <tt><a href="#ALT_FREETYPE_HEADERS_PATH">ALT_FREETYPE_HEADERS_PATH</a></tt>
+                    to refer to place where library and header files are installed.
                 <p>
-                Building the freetype 2 libraries from scratch is also possible,
-                however on Windows refer to the
-                <a href="http://freetype.freedesktop.org/wiki/FreeType_DLL">
-                Windows FreeType DLL build instructions</a>.
+                    Building the freetype 2 libraries from scratch is also possible,
+                    however on Windows refer to the
+                    <a href="http://freetype.freedesktop.org/wiki/FreeType_DLL">
+                        Windows FreeType DLL build instructions</a>.
                 <p>
-                Note that by default FreeType is built with byte code hinting
-                support disabled due to licensing restrictions.
-                In this case, text appearance and metrics are expected to
-                differ from Sun's official JDK build.
-                See
-                <a href="http://freetype.sourceforge.net/freetype2/index.html">
-                    the SourceForge FreeType2 Home Page
-                </a>
-                for more information.
+                    Note that by default FreeType is built with byte code hinting
+                    support disabled due to licensing restrictions.
+                    In this case, text appearance and metrics are expected to
+                    differ from Sun's official JDK build.
+                    See
+                    <a href="http://freetype.sourceforge.net/freetype2/index.html">
+                        the SourceForge FreeType2 Home Page
+                    </a>
+                    for more information.
             </blockquote>    
             <!-- ------------------------------------------------------ -->
             <h4><a name="alsa">Advanced Linux Sound Architecture (ALSA) (Linux only)</a></h4>
@@ -1195,25 +1223,25 @@
                 The makefiles will check this emit a sanity error if it is
                 missing or the wrong version.
                 <p>
-                In particular, older Linux systems will likely not have the
-                right version of ALSA installed, for example
-                Redhat AS 2.1 U2 and SuSE 8.1 do not include a sufficiently 
-                recent ALSA distribution.
-                On rpm-based systems, you can see if ALSA is installed by 
-                running this command:
+                    In particular, older Linux systems will likely not have the
+                    right version of ALSA installed, for example
+                    Redhat AS 2.1 U2 and SuSE 8.1 do not include a sufficiently
+                    recent ALSA distribution.
+                    On rpm-based systems, you can see if ALSA is installed by
+                    running this command:
                 <pre>
                     <tt>rpm -qa | grep alsa</tt>
                 </pre>
                 Both <tt>alsa</tt> and <tt>alsa-devel</tt> packages are needed.
                 <p> 
-                If your distribution does not come with ALSA, and you can't
-                find ALSA packages built for your particular system,
-                you can try to install the pre-built ALSA rpm packages from
-                <a href="http://www.freshrpms.net/" target="_blank">
-                <tt>www.freshrpms.net</tt></a>. 
-                Note that installing a newer ALSA could
-                break sound output if an older version of ALSA was previously
-                installed on the system, but it will enable JDK compilation.
+                    If your distribution does not come with ALSA, and you can't
+                    find ALSA packages built for your particular system,
+                    you can try to install the pre-built ALSA rpm packages from
+                    <a href="http://www.freshrpms.net/" target="_blank">
+                        <tt>www.freshrpms.net</tt></a>.
+                    Note that installing a newer ALSA could
+                    break sound output if an older version of ALSA was previously
+                    installed on the system, but it will enable JDK compilation.
                 <blockquote>
                     Installation: execute as root<br>
                     [i586]: <code>rpm -Uv --force alsa-lib-devel-0.9.1-rh61.i386.rpm</code><br>
@@ -1228,7 +1256,7 @@
                 </blockquote>
                 As a last resort you can go to the
                 <a href="http://www.alsa-project.org" target="_blank">
-                Advanced Linux Sound Architecture Site</a> and build it from
+                    Advanced Linux Sound Architecture Site</a> and build it from
                 source.
                 <blockquote>
                     Download driver and library
@@ -1256,9 +1284,9 @@
                 building the JDK platform. To actually use ALSA sound drivers, more
                 steps are necessary as outlined in the documentation on ALSA's homepage.
                 <p>
-                ALSA can be uninstalled by executing <tt>make uninstall</tt> first in
-                the <tt>alsa-lib-0.9.1</tt> directory and then in 
-                <tt>alsa-driver-0.9.1</tt>.
+                    ALSA can be uninstalled by executing <tt>make uninstall</tt> first in
+                    the <tt>alsa-lib-0.9.1</tt> directory and then in
+                    <tt>alsa-driver-0.9.1</tt>.
             </blockquote>
             There are no ALT* variables to change the assumed locations of ALSA,
             the makefiles will expect to find the ALSA include files and library at:
@@ -1273,15 +1301,15 @@
                 on Windows which can be supplied by 
                 <a href="http://www.cygwin.com" target="_blank">CYGWIN</a>. 
                 <p>
-                The OpenJDK build requires CYGWIN version 1.5.12 or newer. 
-                Information about CYGWIN can
-                be obtained from the CYGWIN website at 
-                <a href="http://www.cygwin.com" target="_blank">www.cygwin.com</a>. 
+                    The OpenJDK build requires CYGWIN version 1.5.12 or newer.
+                    Information about CYGWIN can
+                    be obtained from the CYGWIN website at
+                    <a href="http://www.cygwin.com" target="_blank">www.cygwin.com</a>.
                 <p>
-                By default CYGWIN doesn't install all the tools required for building
-                the OpenJDK.
-                Along with the default installation, you need to install
-                the following tools.
+                    By default CYGWIN doesn't install all the tools required for building
+                    the OpenJDK.
+                    Along with the default installation, you need to install
+                    the following tools.
                 <blockquote>
                     <table border="1">
                         <thead>
@@ -1298,21 +1326,21 @@
                                 <td>Devel</td>
                                 <td>binutils</td>
                                 <td>The GNU assembler, linker and binary
-                                utilities</td>
+                                    utilities</td>
                             </tr>
                             <tr>
                                 <td>make.exe</td>
                                 <td>Devel</td>
                                 <td>make</td>
                                 <td>The GNU version of the 'make' utility built for CYGWIN.<br>
-                                <b>NOTE</b>: See <a href="#gmake">the GNU make section</a></td>
+                                    <b>NOTE</b>: See <a href="#gmake">the GNU make section</a></td>
                             </tr>
                             <tr>
                                 <td>m4.exe</td>
                                 <td>Interpreters</td>
                                 <td>m4</td>
                                 <td>GNU implementation of the traditional Unix macro
-                                processor</td>
+                                    processor</td>
                             </tr>
                             <tr>
                                 <td>cpio.exe</td>
@@ -1354,21 +1382,21 @@
                     </table>
                 </blockquote>
                 <p>
-                Note that the CYGWIN software can conflict with other non-CYGWIN
-                software on your Windows system.
-                CYGWIN provides a
-                <a href="http://cygwin.com/faq/faq.using.html" target="_blank">FAQ</a> for
-                known issues and problems, of particular interest is the
-                section on
-                <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda" target="_blank">
-                BLODA (applications that interfere with CYGWIN)</a>.
+                    Note that the CYGWIN software can conflict with other non-CYGWIN
+                    software on your Windows system.
+                    CYGWIN provides a
+                    <a href="http://cygwin.com/faq/faq.using.html" target="_blank">FAQ</a> for
+                    known issues and problems, of particular interest is the
+                    section on
+                    <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda" target="_blank">
+                        BLODA (applications that interfere with CYGWIN)</a>.
                 <p>
-                <b>WARNING:</b>
-                Be very careful with <b><tt>link.exe</tt></b>, it will conflict
-                with the Visual Studio version. You need the Visual Studio
-                version of <tt>link.exe</tt>, not the CYGWIN one.
-                So it's important that the Visual Studio paths in PATH preceed
-                the CYGWIN path <tt>/usr/bin</tt>.
+                    <b>WARNING:</b>
+                    Be very careful with <b><tt>link.exe</tt></b>, it will conflict
+                    with the Visual Studio version. You need the Visual Studio
+                    version of <tt>link.exe</tt>, not the CYGWIN one.
+                    So it's important that the Visual Studio paths in PATH preceed
+                    the CYGWIN path <tt>/usr/bin</tt>.
             </blockquote>
             <strong><a name="dxsdk">Microsoft DirectX 9.0 SDK header files and libraries</a></strong>
             <blockquote>
@@ -1377,7 +1405,7 @@
                 OpenJDK.
                 This SDK can be downloaded from 
                 <a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=FD044A42-9912-42A3-9A9E-D857199F888E&amp;displaylang=en" target="_blank">
-                Microsoft DirectX 9.0 SDK (Summer 2004)</a>.
+                    Microsoft DirectX 9.0 SDK (Summer 2004)</a>.
                 If the link above becomes obsolete, the SDK can be found from 
                 <a href="http://download.microsoft.com" target="_blank">the Microsoft Download Site</a>
                 (search with "DirectX 9.0 SDK Update Summer 2004"). 
@@ -1431,14 +1459,14 @@
                 </li>
             </ol>
             <p>
-            <strong>Solaris:</strong>
-            Note that ARCH_DATA_MODEL is really only needed on Solaris to
-            indicate you want to built the 64-bit version.
-            And before the Solaris 64-bit binaries can be used, they
-            must be merged with the binaries from a separate 32-bit build. 
-            The merged binaries may then be used in either 32-bit or 64-bit mode, with
-            the selection occurring at runtime 
-            with the <tt>-d32</tt> or <tt>-d64</tt> options. 
+                <strong>Solaris:</strong>
+                Note that ARCH_DATA_MODEL is really only needed on Solaris to
+                indicate you want to built the 64-bit version.
+                And before the Solaris 64-bit binaries can be used, they
+                must be merged with the binaries from a separate 32-bit build.
+                The merged binaries may then be used in either 32-bit or 64-bit mode, with
+                the selection occurring at runtime
+                with the <tt>-d32</tt> or <tt>-d64</tt> options.
         </blockquote>
         <!-- ------------------------------------------------------ -->
         <hr>
@@ -1450,37 +1478,39 @@
             The default output directory is
             <tt>build/<i>platform</i></tt>,
             where <tt><i>platform</i></tt> is one of
-            <tt><ul>
-                    <li>solaris-sparc</li>
-                    <li>solaris-sparcv9</li>
-                    <li>solaris-i586</li>
-                    <li>solaris-amd64</li>
-                    <li>linux-i586</li>
-                    <li>linux-amd64</li>
-                    <li>windows-i586</li>
-                    <li>windows-amd64</li>
-            </ul></tt>
+            <blockquote>
+                <ul>
+                    <li><tt>solaris-sparc</tt></li>
+                    <li><tt>solaris-sparcv9</tt></li>
+                    <li><tt>solaris-i586</tt></li>
+                    <li><tt>solaris-amd64</tt></li>
+                    <li><tt>linux-i586</tt></li>
+                    <li><tt>linux-amd64</tt></li>
+                    <li><tt>windows-i586</tt></li>
+                    <li><tt>windows-amd64</tt></li>
+                </ul>
+            </blockquote>
             In particular, the 
             <tt>build/<i>platform</i>/j2sdk-image/bin</tt>
             directory should contain executables for the 
             OpenJDK tools and utilities.
             <p>
-            You can test that the build completed properly by using the build
-            to run the various demos that you will find in the 
-            <tt>build/<i>platform</i>/j2sdk-image/demo</tt>
-            directory.
+                You can test that the build completed properly by using the build
+                to run the various demos that you will find in the
+                <tt>build/<i>platform</i>/j2sdk-image/demo</tt>
+                directory.
             <p>
-            The provided regression tests can be run with the <tt>jtreg</tt>
-            utility from 
-            <a href="http://openjdk.java.net/jtreg/" target="_blank">the jtreg site</a>.
+                The provided regression tests can be run with the <tt>jtreg</tt>
+                utility from
+                <a href="http://openjdk.java.net/jtreg/" target="_blank">the jtreg site</a>.
         </blockquote>
         <!-- ------------------------------------------------------ -->
         <hr>
         <h2><a name="variables">Environment/Make Variables</a></h2>
         <p>
-        Some of the
-        environment or make variables (just called <b>variables</b> in this
-        document) that can impact the build are:
+            Some of the
+            environment or make variables (just called <b>variables</b> in this
+            document) that can impact the build are:
         <blockquote>
             <dl>
                 <dt><a name="path"><tt>PATH</tt></a> </dt>
@@ -1488,11 +1518,11 @@
                     <ul>
                         <li>The location of the GNU make binary</li>
                         <li>The location of the Bootstrap JDK <tt>java</tt> 
-                        (see <a href="#bootjdk">Bootstrap JDK</a>)</li>
+                            (see <a href="#bootjdk">Bootstrap JDK</a>)</li>
                         <li>The location of the C/C++ compilers 
-                        (see <a href="#compilers"><tt>compilers</tt></a>)</li>
+                            (see <a href="#compilers"><tt>compilers</tt></a>)</li>
                         <li>The location or locations for the Unix command utilities
-                        (e.g. <tt>/usr/bin</tt>)</li>
+                            (e.g. <tt>/usr/bin</tt>)</li>
                     </ul>
                 </dd>
                 <dt><tt>MILESTONE</tt> </dt>
@@ -1523,14 +1553,6 @@
                     You should always install your own local Bootstrap JDK and
                     always set <tt>ALT_BOOTDIR</tt> explicitly.
                 </dd>
-                <dt><a name="ALT_BINARY_PLUGS_PATH"><tt>ALT_BINARY_PLUGS_PATH</tt></a></dt>
-                <dd>
-                    The location of the binary plugs installation.
-                    See <a href="#binaryplugs">Binary Plugs</a> for more information.
-                    You should always have a local copy of a
-                    recent Binary Plugs install image
-                    and set this variable to that location.
-                </dd>
                 <dt><a name="ALT_JDK_IMPORT_PATH"><tt>ALT_JDK_IMPORT_PATH</tt></a></dt>
                 <dd>
                     The location of a previously built JDK installation. 
@@ -1627,36 +1649,19 @@
                     Where each of these directories contain the import JDK image
                     for that platform.
                 </dd>
-                <dt><a name="ALT_BUILD_BINARY_PLUGS_PATH"><tt>ALT_BUILD_BINARY_PLUGS_PATH</tt></a></dt>
-                <dd>
-                    These are useful in managing builds on multiple platforms.
-                    The default network location for all of the binary plug images
-                    for all platforms. 
-                    If <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>
-                    is not set, this directory will be used and should contain 
-                    the following directories:
-                    <tt>solaris-sparc</tt>,
-                    <tt>solaris-i586</tt>,
-                    <tt>solaris-sparcv9</tt>,
-                    <tt>solaris-amd64</tt>,
-                    <tt>linux-i586</tt>,
-                    <tt>linux-amd64</tt>,
-                    <tt>windows-i586</tt>,
-                    and
-                    <tt>windows-amd64</tt>.
-                    Where each of these directories contain the binary plugs image
-                    for that platform.
-                </dd>
                 <dt><strong>Windows specific:</strong></dt>
                 <dd>
                     <dl>
-                        <dt><a name="ALT_MSDEVTOOLS_PATH"><tt>ALT_MSDEVTOOLS_PATH</tt></a> </dt>
+                        <dt><a name="ALT_WINDOWSSDKDIR"><tt>ALT_WINDOWSSDKDIR</tt></a> </dt>
                         <dd>
                             The location of the 
-                            Microsoft Visual Studio
-                            tools 'bin' directory.
-                            The default is usually derived from
-                            <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a>.
+                            Microsoft Windows SDK where some tools will be
+			    located.
+			    The default is whatever WINDOWSSDKDIR is set to
+			    (or WindowsSdkDir) or the path
+			    <pre>
+                            c:\Program Files\Microsoft SDKs\Windows\v6.1a
+			    </pre>
                         </dd>
                         <dt><tt><a name="ALT_DXSDK_PATH">ALT_DXSDK_PATH</a></tt> </dt>
                         <dd>
@@ -1694,17 +1699,17 @@
             Look for the check list of the platform you are building on in the
             <a href="#contents">Table of Contents</a>.
             <p>
-            You can validate your build environment by using the <tt>sanity</tt>
-            target.
-            Any errors listed
-            will stop the build from starting, and any warnings may result in
-            a flawed product build.
-            We strongly encourage you to evaluate every
-            sanity check warning and fix it if required, before you proceed
-            further with your build.
+                You can validate your build environment by using the <tt>sanity</tt>
+                target.
+                Any errors listed
+                will stop the build from starting, and any warnings may result in
+                a flawed product build.
+                We strongly encourage you to evaluate every
+                sanity check warning and fix it if required, before you proceed
+                further with your build.
             <p>
-            Some of the more common problems with builds are briefly described
-            below, with suggestions for remedies.
+                Some of the more common problems with builds are briefly described
+                below, with suggestions for remedies.
             <ul>
                 <li>
                     <b>Slow Builds:</b>
@@ -1715,15 +1720,15 @@
                         machine, setting it to more than the the number of CPUs is probably
                         not a good idea).
                         <p>
-                        Creating the javadocs can be very slow, if you are running
-                        javadoc, consider skipping that step.
+                            Creating the javadocs can be very slow, if you are running
+                            javadoc, consider skipping that step.
                         <p>
-                        Faster hardware and more RAM always helps too.
-                        The VM build tends to be CPU intensive (many C++ compiles),
-                        and the rest of the JDK will often be disk intensive.
+                            Faster hardware and more RAM always helps too.
+                            The VM build tends to be CPU intensive (many C++ compiles),
+                            and the rest of the JDK will often be disk intensive.
                         <p>
-                        Faster compiles are possible using a tool called
-                        <a href="http://ccache.samba.org/" target="_blank">ccache</a>.
+                            Faster compiles are possible using a tool called
+                            <a href="http://ccache.samba.org/" target="_blank">ccache</a>.
                     </blockquote>
                 </li>
                 <li>
@@ -1732,10 +1737,10 @@
                         If you see warnings that refer to file time stamps, e.g.
                         <blockquote>
                             <i>Warning message:</i><tt> File `xxx' has modification time in
-                            the future.</tt>
+                                the future.</tt>
                             <br>
                             <i>Warning message:</i> <tt> Clock skew detected. Your build may
-                            be incomplete.</tt> 
+                                be incomplete.</tt>
                         </blockquote>
                         These warnings can occur when the clock on the build machine is out of
                         sync with the timestamps on the source files. Other errors, apparently
@@ -1747,9 +1752,9 @@
                         when the pre-1.4 compiler ran across the new <tt>assert</tt> keyword
                         in the 1.4 source code.
                         <p>
-                        If you see these warnings, reset the clock on the build
-                        machine, run "<tt><i>gmake</i> clobber</tt>" or delete the directory
-                        containing the build output, and restart the build from the beginning.
+                            If you see these warnings, reset the clock on the build
+                            machine, run "<tt><i>gmake</i> clobber</tt>" or delete the directory
+                            containing the build output, and restart the build from the beginning.
                     </blockquote>
                 </li>
                 <li>
@@ -1776,32 +1781,28 @@
                     <blockquote>
                         This is probably an issue with SELinux (See
                         <a href="http://en.wikipedia.org/wiki/SELinux" target="_blank">
-                        http://en.wikipedia.org/wiki/SELinux</a>).
+                            http://en.wikipedia.org/wiki/SELinux</a>).
                         Parts of the VM is built without the <tt>-fPIC</tt> for
                         performance reasons.
                         <p>
-                        To completely disable SELinux:
-                        <tt>
-                            <ol>
-                                <li>$ su root</li>
-                                <li># system-config-securitylevel</li>
-                                <li>In the window that appears, select the SELinux tab</li>
-                                <li>Disable SELinux</li>
-                            </ol>
-                        </tt>
+                            To completely disable SELinux:
+                        <ol>
+                            <li><tt>$ su root</tt></li>
+                            <li><tt># system-config-securitylevel</tt></li>
+                            <li><tt>In the window that appears, select the SELinux tab</tt></li>
+                            <li><tt>Disable SELinux</tt></li>
+                        </ol>
                         <p>
-                        Alternatively, instead of completely disabling it you could
-                        disable just this one check.
-                        <tt>
-                            <ol>
-                                <li>Select System->Administration->SELinux Management</li>
-                                <li>In the SELinux Management Tool which appears, 
+                            Alternatively, instead of completely disabling it you could
+                            disable just this one check.
+                        <ol>
+                            <li>Select System->Administration->SELinux Management</li>
+                            <li>In the SELinux Management Tool which appears,
                                 select "Boolean" from the menu on the left</li>
-                                <li>Expand the "Memory Protection" group</li>
-                                <li>Check the first item, labeled
+                            <li>Expand the "Memory Protection" group</li>
+                            <li>Check the first item, labeled
                                 "Allow all unconfined executables to use libraries requiring text relocation ..."</li>
-                            </ol>
-                        </tt>
+                        </ol>
                     </blockquote>
                 </li>
                 <li>
@@ -1810,7 +1811,7 @@
                         The CYGWIN software can conflict with other non-CYGWIN
                         software. See the CYGWIN FAQ section on
                         <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda" target="_blank">
-                        BLODA (applications that interfere with CYGWIN)</a>.
+                            BLODA (applications that interfere with CYGWIN)</a>.
                     </blockquote>
                 </li>
                 <li>
--- a/corba/.hgtags	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/.hgtags	Tue Jan 04 17:10:35 2011 -0800
@@ -97,3 +97,4 @@
 cff5a173ec1e89013359e804a3e31736ef6fb462 jdk7-b120
 2cc9f32992101732b23730b737740e64ebc5fa89 jdk7-b121
 1523a060032c8a5b7840198da8911abeff88118f jdk7-b122
+a230c142628cea22475ab9dc5cd544266ddf2466 jdk7-b123
--- a/corba/make/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_io.jmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_io.jmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/corba/make/common/Defs-linux.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/common/Defs-linux.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/corba/make/common/Defs-solaris.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/common/Defs-solaris.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/corba/make/common/Defs-windows.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/common/Defs-windows.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/corba/make/common/Defs.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/common/Defs.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/corba/make/common/Rules.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/common/Rules.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/corba/make/common/shared/Defs-java.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/common/shared/Defs-java.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/corba/make/common/shared/Defs-linux.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/common/shared/Defs-linux.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/corba/make/common/shared/Defs-solaris.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/common/shared/Defs-solaris.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/corba/make/common/shared/Defs-windows.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/common/shared/Defs-windows.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/corba/make/common/shared/Defs.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/common/shared/Defs.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/corba/make/org/omg/idl/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/org/omg/idl/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/corba/make/sun/corba/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/sun/corba/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/corba/make/sun/corba/core/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/sun/corba/core/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/corba/make/sun/rmi/rmic/FILES.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/make/sun/rmi/rmic/FILES.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/pept/transport/ConnectionCache.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/pept/transport/ConnectionCache.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/spi/protocol/PIHandler.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/spi/protocol/PIHandler.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaConnection.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaConnection.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/corba/src/share/classes/javax/rmi/PortableRemoteObject.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/javax/rmi/PortableRemoteObject.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/corba/src/share/classes/org/omg/CORBA/ORB.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/org/omg/CORBA/ORB.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/corba/src/share/classes/org/omg/CORBA/SetOverrideType.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/org/omg/CORBA/SetOverrideType.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/corba/src/share/classes/org/omg/CORBA/TCKind.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/org/omg/CORBA/TCKind.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/corba/src/share/classes/org/omg/CORBA/UnknownUserException.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/org/omg/CORBA/UnknownUserException.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/corba/src/share/classes/org/omg/CORBA/portable/ServantObject.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/org/omg/CORBA/portable/ServantObject.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/corba/src/share/classes/org/omg/CosNaming/nameservice.idl	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/org/omg/CosNaming/nameservice.idl	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/corba/src/share/classes/org/omg/PortableInterceptor/Interceptors.idl	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/org/omg/PortableInterceptor/Interceptors.idl	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/corba/src/share/classes/sun/corba/Bridge.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/corba/src/share/classes/sun/corba/Bridge.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/get_source.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2010, 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.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# 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
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Get clones of all nested repositories
+sh ./make/scripts/hgforest.sh clone
+
+# Update all existing repositories to the latest sources
+sh ./make/scripts/hgforest.sh pull -u
+
--- a/hotspot/.hgtags	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/.hgtags	Tue Jan 04 17:10:35 2011 -0800
@@ -136,3 +136,5 @@
 3f3653ab7af8dc1ddb9fa75dad56bf94f89e81a8 jdk7-b121
 3a548dc9cb456110ca8fc1514441a8c3bda0014d jdk7-b122
 5484e7c53fa7da5e869902437ee08a9ae10c1c69 hs20-b03
+9669f9b284108a9ee0a0ccbe215c37a130c9dcf5 jdk7-b123
+9669f9b284108a9ee0a0ccbe215c37a130c9dcf5 hs20-b04
--- a/hotspot/agent/src/os/linux/libproc_impl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/os/linux/libproc_impl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/hotspot/agent/src/os/linux/ps_core.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/os/linux/ps_core.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/hotspot/agent/src/os/linux/ps_proc.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/os/linux/ps_proc.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/hotspot/agent/src/os/linux/symtab.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/os/linux/symtab.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/hotspot/agent/src/os/linux/symtab.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/os/linux/symtab.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Oop.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Oop.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/hotspot/make/hotspot_distro	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/hotspot_distro	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/hotspot/make/hotspot_version	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/hotspot_version	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=20
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=04
+HS_BUILD_NUMBER=05
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
--- a/hotspot/make/jprt.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/jprt.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/hotspot/make/jprt.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/jprt.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/hotspot/make/linux/makefiles/defs.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/linux/makefiles/defs.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/hotspot/make/linux/makefiles/jvmti.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/linux/makefiles/jvmti.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/hotspot/make/linux/makefiles/mapfile-vers-debug	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/linux/makefiles/mapfile-vers-debug	Tue Jan 04 17:10:35 2011 -0800
@@ -3,7 +3,7 @@
 #
 
 #
-# Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/hotspot/make/linux/makefiles/mapfile-vers-product	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/linux/makefiles/mapfile-vers-product	Tue Jan 04 17:10:35 2011 -0800
@@ -3,7 +3,7 @@
 #
 
 #
-# Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/hotspot/make/linux/makefiles/product.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/linux/makefiles/product.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/hotspot/make/linux/makefiles/saproc.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/linux/makefiles/saproc.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/hotspot/make/linux/makefiles/shark.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/linux/makefiles/shark.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2008, 2010 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
--- a/hotspot/make/linux/makefiles/sparcWorks.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/linux/makefiles/sparcWorks.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/hotspot/make/solaris/makefiles/defs.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/solaris/makefiles/defs.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/hotspot/make/solaris/makefiles/fastdebug.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/solaris/makefiles/fastdebug.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/hotspot/make/solaris/makefiles/jvmti.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/solaris/makefiles/jvmti.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/hotspot/make/solaris/makefiles/optimized.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/solaris/makefiles/optimized.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/hotspot/make/solaris/makefiles/product.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/solaris/makefiles/product.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/hotspot/make/solaris/makefiles/saproc.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/solaris/makefiles/saproc.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/hotspot/make/windows/build.bat	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/windows/build.bat	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 @echo off
 REM
-REM Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+REM Copyright (c) 1997, 2010, 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
--- a/hotspot/make/windows/get_msc_ver.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/windows/get_msc_ver.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/hotspot/make/windows/makefiles/defs.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/windows/makefiles/defs.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/hotspot/make/windows/makefiles/sanity.make	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/make/windows/makefiles/sanity.make	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/hotspot/src/os/solaris/dtrace/hotspot.d	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/os/solaris/dtrace/hotspot.d	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2003, 2010, 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
--- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.s	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.s	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2004, 2010, 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
--- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2004, 2010, 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
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1825,23 +1825,11 @@
   }
 }
 
-
-class G1CMIsAliveClosure: public BoolObjectClosure {
-  G1CollectedHeap* _g1;
- public:
-  G1CMIsAliveClosure(G1CollectedHeap* g1) :
-    _g1(g1)
-  {}
-
-  void do_object(oop obj) {
-    assert(false, "not to be invoked");
-  }
-  bool do_object_b(oop obj) {
-    HeapWord* addr = (HeapWord*)obj;
-    return addr != NULL &&
-           (!_g1->is_in_g1_reserved(addr) || !_g1->is_obj_ill(obj));
-  }
-};
+bool G1CMIsAliveClosure::do_object_b(oop obj) {
+  HeapWord* addr = (HeapWord*)obj;
+  return addr != NULL &&
+         (!_g1->is_in_g1_reserved(addr) || !_g1->is_obj_ill(obj));
+}
 
 class G1CMKeepAliveClosure: public OopClosure {
   G1CollectedHeap* _g1;
@@ -1896,16 +1884,15 @@
   rp->setup_policy(clear_all_soft_refs);
   assert(_markStack.isEmpty(), "mark stack should be empty");
 
-  G1CMIsAliveClosure   g1IsAliveClosure  (g1h);
-  G1CMKeepAliveClosure g1KeepAliveClosure(g1h, this, nextMarkBitMap());
+  G1CMIsAliveClosure   g1_is_alive(g1h);
+  G1CMKeepAliveClosure g1_keep_alive(g1h, this, nextMarkBitMap());
   G1CMDrainMarkingStackClosure
-    g1DrainMarkingStackClosure(nextMarkBitMap(), &_markStack,
-                               &g1KeepAliveClosure);
+    g1_drain_mark_stack(nextMarkBitMap(), &_markStack, &g1_keep_alive);
 
   // XXXYYY  Also: copy the parallel ref processing code from CMS.
-  rp->process_discovered_references(&g1IsAliveClosure,
-                                    &g1KeepAliveClosure,
-                                    &g1DrainMarkingStackClosure,
+  rp->process_discovered_references(&g1_is_alive,
+                                    &g1_keep_alive,
+                                    &g1_drain_mark_stack,
                                     NULL);
   assert(_markStack.overflow() || _markStack.isEmpty(),
          "mark stack should be empty (unless it overflowed)");
@@ -1918,8 +1905,8 @@
   assert(!rp->discovery_enabled(), "should have been disabled");
 
   // Now clean up stale oops in SymbolTable and StringTable
-  SymbolTable::unlink(&g1IsAliveClosure);
-  StringTable::unlink(&g1IsAliveClosure);
+  SymbolTable::unlink(&g1_is_alive);
+  StringTable::unlink(&g1_is_alive);
 }
 
 void ConcurrentMark::swapMarkBitMaps() {
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Tue Jan 04 17:10:35 2011 -0800
@@ -33,6 +33,25 @@
 typedef GenericTaskQueue<oop>            CMTaskQueue;
 typedef GenericTaskQueueSet<CMTaskQueue> CMTaskQueueSet;
 
+// Closure used by CM during concurrent reference discovery
+// and reference processing (during remarking) to determine
+// if a particular object is alive. It is primarily used
+// to determine if referents of discovered reference objects
+// are alive. An instance is also embedded into the
+// reference processor as the _is_alive_non_header field
+class G1CMIsAliveClosure: public BoolObjectClosure {
+  G1CollectedHeap* _g1;
+ public:
+  G1CMIsAliveClosure(G1CollectedHeap* g1) :
+    _g1(g1)
+  {}
+
+  void do_object(oop obj) {
+    ShouldNotCallThis();
+  }
+  bool do_object_b(oop obj);
+};
+
 // A generic CM bit map.  This is essentially a wrapper around the BitMap
 // class, with one bit per (1<<_shifter) HeapWords.
 
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1192,6 +1192,7 @@
     return false;
   }
 
+  DTraceGCProbeMarker gc_probe_marker(true /* full */);
   ResourceMark rm;
 
   if (PrintHeapAtGC) {
@@ -1768,6 +1769,7 @@
   _g1_policy(policy_),
   _dirty_card_queue_set(false),
   _into_cset_dirty_card_queue_set(false),
+  _is_alive_closure(this),
   _ref_processor(NULL),
   _process_strong_tasks(new SubTasksDone(G1H_PS_NumElements)),
   _bot_shared(NULL),
@@ -2061,7 +2063,8 @@
                                          mr,    // span
                                          false, // Reference discovery is not atomic
                                          true,  // mt_discovery
-                                         NULL,  // is alive closure: need to fill this in for efficiency
+                                         &_is_alive_closure, // is alive closure
+                                                             // for efficiency
                                          ParallelGCThreads,
                                          ParallelRefProcEnabled,
                                          true); // Setting next fields of discovered
@@ -3211,13 +3214,14 @@
     return false;
   }
 
+  DTraceGCProbeMarker gc_probe_marker(false /* full */);
+  ResourceMark rm;
+
   if (PrintHeapAtGC) {
     Universe::print_heap_before_gc();
   }
 
   {
-    ResourceMark rm;
-
     // This call will decide whether this pause is an initial-mark
     // pause. If it is, during_initial_mark_pause() will return true
     // for the duration of this pause.
@@ -3956,8 +3960,6 @@
   // Now restore saved marks, if any.
   if (_objs_with_preserved_marks != NULL) {
     assert(_preserved_marks_of_objs != NULL, "Both or none.");
-    assert(_objs_with_preserved_marks->length() ==
-           _preserved_marks_of_objs->length(), "Both or none.");
     guarantee(_objs_with_preserved_marks->length() ==
               _preserved_marks_of_objs->length(), "Both or none.");
     for (int i = 0; i < _objs_with_preserved_marks->length(); i++) {
@@ -4052,7 +4054,10 @@
 }
 
 void G1CollectedHeap::preserve_mark_if_necessary(oop obj, markOop m) {
-  if (m != markOopDesc::prototype()) {
+  assert(evacuation_failed(), "Oversaving!");
+  // We want to call the "for_promotion_failure" version only in the
+  // case of a promotion failure.
+  if (m->must_be_preserved_for_promotion_failure(obj)) {
     if (_objs_with_preserved_marks == NULL) {
       assert(_preserved_marks_of_objs == NULL, "Both or none.");
       _objs_with_preserved_marks =
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Tue Jan 04 17:10:35 2011 -0800
@@ -849,6 +849,12 @@
   void print_gc_alloc_regions();
 #endif // !PRODUCT
 
+  // Instance of the concurrent mark is_alive closure for embedding
+  // into the reference processor as the is_alive_non_header. This
+  // prevents unnecessary additions to the discovered lists during
+  // concurrent discovery.
+  G1CMIsAliveClosure _is_alive_closure;
+
   // ("Weak") Reference processing support
   ReferenceProcessor* _ref_processor;
 
@@ -893,7 +899,7 @@
   // specified by the policy object.
   jint initialize();
 
-  void ref_processing_init();
+  virtual void ref_processing_init();
 
   void set_par_threads(int t) {
     SharedHeap::set_par_threads(t);
--- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1058,10 +1058,11 @@
 #endif
 
 void ParNewGeneration::preserve_mark_if_necessary(oop obj, markOop m) {
-  if ((m != markOopDesc::prototype()) &&
-      (!UseBiasedLocking || (m != markOopDesc::biased_locking_prototype()))) {
+  if (m->must_be_preserved_for_promotion_failure(obj)) {
+    // We should really have separate per-worker stacks, rather
+    // than use locking of a common pair of stacks.
     MutexLocker ml(ParGCRareEvent_lock);
-    DefNewGeneration::preserve_mark_if_necessary(obj, m);
+    preserve_mark(obj, m);
   }
 }
 
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -694,6 +694,8 @@
 void PSScavenge::oop_promotion_failed(oop obj, markOop obj_mark) {
   _promotion_failed = true;
   if (obj_mark->must_be_preserved_for_promotion_failure(obj)) {
+    // Should use per-worker private stakcs hetre rather than
+    // locking a common pair of stacks.
     ThreadCritical tc;
     _preserved_oop_stack.push(obj);
     _preserved_mark_stack.push(obj_mark);
--- a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp	Tue Jan 04 17:10:35 2011 -0800
@@ -209,4 +209,15 @@
   HeapWord* result() const       { return _res; }
 };
 
+class DTraceGCProbeMarker : public StackObj {
+public:
+  DTraceGCProbeMarker(bool full) {
+    VM_GC_Operation::notify_gc_begin(full);
+  }
+
+  ~DTraceGCProbeMarker() {
+    VM_GC_Operation::notify_gc_end();
+  }
+};
+
 #endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_VMGCOPERATIONS_HPP
--- a/hotspot/src/share/vm/memory/defNewGeneration.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/share/vm/memory/defNewGeneration.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -684,23 +684,28 @@
   _preserved_marks_of_objs.clear(true);
 }
 
+void DefNewGeneration::preserve_mark(oop obj, markOop m) {
+  assert(promotion_failed() && m->must_be_preserved_for_promotion_failure(obj),
+         "Oversaving!");
+  _objs_with_preserved_marks.push(obj);
+  _preserved_marks_of_objs.push(m);
+}
+
 void DefNewGeneration::preserve_mark_if_necessary(oop obj, markOop m) {
   if (m->must_be_preserved_for_promotion_failure(obj)) {
-    _objs_with_preserved_marks.push(obj);
-    _preserved_marks_of_objs.push(m);
+    preserve_mark(obj, m);
   }
 }
 
 void DefNewGeneration::handle_promotion_failure(oop old) {
-  preserve_mark_if_necessary(old, old->mark());
-  if (!_promotion_failed && PrintPromotionFailure) {
+  if (PrintPromotionFailure && !_promotion_failed) {
     gclog_or_tty->print(" (promotion failure size = " SIZE_FORMAT ") ",
                         old->size());
   }
-
+  _promotion_failed = true;
+  preserve_mark_if_necessary(old, old->mark());
   // forward to self
   old->forward_to(old);
-  _promotion_failed = true;
 
   _promo_failure_scan_stack.push(old);
 
--- a/hotspot/src/share/vm/memory/defNewGeneration.hpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/share/vm/memory/defNewGeneration.hpp	Tue Jan 04 17:10:35 2011 -0800
@@ -85,6 +85,7 @@
   // Preserve the mark of "obj", if necessary, in preparation for its mark
   // word being overwritten with a self-forwarding-pointer.
   void   preserve_mark_if_necessary(oop obj, markOop m);
+  void   preserve_mark(oop obj, markOop m);    // work routine used by the above
 
   // Together, these keep <object with a preserved mark, mark value> pairs.
   // They should always contain the same number of elements.
--- a/hotspot/src/share/vm/oops/markOop.inline.hpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/src/share/vm/oops/markOop.inline.hpp	Tue Jan 04 17:10:35 2011 -0800
@@ -30,7 +30,7 @@
 #include "oops/markOop.hpp"
 #include "runtime/globals.hpp"
 
-// Should this header be preserved during GC?
+// Should this header be preserved during GC (when biased locking is enabled)?
 inline bool markOopDesc::must_be_preserved_with_bias(oop obj_containing_mark) const {
   assert(UseBiasedLocking, "unexpected");
   if (has_bias_pattern()) {
@@ -47,14 +47,15 @@
   return (!is_unlocked() || !has_no_hash());
 }
 
+// Should this header be preserved during GC?
 inline bool markOopDesc::must_be_preserved(oop obj_containing_mark) const {
   if (!UseBiasedLocking)
     return (!is_unlocked() || !has_no_hash());
   return must_be_preserved_with_bias(obj_containing_mark);
 }
 
-// Should this header (including its age bits) be preserved in the
-// case of a promotion failure during scavenge?
+// Should this header be preserved in the case of a promotion failure
+// during scavenge (when biased locking is enabled)?
 inline bool markOopDesc::must_be_preserved_with_bias_for_promotion_failure(oop obj_containing_mark) const {
   assert(UseBiasedLocking, "unexpected");
   // We don't explicitly save off the mark words of biased and
@@ -70,18 +71,20 @@
       prototype_for_object(obj_containing_mark)->has_bias_pattern()) {
     return true;
   }
-  return (this != prototype());
+  return (!is_unlocked() || !has_no_hash());
 }
 
+// Should this header be preserved in the case of a promotion failure
+// during scavenge?
 inline bool markOopDesc::must_be_preserved_for_promotion_failure(oop obj_containing_mark) const {
   if (!UseBiasedLocking)
-    return (this != prototype());
+    return (!is_unlocked() || !has_no_hash());
   return must_be_preserved_with_bias_for_promotion_failure(obj_containing_mark);
 }
 
 
-// Should this header (including its age bits) be preserved in the
-// case of a scavenge in which CMS is the old generation?
+// Same as must_be_preserved_with_bias_for_promotion_failure() except that
+// it takes a klassOop argument, instead of the object of which this is the mark word.
 inline bool markOopDesc::must_be_preserved_with_bias_for_cms_scavenge(klassOop klass_of_obj_containing_mark) const {
   assert(UseBiasedLocking, "unexpected");
   // CMS scavenges preserve mark words in similar fashion to promotion failures; see above
@@ -89,11 +92,14 @@
       klass_of_obj_containing_mark->klass_part()->prototype_header()->has_bias_pattern()) {
     return true;
   }
-  return (this != prototype());
+  return (!is_unlocked() || !has_no_hash());
 }
+
+// Same as must_be_preserved_for_promotion_failure() except that
+// it takes a klassOop argument, instead of the object of which this is the mark word.
 inline bool markOopDesc::must_be_preserved_for_cms_scavenge(klassOop klass_of_obj_containing_mark) const {
   if (!UseBiasedLocking)
-    return (this != prototype());
+    return (!is_unlocked() || !has_no_hash());
   return must_be_preserved_with_bias_for_cms_scavenge(klass_of_obj_containing_mark);
 }
 
--- a/hotspot/test/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/test/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/hotspot/test/compiler/6431242/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/test/compiler/6431242/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/hotspot/test/compiler/6857159/Test6857159.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/test/compiler/6857159/Test6857159.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/hotspot/test/compiler/6877254/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/test/compiler/6877254/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/hotspot/test/compiler/6895383/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/test/compiler/6895383/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/hotspot/test/compiler/6896727/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/hotspot/test/compiler/6896727/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jaxp/.hgtags	Thu Dec 23 12:29:21 2010 -0800
+++ b/jaxp/.hgtags	Tue Jan 04 17:10:35 2011 -0800
@@ -97,3 +97,4 @@
 4821de0908defe647fcdaab4485f98873e24dea0 jdk7-b120
 63dae40fa19fd3bf4689ea2f3c1d9d690e1abcee jdk7-b121
 03ff13d19c8fa983cbab6542930a7f352e9b5b33 jdk7-b122
+e2aedea6495d61557326928de20dbb2d78fdd9aa jdk7-b123
--- a/jaxp/build.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jaxp/build.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jaxp/make/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jaxp/make/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jaxws/.hgtags	Thu Dec 23 12:29:21 2010 -0800
+++ b/jaxws/.hgtags	Tue Jan 04 17:10:35 2011 -0800
@@ -97,3 +97,4 @@
 a4f2e1ca67163ef79555082809d7cd719893c338 jdk7-b120
 0fa950117faac7bdbc94e6c46b88f6f892031c17 jdk7-b121
 17b6c48a344968880925dcef1178fec282feb335 jdk7-b122
+5a8e43bcce56b7cd5576419067a929b74575ae71 jdk7-b123
--- a/jaxws/build.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jaxws/build.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jaxws/jaxws.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jaxws/jaxws.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jaxws/make/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jaxws/make/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/.hgtags	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/.hgtags	Tue Jan 04 17:10:35 2011 -0800
@@ -97,3 +97,4 @@
 37d74e29687cf07c2bf9411af58c7e42440855c3 jdk7-b120
 a661d8587b5d8986aacae086f5df66af9e1a96b1 jdk7-b121
 ac311eb325bfc763698219252bf3cee9e091f3af jdk7-b122
+869190935eedee7750d955019ab2a1b80f0a13a8 jdk7-b123
--- a/jdk/README	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/README	Tue Jan 04 17:10:35 2011 -0800
@@ -9,25 +9,20 @@
      http://java.sun.com/javase/downloads/index.jsp
      Set the environment variable ALT_BOOTDIR to the location of this JDK 6.
 
-  2. Download and install the Binary Plugs for the most recent JDK7 from
-     http://download.java.net/openjdk/jdk7/
-     Set the environment variable ALT_BINARY_PLUGS_PATH to the location of
-     these binary plugs.
-     
-  3. Either download and install the latest JDK7 from
+  2. Either download and install the latest JDK7 from
      http://download.java.net/openjdk/jdk7/, or build your own complete
      OpenJDK7 by using the top level Makefile in the OpenJDK Mercurial forest.
      Set the environment variable ALT_JDK_IMPORT_PATH to the location of
      this latest JDK7 or OpenJDK7 build.
      
-  4. Check the sanity of doing a build with the current machine:
+  3. Check the sanity of doing a build with the current machine:
        cd make && gnumake sanity
      See README-builds.html if you run into problems.
   
-  5. Do a partial build of the jdk:
+  4. Do a partial build of the jdk:
        cd make && gnumake all
   
-  6. Construct the images:
+  5. Construct the images:
        cd make && gnumake images
      The resulting JDK image should be found in build/*/j2sdk-image
 
--- a/jdk/make/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -100,7 +100,6 @@
 DEVTOOLS_PATH.desc         = Directory containing zip and unzip
 CUPS_HEADERS_PATH.desc     = Include directory location for CUPS header files
 DXSDK_PATH.desc            = Root directory of DirectX SDK
-MSDEVTOOLS_PATH.desc       = Root directory of VC++ tools (e.g. rc.exe)
 MSVCRT_DLL_PATH.desc       = Directory containing mscvrt.dll
 
 # Make variables to print out (description and value)
@@ -135,12 +134,10 @@
 
 VARIABLE_PRINTVAL_LIST +=       \
     DXSDK_PATH                  \
-    MSDEVTOOLS_PATH             \
     MSVCRT_DLL_PATH
 
 VARIABLE_CHECKDIR_LIST +=       \
     DXSDK_PATH                  \
-    MSDEVTOOLS_PATH             \
     MSVCRT_DLL_PATH
 
 endif
@@ -325,11 +322,6 @@
 endif
 
 #
-# Binary Plug rules and macros
-#
-include $(BUILDDIR)/common/internal/BinaryPlugs.gmk
-
-#
 # Test rule
 #
 
--- a/jdk/make/com/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/com/sun/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/com/sun/crypto/provider/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/crypto/provider/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/make/com/sun/demo/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/demo/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/make/com/sun/demo/jvmti/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/demo/jvmti/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/make/com/sun/java/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/java/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/com/sun/java/browser/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/java/browser/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/com/sun/java/pack/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/java/pack/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/com/sun/java/pack/prop/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/java/pack/prop/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/com/sun/jmx/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/jmx/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
@@ -42,12 +42,8 @@
 # within common included gmk files : that is why the following for loop
 # has been duplicated.
 
-# When building the openjdk, build snmp only if importing binary plugs,
-ifdef OPENJDK
-  ifeq ($(IMPORT_BINARY_PLUGS),true)
-    SUBDIRS = snmp
-  endif
-else
+# When building the openjdk, no snmp
+ifndef OPENJDK
   SUBDIRS = snmp
 endif
 
--- a/jdk/make/com/sun/jndi/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/jndi/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/make/com/sun/jndi/cosnaming/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/jndi/cosnaming/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/make/com/sun/jndi/dns/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/jndi/dns/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/com/sun/jndi/ldap/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/jndi/ldap/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/make/com/sun/jndi/rmi/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/jndi/rmi/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/make/com/sun/jndi/rmi/registry/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/jndi/rmi/registry/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/make/com/sun/nio/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/nio/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/make/com/sun/nio/sctp/FILES_java.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/nio/sctp/FILES_java.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/make/com/sun/nio/sctp/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/nio/sctp/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/make/com/sun/nio/sctp/mapfile-vers	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/nio/sctp/mapfile-vers	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/make/com/sun/org/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/org/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/com/sun/org/apache/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/org/apache/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/com/sun/org/apache/xml/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/org/apache/xml/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/com/sun/rowset/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/rowset/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/com/sun/script/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/script/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/com/sun/security/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/security/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/com/sun/security/auth/module/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/security/auth/module/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/com/sun/servicetag/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/servicetag/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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
--- a/jdk/make/com/sun/tools/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/tools/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/com/sun/tools/attach/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/tools/attach/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/com/sun/tracing/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/com/sun/tracing/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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
--- a/jdk/make/common/Cscope.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/Cscope.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/common/Defs-linux.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/Defs-linux.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/make/common/Defs-solaris.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/Defs-solaris.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/jdk/make/common/Defs-windows.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/Defs-windows.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
@@ -294,6 +294,13 @@
 
 # Always add _STATIC_CPPLIB definition
 STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB
+
+# Silence the warning about using _STATIC_CPPLIB
+ifneq ($(SHOW_ALL_WARNINGS),true)
+  # Needed with VS2010 to turn off the deprecated warning.
+  STATIC_CPPLIB_OPTION += /D _DISABLE_DEPRECATE_STATIC_CPPLIB
+endif
+
 MS_RUNTIME_OPTION += $(STATIC_CPPLIB_OPTION)
 
 ifeq ($(CC_VERSION),msvc)
@@ -305,7 +312,7 @@
   #   -Od      Turns off optimization and speeds compilation
   #   -YX -Fp/.../foobar.pch   Use precompiled headers (try someday?)
   #   -nologo  Don't print out startup message
-  #   /D _STATIC_CPPLIB  
+  #   /D _STATIC_CPPLIB
   #            Use static link for the C++ runtime (so msvcpnn.dll not needed)
   #   
   CFLAGS_COMMON  += -Zi -nologo
@@ -395,12 +402,20 @@
 # Treat compiler warnings as errors, if requested
 #
 CFLAGS_COMMON += -W$(COMPILER_WARNING_LEVEL)
-# Turn off security warnings about using the standard C library function strcpy
-CFLAGS_COMMON += -D _CRT_SECURE_NO_DEPRECATE
 ifeq ($(COMPILER_WARNINGS_FATAL),true)
   CFLAGS_COMMON += -WX
 endif
 
+# Turn off some warnings by default, enable them all if asked.
+ifneq ($(SHOW_ALL_WARNINGS),true)
+  # The -D _CRT_SECURE_NO_DEPRECATE turns off security/deprecated warnings on
+  #    the standard C library functions like strcpy.
+  CFLAGS_COMMON += -D _CRT_SECURE_NO_DEPRECATE
+  # The -D _CRT_NONSTDC_NO_DEPRECATE turns off deprecation warnings about using
+  #    non-standard C POSIX functions.
+  CFLAGS_COMMON += -D _CRT_NONSTDC_NO_DEPRECATE
+endif
+
 CPPFLAGS_OPT    = -DNDEBUG
 CPPFLAGS_DBG    = -DDEBUG -DLOGGING
 
--- a/jdk/make/common/Defs.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/Defs.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
@@ -109,83 +109,6 @@
   endif
 endif
 
-# If OPENJDK is defined, we may still need to use some native libraries that
-# exist only as part of the closed source. If the closed sources are not
-# available, the libraries must have been pre-built. Since these libraries
-# and the JDK internal interfaces to these are reasonably stable this is not
-# a significant problem. But we do need to provide a way to locate them,
-# including a way to point to a new one when there have been changes.
-#
-# If you have a formal binary plugs download, set ALT_BINARY_PLUGS_PATH
-# to the location.
-# (Optionally you can set ALT_CLOSED_JDK_IMPORT_PATH to point to the latest
-#  build JDK, or last promotion for this JDK version, but will not work
-#  on windows).
-#
-# As the OPENJDK is built, the binary plugs are used instead of building the
-# libraries.
-# Individual Makefiles that specify USE_BINARY_PLUG_LIBRARY, will get
-# the binary plug copy (or a copy from a built JDK).
-#
-# See common/internal/BinaryPlugs.gmk for more information.
-#
-# Usage notes:
-#
-#   ALT_BINARY_PLUGS_JARFILE is probably rarely needed. It can be used
-#   to identify the exact jar file to be used for all closed classes..
-#  
-#   ALT_BINARY_PLUGS_PATH points to a directory containing precisely the
-#   binaries needed to build. 
-#  
-#   ALT_BUILD_BINARY_PLUGS_PATH points to a directory containing binary plug dirs 
-#   multiple architectures named using the standard conventions
-#   This is useful for build scripts that need to build multiple architectures
-#   of the OpenJDK.
-#   
-#   ALT_CLOSED_JDK_IMPORT_PATH points to the top-level of a specific platform
-#   JDK image.
-#  
-#   The precedence is that
-#     1. ALT_BINARY_PLUGS_JARFILE overrides any other location of the classes
-#     2. ALT_BINARY_PLUGS_PATH overrides all locations of classes and libraries
-#     3. ALT_BUILD_BINARY_PLUGS_PATH is used to find a ALT_BINARY_PLUGS_PATH
-#     4. ALT_CLOSED_JDK_IMPORT_PATH is used to locate classes and libraries
-#   Note: If any of the ALT_ variables are modified here, it is assumed
-#         that the build should be done with IMPORT_BINARY_PLUGS=true as
-#         well.  Otherwise the default will be IMPORT_BINARY_PLUGS=false.
-#         Lastly, setting IMPORT_BINARY_PLUGS=false on the command line
-#         will override this logic, and plugs will not be imported.
-#
-
-# Always needed, defines the name of the imported/exported jarfile
-BINARY_PLUGS_JARNAME = rt-closed.jar
-
-ifdef OPENJDK
-  ifdef ALT_CLOSED_JDK_IMPORT_PATH
-    CLOSED_JDK_IMPORT_PATH = $(ALT_CLOSED_JDK_IMPORT_PATH)
-    BINARY_PLUGS_PATH = $(CLOSED_JDK_IMPORT_PATH)
-    BINARY_PLUGS_JARFILE = $(CLOSED_JDK_IMPORT_PATH)/jre/lib/rt.jar
-    IMPORT_BINARY_PLUGS=true
-  endif
-  ifdef ALT_BUILD_BINARY_PLUGS_PATH
-    BUILD_BINARY_PLUGS_PATH = $(ALT_BUILD_BINARY_PLUGS_PATH)
-    IMPORT_BINARY_PLUGS=true
-  else
-    BUILD_BINARY_PLUGS_PATH = $(SLASH_JAVA)/re/jdk/$(JDK_VERSION)/promoted/latest/openjdk/binaryplugs
-  endif
-  BINARY_PLUGS_PATH = $(BUILD_BINARY_PLUGS_PATH)/$(PLATFORM)-$(ARCH)
-  BINARY_PLUGS_JARFILE = $(BINARY_PLUGS_PATH)/jre/lib/$(BINARY_PLUGS_JARNAME)
-  ifdef ALT_BINARY_PLUGS_PATH
-    BINARY_PLUGS_PATH  = $(ALT_BINARY_PLUGS_PATH)
-    BINARY_PLUGS_JARFILE = $(BINARY_PLUGS_PATH)/jre/lib/$(BINARY_PLUGS_JARNAME)
-    IMPORT_BINARY_PLUGS=true
-  endif
-  ifdef ALT_BINARY_PLUGS_JARFILE
-    BINARY_PLUGS_JARFILE = $(ALT_BINARY_PLUGS_JARFILE)
-    IMPORT_BINARY_PLUGS=true
-  endif
-endif # OPENJDK
-
 #
 # Get platform definitions
 #
@@ -289,17 +212,6 @@
 
 LDLIBS_COMMON += $(EXTRA_LIBS)
 
-#
-# Default is to build, not import native binaries
-#
-ifndef IMPORT_NATIVE_BINARIES
-  IMPORT_NATIVE_BINARIES=false
-endif
-# If importing libraries in, no incremental builds
-ifeq ($(IMPORT_NATIVE_BINARIES),true)
- INCREMENTAL_BUILD=false
-endif
-
 # for generated libraries
 LIBDIR              = $(OUTPUTDIR)/lib
 ABS_LIBDIR          = $(ABS_OUTPUTDIR)/lib
--- a/jdk/make/common/Demo.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/Demo.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/make/common/Library.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/Library.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
@@ -77,26 +77,6 @@
 LINKER=$(LINK.c)
 endif
 
-# FIXUP: unpack needs the zip .o files. So we must build zip?
-#     or fix unpack makefile so it uses Program.gmk.
-ifneq ($(IMPORT_NATIVE_BINARIES),true)
-  COMPILE_IT=true
-else
-  ifeq ($(LIBRARY),zip)
-    COMPILE_IT=true
-  else
-    COMPILE_IT=false
-  endif
-endif
-
-# If a Makefile has specified a pre-compiled closed src lib, just copy it.
-ifdef USE_BINARY_PLUG_LIBRARY
-  COMPILE_IT=false
-endif
-
-# We either need to import (copy) libraries in, or build them
-ifeq ($(COMPILE_IT),true)
-
 $(ACTUAL_LIBRARY):: $(INIT) $(TEMPDIR) $(LIBDIR) $(BINDIR) $(EXTDIR) classheaders
 
 #
@@ -275,31 +255,6 @@
 	$(LINT.c) $(FILES_ln) $(LDLIBS) 
 endif
 
-else  # COMPILE_IT
-
-# OpenJDK rule is first so any lib is preferentially copied from that location.
-ifndef USE_BINARY_PLUG_LIBRARY
-
-# In this case we are just copying the file.
-ifneq ($(LIBRARY), fdlibm)
-# Copies in the file from the JDK_IMPORT_PATH area
-$(ACTUAL_LIBRARY_DIR)/%: $(JDK_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/%
-	$(install-import-file)
-$(ACTUAL_LIBRARY_DIR)/%: $(JDK_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/native_threads/%
-	$(install-import-file)
-$(ACTUAL_LIBRARY_DIR)/%: $(JDK_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/headless/%
-	$(install-import-file)
-$(ACTUAL_LIBRARY_DIR)/%: $(JDK_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/xawt/%
-	$(install-import-file)
-else # fdlibm
-$(ACTUAL_LIBRARY_DIR)/%:
-	$(prep-target)
-endif # fdlibm
-
-endif # USE_BINARY_PLUG_LIBRARY
-
-endif # COMPILE_IT
-
 #
 # Class libraries with JNI native methods get a include to the package.
 #
--- a/jdk/make/common/Modules.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/Modules.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/make/common/Program.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/Program.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
@@ -105,15 +105,6 @@
 FILES_o = \
 	$(OBJDIR)/main.$(OBJECT_SUFFIX)
 
-# We either need to import (copy) binaries in, or build them
-ifneq ($(IMPORT_NATIVE_BINARIES),true)
-  COMPILE_IT=true
-else
-  COMPILE_IT=false
-endif
-
-ifeq ($(COMPILE_IT),true)
-
 $(ACTUAL_PROGRAM):: classes $(INIT) 
 
 #
@@ -192,19 +183,6 @@
 
 endif # PLATFORM
 
-else  # COMPILE_IT
-
-$(ACTUAL_PROGRAM)::
-
-# Copies in the file from the JDK_IMPORT_PATH area
-$(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/jre/bin/%
-	@$(install-import-file)
-$(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/bin/%
-	@$(install-import-file)
-
-endif # COMPILE_IT
-
-
 clean:: 
 ifeq ($(PLATFORM), windows)
 	$(RM) $(OBJDIR)/$(PROGRAM).rc
--- a/jdk/make/common/Release.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/Release.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
@@ -249,18 +249,8 @@
 sec-files sec-files-win jgss-files ::
 	@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
 
-#
-# Export binary plugs if not building OPENJDK
-#
-ifdef OPENJDK
-  EXPORT_BINARY_PLUGS =
-else # !OPENJDK
-  EXPORT_BINARY_PLUGS = export-binary-plugs test-binary-plugs
-endif # OPENJDK
-
 # Order is important here, trim jre after jdk image is created
 images:: sanity-images post-sanity-images  \
-         $(EXPORT_BINARY_PLUGS) \
 	 $(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \
 	 trim-image-jre trim-image-jdk \
 	 process-image-jre process-image-jdk sec-files sec-files-win jgss-files
--- a/jdk/make/common/Sanity.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/Sanity.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, 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
@@ -85,7 +85,6 @@
     sane-classpath \
     sane-java_home \
     sane-fonts \
-    sane-binary-plugs \
     sane-variant \
     sane-ld_library_path \
     sane-ld_library_path_64 \
--- a/jdk/make/common/internal/BinaryPlugs.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,270 +0,0 @@
-#
-# Copyright (c) 2007, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# 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
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-########################################################################
-
-# Definitions for openjdk plugs (used by both import and export)
-
-# Names of native shared libraries
-
-PLUG_LIBRARY_NAMES=
-
-# Sub-directory where native shared libraries are located (e.g. jre/bin or...)
-
-PLUG_LOCATION_SUBDIR=$(ARCH_VM_SUBDIR)
-
-# Explicit classfile lists
-
-# WARNING: These classlists will not work with pattern rules, only used in 
-#          shell commands.
-#          The \$$ patterns will fail in pattern rules, which want $$, 
-#          but the $$ fails in shell commands. 
-#          The shell commands are more important.
-#          Also, the $1 pattern in these names causes problems with the 
-#          GNU make define feature, so you can't use these in define's.
-
-PLUG_JMF_CLASS_NAMES = \
-com/sun/jmx/snmp/SnmpDataTypeEnums.class \
-com/sun/jmx/snmp/SnmpDefinitions.class \
-com/sun/jmx/snmp/SnmpOid.class \
-com/sun/jmx/snmp/SnmpOidDatabase.class \
-com/sun/jmx/snmp/SnmpOidDatabaseSupport.class \
-com/sun/jmx/snmp/SnmpOidRecord.class \
-com/sun/jmx/snmp/SnmpOidTable.class \
-com/sun/jmx/snmp/SnmpOidTableSupport.class \
-com/sun/jmx/snmp/SnmpParameters.class \
-com/sun/jmx/snmp/SnmpPduPacket.class \
-com/sun/jmx/snmp/SnmpPeer.class \
-com/sun/jmx/snmp/SnmpTimeticks.class \
-com/sun/jmx/snmp/SnmpVarBind.class \
-com/sun/jmx/snmp/SnmpVarBindList.class \
-com/sun/jmx/snmp/Timestamp.class \
-com/sun/jmx/snmp/daemon/SendQ.class \
-com/sun/jmx/snmp/daemon/SnmpInformRequest.class \
-com/sun/jmx/snmp/daemon/SnmpQManager.class \
-com/sun/jmx/snmp/daemon/SnmpRequestCounter.class \
-com/sun/jmx/snmp/daemon/SnmpResponseHandler.class \
-com/sun/jmx/snmp/daemon/SnmpSendServer.class \
-com/sun/jmx/snmp/daemon/SnmpSession.class \
-com/sun/jmx/snmp/daemon/SnmpSocket.class \
-com/sun/jmx/snmp/daemon/SnmpTimerServer.class \
-com/sun/jmx/snmp/daemon/WaitQ.class
-
-# Class list temp files (used by both import and export of plugs)
-
-PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
-PLUG_CLASS_AREAS = jmf
-PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
-
-# Create jargs file command
-
-define plug-create-jargs
-@$(prep-target)
-$(SED) -e "s@^@-C $(CLASSDESTDIR) @" $< > $@
-endef # plug-create-clist-jargs
-
-# Create clist (class name list) and jargs file (input to jar)
-#   Need these files to avoid long command lines which fail on some systems.
-
-$(PLUG_TEMPDIR)/jmf.clist:
-	@$(prep-target)
-	@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
-	  $(ECHO) "$$i" >> $@; \
-	done
-$(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
-	@$(prep-target)
-	$(CAT) $(PLUG_CLISTS) > $@
-$(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
-	$(plug-create-jargs)
-$(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
-	$(plug-create-jargs)
-
-#
-# Specific to OPENJDK import of binary plugs
-#
-
-ifdef OPENJDK
-
-# Import 
-
-PLUG_IMPORT_DIR=$(BINARY_PLUGS_PATH)
-PLUG_IMPORT_JARFILE=$(BINARY_PLUGS_JARFILE)
-
-# Import file command
-
-define import-binary-plug-file
-@$(ECHO) "PLUG IMPORT: $(@F)"
-$(install-non-module-file)
-endef # import-binary-plug-file
-
-# Import classes command
-
-define import-binary-plug-classes
-@$(MKDIR) -p $(CLASSDESTDIR)
-@$(CAT) $1 | $(SED) -e 's/^/PLUG IMPORT: /'
-($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) @$1 $(BOOT_JAR_JFLAGS) )
-($(CD) $(CLASSDESTDIR) && $(java-vm-cleanup) )
-endef # import-binary-plug-classes
-
-# Import specific area classes (the classes are always created)
-
-import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
-	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
-
-# Import all classes from the jar file
-
-import-binary-plug-jar: \
-	     import-binary-plug-jmf-classes
-
-# Binary plug start/complete messages
-
-import-binary-plugs-started:
-	@$(ECHO) "BinaryPlugs import started: `date`"
-	@$(ECHO) "BINARY_PLUGS_PATH=$(BINARY_PLUGS_PATH)"
-import-binary-plugs-completed:
-	@$(ECHO) "BinaryPlugs import completed: `date`"
-
-# Import lib files (only if they don't exist already)
-
-import-binary-plugs-libs: \
-    $(PLUG_LIBRARY_NAMES:%=$(LIB_LOCATION)/%)
-
-# Import everything
-
-import-binary-plugs: \
-    import-binary-plugs-started \
-    import-binary-plugs-libs \
-    import-binary-plug-jar \
-    import-binary-plugs-completed
-
-# All these targets are phony (no filenames)
-
-.PHONY: import-binary-plugs-started  \
-	import-binary-plugs-completed \
-	import-binary-plugs-libs \
-	import-binary-plugs \
-	import-binary-plug-jar \
-	import-binary-plug-jmf-classes
-
-else # !OPENJDK
-
-#
-# Specific to exporting binary plugs for OPENJDK (e.g. OPENJDK is NOT defined)
-#
-
-# Export names (See make/common/Defs.gmk for BINARY_PLUGS_JARNAME definition)
-
-PLUG_EXPORT_DIRNAME=openjdk-binary-plugs-image
-PLUG_EXPORT_DIR=$(OUTPUTDIR)/$(PLUG_EXPORT_DIRNAME)
-PLUG_EXPORT_JARFILE=$(PLUG_EXPORT_DIR)/jre/lib/$(BINARY_PLUGS_JARNAME)
-
-# Export file command
-
-define export-binary-plug-file
-@$(ECHO) "PLUG EXPORT: $(@F)"
-$(install-non-module-file)
-endef # export-binary-plug-file
-
-# OpenJDK Binary Plug License
-
-$(PLUG_EXPORT_DIR)/LICENSE: $(CLOSED_SHARE_SRC)/doc/openjdk/binary-plugs/LICENSE
-	$(export-binary-plug-file)
-export-binary-plugs-license: $(PLUG_EXPORT_DIR)/LICENSE
-
-# Create jar file of plug classes (always created)
-
-$(PLUG_EXPORT_JARFILE): $(PLUG_TEMPDIR)/all.clist $(PLUG_TEMPDIR)/all.jargs
-	@$(prep-target)
-	@$(ECHO) "PLUG EXPORT: $(@F)"
-	@$(CAT) $(PLUG_TEMPDIR)/all.clist | $(SED) -e 's/^/PLUG EXPORT: /'
-	$(BOOT_JAR_CMD) cf $@ @$(PLUG_TEMPDIR)/all.jargs $(BOOT_JAR_JFLAGS)
-	@$(java-vm-cleanup)
-export-binary-plugs-jar: $(PLUG_EXPORT_JARFILE)
-
-# Export binary plug start/complete messages
-
-export-binary-plugs-started:
-	@$(ECHO) "BinaryPlugs export started: `date`"
-	@$(ECHO) "PLUG_EXPORT_DIR=$(PLUG_EXPORT_DIR)"
-	$(RM) -r $(PLUG_EXPORT_DIR)
-	@$(MKDIR) -p $(PLUG_EXPORT_DIR)
-	@$(MKDIR) -p $(PLUG_TEMPDIR)
-export-binary-plugs-completed:
-	@$(RM) -r $(PLUG_TEMPDIR)
-	@$(ECHO) "BinaryPlugs export completed: `date`"
-
-# Export lib files (only if they don't exist already)
-
-export-binary-plugs-libs: \
-    $(PLUG_LIBRARY_NAMES:%=$(PLUG_EXPORT_DIR)/$(PLUG_LOCATION_SUBDIR)/%)
-
-# Export everything
-
-export-binary-plugs: \
-    export-binary-plugs-started \
-    export-binary-plugs-libs \
-    export-binary-plugs-license \
-    export-binary-plugs-jar \
-    export-binary-plugs-completed
-
-# All these targets are phony (no filenames)
-
-.PHONY: export-binary-plugs-started \
-        export-binary-plugs-license \
-        export-binary-plugs-jar \
-        export-binary-plugs-libs \
-        export-binary-plugs-completed \
-        export-binary-plugs
-
-# Rules that test the export and import of plugs (only when you can export)
-
-TEST_OUTPUTDIR=$(ABS_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-testing-plugs
-TEST_PLUG_COPY=$(TEST_OUTPUTDIR)/$(PLUG_EXPORT_DIRNAME)-testcopy
-
-# Run export-binary-plugs first, then use this rule to test an import
-
-test-binary-plugs: $(TEST_PLUG_COPY)
-	$(RM) -r $(TEST_OUTPUTDIR)/$(PLUG_EXPORT_DIRNAME)
-	$(MKDIR) -p $(TEST_OUTPUTDIR)
-	@$(ECHO) "Testing import of plugs"
-	($(CD) $(JDK_TOPDIR)/make && \
-	    $(MAKE) OPENJDK=true \
-		ALT_OUTPUTDIR=$(TEST_OUTPUTDIR) \
-		ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH) \
-		ALT_BINARY_PLUGS_PATH=$(TEST_PLUG_COPY) \
-		import-binary-plugs )
-	$(RM) -r $(TEST_OUTPUTDIR)
-	@$(ECHO) "Testing of plugs was successful"
-
-$(TEST_PLUG_COPY):
-	@$(ECHO) "Creating test plug copy"
-	$(RM) -r $@
-	$(MKDIR) -p $(@D)
-	$(CP) -r -p $(PLUG_EXPORT_DIR) $@
-
-.PHONY: test-binary-plugs
-
-endif # !OPENJDK
-
--- a/jdk/make/common/internal/Resources.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/internal/Resources.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/common/shared/Compiler-gcc.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Compiler-gcc.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
@@ -36,7 +36,7 @@
   CCC          = $(COMPILER_PATH)g++
   LIBEXE       = $(COMPILER_PATH)lib
   LINK         = $(COMPILER_PATH)link
-  RC           = $(MSDEVTOOLS_PATH)link
+  RC           = $(COMPILER_PATH)rc
   LINK32       = $(LINK)
   RSC          = $(RC)
   # unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake
--- a/jdk/make/common/shared/Compiler-msvc.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Compiler-msvc.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
@@ -34,8 +34,6 @@
   CCC          = $(COMPILER_PATH)cl
   LIBEXE       = $(COMPILER_PATH)lib
   LINK         = $(COMPILER_PATH)link
-  RC           = $(MSDEVTOOLS_PATH)rc
-  RSC          = $(MSDEVTOOLS_PATH)rc
   LINK32       = $(LINK)
  
   # Fill in unknown values
@@ -47,7 +45,10 @@
 
   # Compiler version and type (Always get word after "Version")
   CC_VER  := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(SED) 's/.*\(Version.*\)/\1/' | $(NAWK) '{print $$2}')
-  
+
+  # The MSDEVTOOLS_PATH is for older compilers, place for rc, mt, etc.
+  _OTHER_TOOLS_PATH = $(MSDEVTOOLS_PATH)
+
   # SDK-64 and MSVC6 put REBASE.EXE in a different places - go figure...
   ifeq ($(ARCH_DATA_MODEL), 32)
     LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
@@ -56,43 +57,26 @@
       # This should be: CC_VER=13.10.3077 LINK_VER=7.10.3077
       COMPILER_NAME=Visual Studio .NET 2003 Professional C++
       COMPILER_VERSION=VS2003
+      RC         = $(_OTHER_TOOLS_PATH)rc
       REBASE     = $(COMPILER_PATH)../../Common7/Tools/Bin/rebase
       MTL        = $(COMPILER_PATH)../../Common7/Tools/Bin/midl
-      ifndef COMPILER_PATH
-	COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
-      endif
     endif
     ifeq ($(CC_MAJORVER), 14)
       COMPILER_NAME=Visual Studio 8
       COMPILER_VERSION=VS2005
+      RC         = $(_OTHER_TOOLS_PATH)rc
       REBASE     = $(COMPILER_PATH)../../Common8/Tools/Bin/rebase
       MTL        = $(COMPILER_PATH)../../Common8/Tools/Bin/midl
-      MT         = $(MSDEVTOOLS_PATH)/mt
-      ifndef COMPILER_PATH
-	COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
-      endif
+      MT         = $(_OTHER_TOOLS_PATH)/mt
     endif
     ifeq ($(CC_MAJORVER), 15)
       COMPILER_NAME=Visual Studio 9
       COMPILER_VERSION=VS2008
+      RC         = $(_OTHER_TOOLS_PATH)rc
       #rebase and midl moved out of Visual Studio into the SDK:
-      REBASE     = $(MSDEVTOOLS_PATH)/rebase
-      MTL        = $(MSDEVTOOLS_PATH)/midl.exe
-      MT         = $(MSDEVTOOLS_PATH)mt
-      ifndef COMPILER_PATH
-	COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
-      endif
-    endif
-    ifeq ($(CC_MAJORVER), 16)
-      COMPILER_NAME=Visual Studio 10
-      COMPILER_VERSION=VS2010
-      #rebase and midl moved out of Visual Studio into the SDK:
-      REBASE     = $(MSDEVTOOLS_PATH)/rebase
-      MTL        = $(MSDEVTOOLS_PATH)/midl.exe
-      MT         = $(MSDEVTOOLS_PATH)mt
-      ifndef COMPILER_PATH
-	COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
-      endif
+      REBASE     = $(_OTHER_TOOLS_PATH)/rebase
+      MTL        = $(_OTHER_TOOLS_PATH)/midl.exe
+      MT         = $(_OTHER_TOOLS_PATH)mt
     endif
   else
     # else ARCH_DATA_MODEL is 64
@@ -105,13 +89,15 @@
         # This should be: CC_VER=13.00.9337.7 LINK_VER=7.00.9337.7
         COMPILER_NAME=Microsoft Platform SDK - November 2001 Edition
         COMPILER_VERSION=VS2003
+        RC = $(_OTHER_TOOLS_PATH)rc
       endif
     endif
     ifeq ($(CC_MAJORVER), 14)
       ifeq ($(ARCH), amd64)
         #rebase and midl moved out of Visual Studio into the SDK:
-        REBASE     = $(MSDEVTOOLS_PATH)/rebase
-        MTL        = $(MSDEVTOOLS_PATH)/midl.exe
+        RC         = $(_OTHER_TOOLS_PATH)/rc
+        REBASE     = $(_OTHER_TOOLS_PATH)/rebase
+        MTL        = $(_OTHER_TOOLS_PATH)/midl.exe
         ifeq ($(CC_MICROVER), 30701)
           # This should be: CC_VER=14.00.30701 LINK_VER=8.00.30701
 	  # WARNING: it says 14, but it is such an early build it doesn't
@@ -135,24 +121,42 @@
       MT = $(MSSDK61)/Bin/X64/mt.exe
       MTL = $(MSSDK61)/Bin/X64/midl.exe
     endif
-    ifeq ($(CC_MAJORVER), 16)
-      COMPILER_NAME=Microsoft Visual Studio 10 (16.00.30319.01)
-      COMPILER_VERSION=VS2010
-      RC = $(MSDEVTOOLS_PATH)/Bin/x64/rc.exe
-      RSC = $(MSDEVTOOLS_PATH)/Bin/x64/rc.exe
-      MT = $(MSDEVTOOLS_PATH)/Bin/x64/mt.exe
-      MTL = $(MSDEVTOOLS_PATH)/Bin/X64/midl.exe
+  endif
+  
+  # The VS2010 compiler is the same one used on both 32bit and 64bit
+  ifeq ($(CC_MAJORVER), 16)
+    COMPILER_NAME=Microsoft Visual Studio 10 (16.00.30319.01)
+    COMPILER_VERSION=VS2010
+    ifeq ($(WINDOWSSDKDIR),)
+      WINDOWSSDKDIR := $(error WINDOWSSDKDIR cannot be empty here)
     endif
-    # This will cause problems if ALT_COMPILER_PATH is defined to ""
-    # which is a directive to use the PATH.
-    ifndef COMPILER_PATH
-      COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
+    ifeq ($(ARCH_DATA_MODEL), 32)
+      _OTHER_TOOLS_BIN = $(WINDOWSSDKDIR)/Bin
+    else
+      ifeq ($(ARCH), ia64)
+        _OTHER_TOOLS_BIN = $(WINDOWSSDKDIR)/Bin/ia64
+      else
+        _OTHER_TOOLS_BIN = $(WINDOWSSDKDIR)/Bin/x64
+      endif
     endif
+    RC     = $(_OTHER_TOOLS_BIN)/rc.exe
+    REBASE = $(_OTHER_TOOLS_BIN)/rebase.exe
+    MT     = $(_OTHER_TOOLS_BIN)/mt.exe
+    MTL    = $(_OTHER_TOOLS_BIN)/midl.exe
+  endif
+  
+  # These variables can never be empty
+  ifndef COMPILER_PATH
+    COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
   endif
   ifndef COMPILER_VERSION
     COMPILER_VERSION := $(error COMPILER_VERSION cannot be empty here)
   endif
+  
   # Shared library generation flag
   SHARED_LIBRARY_FLAG = -LD
+  # RSC is always same as RC (Not sure who uses this RSC variable)
+  RSC = $(RC)
+
 endif
 
--- a/jdk/make/common/shared/Compiler-sun.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Compiler-sun.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/common/shared/Defs-control.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Defs-control.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/jdk/make/common/shared/Defs-java.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Defs-java.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/make/common/shared/Defs-linux.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Defs-linux.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/common/shared/Defs-solaris.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Defs-solaris.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
@@ -91,7 +91,6 @@
 ifneq "$(origin ALT_COMPILER_PATH)" "undefined"
   COMPILER_PATH :=$(call PrefixPath,$(ALT_COMPILER_PATH))
 else
-  # Careful here, REQUIRED_COMPILER_VERSION may not be defined yet (see Defs-versions.gmk)
   # If the place where we keep a set of Sun Studio compilers doesn't exist,
   #  try and use /opt/SUNWspro, the default location for the SS compilers.
   #  (DirExists checks for this path twice, an automount double check)
--- a/jdk/make/common/shared/Defs-utils.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Defs-utils.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/common/shared/Defs-versions.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Defs-versions.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -27,7 +27,22 @@
 # WARNING: This file is shared with other workspaces.
 #
 
-# This file needs these set: CC_VERSION, PLATFORM, ARCH_FAMILY, and ARCH_DATA_MODEL.
+# This file needs these set: PLATFORM, ARCH_FAMILY, and ARCH_DATA_MODEL.
+
+# Windows uses Microsoft compilers by default
+ifeq ($(PLATFORM), windows)
+  override CC_VERSION = msvc
+endif
+
+# Solaris uses Sun Studio compilers by default
+ifeq ($(PLATFORM), solaris)
+  override CC_VERSION = sun
+endif
+
+# Linux uses GNU compilers by default
+ifeq ($(PLATFORM), linux)
+  override CC_VERSION = gcc
+endif
 
 ##########################################################################
 #
--- a/jdk/make/common/shared/Defs-windows.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Defs-windows.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
@@ -34,12 +34,17 @@
 #    Program.gmk may turn this down to 2 (building .exe's).
 #    Windows 64bit platforms are less likely to be warning free.
 #    Historically, Windows 32bit builds should be mostly warning free.
+#    VS2010 introduced a large number of security warnings that are off by
+#    default but will be turned back on with SHOW_ALL_WARNINGS=true.
 ifndef COMPILER_WARNING_LEVEL
   COMPILER_WARNING_LEVEL=3
 endif
 ifndef COMPILER_WARNINGS_FATAL
   COMPILER_WARNINGS_FATAL=false
 endif
+ifndef SHOW_ALL_WARNINGS
+  SHOW_ALL_WARNINGS = false
+endif
 
 # Windows should use parallel compilation for best build times
 ifndef COMPILE_APPROACH
@@ -80,13 +85,20 @@
 #         their own variable assigned with :=, then use FullPath.
 #
 
+ifdef USING_CYGWIN
+# All possible drive letters
+drives=a b c d e f g h i j k l m n o p q r s t v u w x y z
+# Convert /cygdrive/ paths to the mixed style without an exec of cygpath
+#   Must be a path with no spaces.
+define MixedPath
+$(patsubst /%,c:/cygwin/%,$(sort $(filter-out /cygdrive/%,$(foreach drive,$(drives),$(patsubst /cygdrive/$(drive)/%,$(drive):/%,$1)))))
+endef
 # Use FullPath to get C:/ style non-spaces path. Never ends with a /!
-ifdef USING_CYGWIN
 # We assume cygpath is available in the search path
 #    NOTE: Use of 'pwd' with CYGWIN will not get you a mixed style path!
 CYGPATH_CMD=cygpath -a -s -m
 define FullPath
-$(shell $(CYGPATH_CMD) $1 2> $(DEV_NULL))
+$(if $(word 2,$1),$(shell $(CYGPATH_CMD) $1 2> $(DEV_NULL)),$(call MixedPath,$(realpath $(subst ",,$1))))
 endef
 define OptFullPath
 $(shell if [ "$1" != "" -a -d "$1" ]; then $(CYGPATH_CMD) "$1" 2> $(DEV_NULL); else echo "$1"; fi)
@@ -228,29 +240,125 @@
   _dx_sdk_dir :=$(call FullPath,$(xDXSDK_DIR))
 endif
 
-# Compilers, SDK, and Visual Studio (MSDEV) [32bit is different from 64bit]
-ifeq ($(ARCH_DATA_MODEL), 32)
-  # Try looking in MSVCDIR or MSVCDir area first 
-  # (set by vcvars32.bat for VC .NET, not defined in the VC 2008/2010)
-  ifdef MSVCDIR
-    xMSVCDIR  :="$(subst \,/,$(MSVCDIR))"
-    _msvc_dir :=$(call FullPath,$(xMSVCDIR))
+# Use of the Visual Studio compilers requires certain env variables be set:
+#   PATH should include the path to cl.exe
+#   INCLUDE should be defined
+#   LIB     should be defined
+#   LIBPATH should be defined
+#   VS100COMNTOOLS should be defined
+#   WINDOWSSDKDIR should be defined
+#     The 7.0a path is from VS2010 Pro, the 7.1 path is the standalone SDK.
+#     For 64bit either will work for us.
+#     If a developer chooses to install the standalone SDK in some other
+#     location, then they need to set WINDOWSSDKDIR.
+#
+# Compilers for 64bit may be from the free SDK, or Visual Studio Professional.
+#   The free Express compilers don't contain 64 bit compilers, which is why
+#   you instead need the SDK.
+#   Release enginering will use VS2010 Pro, so the frequency of testing of
+#     SDK based builds will depend entirely on individual usage.
+
+# We only need to do this once
+ifndef VS2010_EXISTS
+  # The 2 key paths we need are WINDOWSSDKDIR and VS100COMNTOOLS.
+  #   If not defined try to see if default location exists.
+  #   If defined make sure that the path has no spaces.
+  #   Finally, export path with no spaces so logic minimizes FullPath calls.
+  ifndef WINDOWSSDKDIR
+    # The 7.0a SDK is the second choice.
+    xWINDOWSSDKDIR :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/"
+    fWINDOWSSDKDIR :=$(call FullPath,$(xWINDOWSSDKDIR))
+    # The 7.1 SDK is the second choice.
+    ifeq ($(fWINDOWSSDKDIR),)
+      xWINDOWSSDKDIR :="$(_program_files32)/Microsoft SDKs/Windows/v7.1/"
+      fWINDOWSSDKDIR :=$(call FullPath,$(xWINDOWSSDKDIR))
+    endif
   else
-    ifdef MSVCDir
-      xMSVCDIR  :="$(subst \,/,$(MSVCDir))"
-      _msvc_dir :=$(call FullPath,$(xMSVCDIR))
+    ifneq ($(word 2,$(WINDOWSSDKDIR)),)
+      xWINDOWSSDKDIR :="$(subst \,/,$(WINDOWSSDKDIR))"
+      fWINDOWSSDKDIR :=$(call FullPath,$(xWINDOWSSDKDIR))
+    else
+      fWINDOWSSDKDIR :=$(WINDOWSSDKDIR)
+    endif
+  endif
+  ifneq ($(fWINDOWSSDKDIR),)
+    WINDOWSSDKDIR  :=$(fWINDOWSSDKDIR)/
+  endif
+  ifndef VS100COMNTOOLS
+    xVS100COMNTOOLS :="$(_program_files32)/Microsoft Visual Studio 10.0/Common7/Tools/"
+    fVS100COMNTOOLS :=$(call FullPath,$(xVS100COMNTOOLS))
+  else
+    ifneq ($(word 2,$(VS100COMNTOOLS)),)
+      xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
+      fVS100COMNTOOLS :=$(call FullPath,$(xVS100COMNTOOLS))
+    else
+      fVS100COMNTOOLS :=$(xVS100COMNTOOLS)
     endif
   endif
-  # If we still don't have it, look for VSnnCOMNTOOLS (newest first),
-  # set by installer?
-  ifeq ($(_msvc_dir),)
-    ifdef VS100COMNTOOLS  # /Common/Tools directory, use ../../Vc
-      xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
-      _vs100tools     :=$(call FullPath,$(xVS100COMNTOOLS))
+  ifneq ($(fVS100COMNTOOLS),)
+    VS100COMNTOOLS :=$(fVS100COMNTOOLS)/
+  endif
+  # Check to see that both exist
+  ifeq ($(WINDOWSSDKDIR),)
+    _vs2010_message := No WINDOWSSDKDIR found on system. $(_vs2010_message)
+    VS2010_EXISTS   := false
+  endif
+  ifeq ($(VS100COMNTOOLS),)
+    _vs2010_message := No VS100COMNTOOLS found on system. $(_vs2010_message)
+    VS2010_EXISTS   := false
+  endif
+  ifeq ($(VS2010_EXISTS),false)
+    x:=$(warning WARNING: No VS2010 available. $(_vs2010_message))
+    VS100COMNTOOLS :=
+    WINDOWSSDKDIR  :=
+  else
+    VS2010_EXISTS := true
+    _msvc_dir     :=$(VS100COMNTOOLS)/../../Vc
+  endif
+  export VS2010_EXISTS
+  export VS100COMNTOOLS
+  export WINDOWSSDKDIR
+endif
+
+# Setup for VS2010 is simple, others logic is historic
+ifeq ($(VS2010_EXISTS),true)
+  
+  # VS2010 Compiler root directory
+  _msvc_dir :=$(VS100COMNTOOLS)/../../Vc
+  # SDK root directory
+  _ms_sdk   :=$(WINDOWSSDKDIR)
+  # Compiler bin directory and redist directory
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    _compiler_bin :=$(_msvc_dir)/Bin
+    _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC100.CRT)
+  endif
+  ifeq ($(ARCH_DATA_MODEL), 64)
+    _compiler_bin :=$(_msvc_dir)/bin/amd64
+    _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x64/Microsoft.VC100.CRT)
+  endif
+  ifeq ($(_redist_sdk),)
+    _redist_sdk   :=$(_system_root)/system32
+  endif
+
+else # Not VS2010
+
+  # Compilers, SDK, and Visual Studio (MSDEV) [32bit is different from 64bit]
+  ifeq ($(ARCH_DATA_MODEL), 32)
+
+    # Try looking in MSVCDIR or MSVCDir area first 
+    # (set by vcvars32.bat for VC .NET, not defined in the VC 2008/2010)
+    ifdef MSVCDIR
+      xMSVCDIR  :="$(subst \,/,$(MSVCDIR))"
+      _msvc_dir :=$(call FullPath,$(xMSVCDIR))
+    else
+      ifdef MSVCDir
+        xMSVCDIR  :="$(subst \,/,$(MSVCDir))"
+        _msvc_dir :=$(call FullPath,$(xMSVCDIR))
+      endif
     endif
-    ifneq ($(_vs100tools),)
-      _msvc_dir   :=$(_vs100tools)/../../Vc
-    else
+    # If we still don't have it, look for VSnnCOMNTOOLS (newest first),
+    # set by installer?
+    ifeq ($(_msvc_dir),)
       ifdef VS90COMNTOOLS  # /Common/Tools directory, use ../../Vc
         xVS90COMNTOOLS :="$(subst \,/,$(VS90COMNTOOLS))"
         _vs90tools     :=$(call FullPath,$(xVS90COMNTOOLS))
@@ -275,46 +383,38 @@
         endif
       endif
     endif
-  endif
-  ifneq ($(_msvc_dir),)
-    _compiler_bin :=$(_msvc_dir)/Bin
-    # Assume PlatformSDK is in VS71 (will be empty if VS90)
-    _ms_sdk       :=$(call FullPath,$(_msvc_dir)/PlatformSDK)
-    # Assume VS100, then VS90, then VS80, then VS71
-    _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC100.CRT)
-    ifeq ($(_redist_sdk),)
-      ifneq ($(VS100COMNTOOLS),)
-        _redist_sdk  :=c:/windows/system32
-      else
-        _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT)
+  
+    ifneq ($(_msvc_dir),)
+      _compiler_bin :=$(_msvc_dir)/Bin
+      # Assume PlatformSDK is in VS71 (will be empty if VS90)
+      _ms_sdk       :=$(call FullPath,$(_msvc_dir)/PlatformSDK)
+      _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT)
+      ifeq ($(_redist_sdk),)
+        _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT)
         ifeq ($(_redist_sdk),)
-          _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT)
-          ifeq ($(_redist_sdk),)
-            _redist_sdk   :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin)
-          endif
+          _redist_sdk   :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin)
         endif
       endif
     endif
   endif
-endif
 
-# The Microsoft Platform SDK installed by itself
-ifneq ($(_program_files),)
-  _PSDK :="$(_program_files)/Microsoft SDKs/Windows/v6.1/"
-  _psdk :=$(call FullPath,$(xMSSDK61))
-  ifeq ($(_psdk),)
-    xPSDK  :="$(_program_files)/Microsoft Platform SDK"
-    _psdk  :=$(call FullPath,$(xPSDK))
+  # The Microsoft Platform SDK installed by itself
+  ifneq ($(_program_files),)
+    _PSDK :="$(_program_files)/Microsoft SDKs/Windows/v6.1/"
+    _psdk :=$(call FullPath,$(xMSSDK61))
     ifeq ($(_psdk),)
-      xPSDK  :="$(_program_files)/Microsoft SDK"
-      _psdk :=$(call FullPath,$(xMSSDK))
+      xPSDK  :="$(_program_files)/Microsoft Platform SDK"
+      _psdk  :=$(call FullPath,$(xPSDK))
+      ifeq ($(_psdk),)
+        xPSDK  :="$(_program_files)/Microsoft SDK"
+        _psdk :=$(call FullPath,$(xMSSDK))
+      endif
     endif
   endif
-endif
 
-# If no SDK found yet, look in other places
-ifeq ($(_ms_sdk),)
-  ifdef MSSDK
+  # If no SDK found yet, look in other places
+  ifeq ($(_ms_sdk),)
+    ifdef MSSDK
     xMSSDK  :="$(subst \,/,$(MSSDK))"
     _ms_sdk :=$(call FullPath,$(xMSSDK))
   else
@@ -322,56 +422,13 @@
       xMSSDK  :="$(subst \,/,$(MSSdk))"
       _ms_sdk :=$(call FullPath,$(xMSSDK))
     else
-      _ms_sdk :=$(_psdk)
+        _ms_sdk :=$(_psdk)
+      endif
     endif
   endif
-endif
-
-# Compilers for 64bit may be from the free SDK, or Visual Studio Professional
-# The free Express compilers don't contain 64 bit compilers, which is why
-# you instead need the SDK.
-# So for VS2010 based builds, either VS2010 Pro with the 7.0a SDK, or
-# the Windows 7.1 standalone SDK with compilers may be used.
-# Release enginering will use VS2010 Pro, so the frequency of testing of
-# SDK based builds will depend entirely on individual usage.
-ifeq ($(ARCH_DATA_MODEL), 64)
-  ifdef VS100COMNTOOLS  # /Common7/Tools directory, use ../../Vc
-    # VS2010 default location is used when building 64 bit using the 7.1 SDK
-    # This is safe to hardwire as the SDK installer won't let you change it
-    # and the VS2010 variable is only used if the compilers are from the SDK
-    xVS2010 :="$(_program_files32)/Microsoft Visual Studio 10.0/"
-    VS2010 :=$(call FullPath,$(xVS2010))
-    xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
-    _vs100tools     :=$(call FullPath,$(xVS100COMNTOOLS))
-  endif
-  ifneq ($(_vs100tools),)
-    _compiler_bin :=$(_vs100tools)/../../Vc/bin/amd64
-    x_redist_sdk   :=$(_vs100tools)/../../Vc/redist/x64/Microsoft.VC100.CRT
-    _redist_sdk    :=$(call FullPath,$(x_redist_sdk))
-    # The SDK doesn't have the redist directory, but the DLL is installed
-    # into the windows directory.
-    ifeq ($(_redist_sdk),)
-      _redist_sdk   :=c:/windows/system32
-    endif
-    # Not currently using MSSDK7n, but maybe we can make use of it for
-    # doing default location lookup to find some SDK tools that presently
-    # require the developer to explicitly set the path.
-    # The 7.0a path is from VS2010 Pro, the 7.1 path is the standalone SDK.
-    # Either will work for us.
-    # If a developer chooses to install the standalone SDK in some other
-    # location, then this will fail to find it, which won't matter so long as
-    # we aren't using this variable. If we do they'd still need to set the
-    # ALT_MSDEVTOOLS_PATH as now.
-    # %WindowsSdkDir% could be referenced instead but the SDK installer
-    # doesn't set it and in the case of the VS2010 compilers,
-    # you can't change this location in the installer anyway.
-    xMSSDK7n      :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/"
-    MSSDK7n       :=$(call FullPath,$(xMSSDK7n))
-    ifeq ($(MSSDK7n),)
-      xMSSDK7n      :="$(_program_files32)/Microsoft SDKs/Windows/v7.1/"
-      MSSDK7n       :=$(call FullPath,$(xMSSDK7n))
-    endif
-  else
+  
+  # Compilers for 64bit may be from the free SDK, or Visual Studio Professional.
+  ifeq ($(ARCH_DATA_MODEL), 64)
     xVS2008 :="$(_program_files32)/Microsoft Visual Studio 9.0/"
     VS2008 :=$(call FullPath,$(xVS2008))
     ifneq ($(VS2008),)
@@ -391,7 +448,8 @@
       endif
     endif
   endif
-endif
+
+endif # VS2010_EXISTS
 
 # Location on system where jdk installs might be
 ifneq ($(_program_files),)
@@ -509,7 +567,7 @@
 ifeq ($(ARCH_DATA_MODEL), 32)
   _NEEDS_MSVCRNN = true
 else
-  ifneq ($(VS2010),)
+  ifeq ($(VS2010_EXISTS),true)
     _NEEDS_MSVCRNN = true
   else 
     ifneq ($(VS2008),)
--- a/jdk/make/common/shared/Defs.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Defs.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
@@ -373,6 +373,9 @@
 # Get platform specific settings
 # NB: OUTPUTDIR must be defined. Otherwise hotspot import detection will not work correctly
 # On other hand this must be included early as it provides platform specific defines such as FullPath
+include $(JDK_MAKE_SHARED_DIR)/Defs-versions.gmk
+
+# Get platform specific settings (defines COMPILER_PATH)
 include $(JDK_MAKE_SHARED_DIR)/Defs-$(PLATFORM).gmk
 
 # Components
@@ -608,24 +611,9 @@
   COPYRIGHT_YEAR = $(shell $(DATE) '+%Y')
 endif
 
-# Windows uses Microsoft compilers by default
-ifeq ($(PLATFORM), windows)
-  override CC_VERSION = msvc
-endif
-
-# Solaris uses Sun Studio compilers by default
-ifeq ($(PLATFORM), solaris)
-  override CC_VERSION = sun
-endif
-
-# Linux uses GNU compilers by default
-ifeq ($(PLATFORM), linux)
-  override CC_VERSION = gcc
-endif
-
-# Get the REQUIRED versions (needs CC_VERSION set)
-include $(JDK_MAKE_SHARED_DIR)/Defs-versions.gmk
-
-# Get the compiler specific settings
+# Get the compiler specific settings (will run the compiler to find out)
+#   NOTE: COMPILER_PATH must be set by this time.
+#   Up until we include this file, we don't know what specific compiler
+#   version is actually being used (i.e. what is in PATH or COMPILER_PATH).
 include $(JDK_MAKE_SHARED_DIR)/Compiler-$(CC_VERSION).gmk
 
--- a/jdk/make/common/shared/Sanity-Settings.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Sanity-Settings.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
@@ -100,7 +100,8 @@
   ifneq ($(MSVCRNN_DLL),)
     ALL_SETTINGS+=$(call addAltSetting,MSVCRNN_DLL_PATH)
   endif
-  ALL_SETTINGS+=$(call addAltSetting,MSDEVTOOLS_PATH)
+  ALL_SETTINGS+=$(call addRequiredSetting,INCLUDE)
+  ALL_SETTINGS+=$(call addRequiredSetting,LIB)
 endif
 ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_NAME)
 ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_VERSION)
@@ -137,6 +138,7 @@
 ALL_SETTINGS+=$(call addOptionalSetting,FASTDEBUG)
 ALL_SETTINGS+=$(call addRequiredSetting,COMPILER_WARNINGS_FATAL)
 ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_WARNING_LEVEL)
+ALL_SETTINGS+=$(call addOptionalSetting,SHOW_ALL_WARNINGS)
 ALL_SETTINGS+=$(call addRequiredSetting,INCREMENTAL_BUILD)
 ALL_SETTINGS+=$(call addOptionalSetting,CC_HIGHEST_OPT)
 ALL_SETTINGS+=$(call addOptionalSetting,CC_HIGHER_OPT)
@@ -223,6 +225,7 @@
   ALL_SETTINGS+=$(call addAltSetting,DXSDK_PATH)
   ALL_SETTINGS+=$(call addAltSetting,DXSDK_INCLUDE_PATH)
   ALL_SETTINGS+=$(call addAltSetting,DXSDK_LIB_PATH)
+  ALL_SETTINGS+=$(call addAltSetting,WINDOWSSDKDIR)
   ifndef OPENJDK
     ALL_SETTINGS+=$(call addAltSetting,DEPLOY_MSSDK)
     ALL_SETTINGS+=$(call addAltSetting,INSTALL_MSSDK)
@@ -244,16 +247,7 @@
   ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings)
   ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH)
   ALL_SETTINGS+=$(call addAltSetting,FREETYPE_LIB_PATH)
-  ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings)
-  ALL_SETTINGS+=$(call addOptionalSetting,IMPORT_BINARY_PLUGS)
-  ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE)
-  ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_PATH)
-  ALL_SETTINGS+=$(call addAltSetting,BUILD_BINARY_PLUGS_PATH)
-else 
-  ALL_SETTINGS+=$(call addHeading,OPENJDK Export Binary Plug Settings)
-  ALL_SETTINGS+=$(call addOptionalSetting,PLUG_EXPORT_DIRNAME)
 endif
-ALL_SETTINGS+=$(call addOptionalSetting,PLUG_LIBRARY_NAMES)
 
 ifdef OPENJDK
   ALL_SETTINGS+=$(call addHeading,Previous JDK Settings)
--- a/jdk/make/common/shared/Sanity.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/common/shared/Sanity.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -187,7 +187,6 @@
 	sane-classpath \
 	sane-java_home \
 	sane-fonts \
-	sane-binary-plugs \
 	sane-variant \
 	sane-ld_library_path \
 	sane-ld_library_path_64 \
@@ -503,23 +502,6 @@
 endif
 
 ######################################################
-# If building OPENJDK check pre-built binaries are
-# available for binary plug source components.
-######################################################
-ifdef OPENJDK
-sane-binary-plugs:
-  ifeq ($(IMPORT_BINARY_PLUGS),true)
-	@if [ ! -d "$(BINARY_PLUGS_PATH)" ]; then \
-	  $(ECHO) "WARNING: Can't locate pre-built libraries. \n" \
-	    "      Please check your access to \n" \
-	    "          $(BINARY_PLUGS_PATH) \n" \
-	    "      and/or check your value of ALT_BINARY_PLUGS_PATH. \n" \
-	   "" >> $(WARNING_FILE); \
-	fi
-  endif
-endif
-
-######################################################
 # VARIANT must be set to DBG or OPT
 ######################################################
 sane-variant:
@@ -1024,10 +1006,11 @@
 endif
 
 ######################################################
-# Check for existence of MSDEVTOOLS_PATH on windows
+# Check for existence of the extra tools on windows
 ######################################################
 sane-msdevtools_path:
 ifeq ($(PLATFORM), windows)
+  ifneq ($(COMPILER_VERSION), VS2010)
 	@if [ "$(MSDEVTOOLS_PATH)" != "" -a ! -r "$(MSDEVTOOLS_PATH)" ]; then \
 	  $(ECHO) "ERROR: You do not have a valid MSDEVTOOLS_PATH setting. \n" \
 	    "      Please check your access to \n" \
@@ -1035,6 +1018,7 @@
 	    "      and/or check your value of ALT_MSDEVTOOLS_PATH. \n" \
 	    "" >> $(ERROR_FILE) ; \
 	fi
+  endif
 endif
 
 ######################################################
@@ -1443,10 +1427,24 @@
 endif
 
 ######################################################
-# Check for existence of INSTALL_MSSDK on windows
+# Check for existence of the MSSDK on windows
 ######################################################
 sane-install-mssdk_path:
 ifeq ($(PLATFORM), windows)
+  ifeq ($(COMPILER_VERSION), VS2010)
+	@if [ -z "$(WINDOWSSDKDIR)" ]; then \
+	  $(ECHO) "WARNING: Your WINDOWSSDKDIR setting is empty.\n" \
+	    "        It is recommended to set ALT_WINDOWSSDKDIR.\n" \
+	    "" >> $(WARNING_FILE) ; \
+	fi
+	@if [ ! -r "$(WINDOWSSDKDIR)" ]; then \
+	  $(ECHO) "ERROR: You do not have a valid WINDOWSSDKDIR setting. \n" \
+	    "      Please check your access to \n" \
+	    "          $(WINDOWSSDKDIR) \n" \
+	    "      and/or check your value of ALT_WINDOWSSDKDIR. \n" \
+	    "" >> $(ERROR_FILE) ; \
+	fi
+  endif
 	@if [ -z "$(INSTALL_MSSDK)" ]; then \
 	  $(ECHO) "WARNING: Your INSTALL_MSSDK setting is empty.\n" \
 	    "        It is recommended to set ALT_INSTALL_MSSDK.\n" \
--- a/jdk/make/docs/CORE_PKGS.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/docs/CORE_PKGS.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, 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
--- a/jdk/make/docs/NON_CORE_PKGS.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/docs/NON_CORE_PKGS.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/jdk/make/java/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/jdk/make/java/awt/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/awt/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/jdk/make/java/dyn/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/dyn/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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
--- a/jdk/make/java/fdlibm/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/fdlibm/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/java/hpi/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/hpi/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/java/hpi/hpi_common.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/hpi/hpi_common.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/java/hpi/native/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/hpi/native/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/java/hpi/windows/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/hpi/windows/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/make/java/instrument/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/instrument/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/java/java/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/java/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/java/java/genlocales.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/java/genlocales.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/java/java_crw_demo/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/java_crw_demo/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/make/java/java_hprof_demo/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/java_hprof_demo/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/java/jli/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/jli/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/java/logging/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/logging/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/java/main/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/main/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/java/main/java/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/main/java/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/java/main/javaw/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/main/javaw/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/java/management/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/management/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/java/net/FILES_c.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/net/FILES_c.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/java/net/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/net/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/jdk/make/java/net/mapfile-vers	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/net/mapfile-vers	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/java/nio/FILES_java.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/nio/FILES_java.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/java/nio/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/nio/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/java/nio/mapfile-linux	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/nio/mapfile-linux	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, 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
--- a/jdk/make/java/nio/mapfile-solaris	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/nio/mapfile-solaris	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, 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
--- a/jdk/make/java/npt/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/npt/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/make/java/redist/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/redist/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
@@ -272,17 +272,9 @@
 	$(install-file)
 
 #
-# Specific to OpenJDK building
+# Specific to non-OpenJDK building
 #
-ifdef OPENJDK
-
-  ifeq ($(IMPORT_BINARY_PLUGS),true)
-    include $(BUILDDIR)/common/internal/BinaryPlugs.gmk
-
-    build: import-binary-plugs
-  endif
-
-else # !OPENJDK
+ifndef OPENJDK
 
 INTERNAL_IMPORT_LIST += \
             $(LIBDIR)/security/US_export_policy.jar \
--- a/jdk/make/java/redist/fonts/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/redist/fonts/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/make/java/redist/sajdi/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/redist/sajdi/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/java/sql/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/sql/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/java/sun_nio/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/sun_nio/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/java/text/base/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/text/base/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/java/util/FILES_java.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/util/FILES_java.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/java/verify/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/verify/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/make/java/zip/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/java/zip/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/javax/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/javax/crypto/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/crypto/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/make/javax/imageio/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/imageio/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/javax/print/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/print/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/javax/rmi/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/rmi/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/javax/sound/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/sound/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
@@ -23,8 +23,6 @@
 # questions.
 #
 
-# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk
-
 BUILDDIR = ../..
 MODULE  = sound
 PACKAGE = javax.sound
--- a/jdk/make/javax/sound/jsoundalsa/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/sound/jsoundalsa/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/jdk/make/javax/sound/jsoundds/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/sound/jsoundds/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/javax/sql/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/sql/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/javax/swing/FILES.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/swing/FILES.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/javax/swing/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/swing/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/javax/swing/beaninfo/SwingBeans.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/swing/beaninfo/SwingBeans.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/javax/swing/plaf/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/javax/swing/plaf/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/jdk_generic_profile.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/jdk_generic_profile.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
@@ -78,11 +78,8 @@
 # Attempts to set these variables for the JDK builds:           
 #    ALT_COMPILER_PATH
 #    ALT_BOOTDIR
-#    ALT_BINARY_PLUGS_PATH
-#    ALT_CLOSED_JDK_IMPORT_PATH
 #    Windows Only:
 #      ALT_UNIXCOMMAND_PATH
-#      ALT_MSDEVTOOLS_PATH
 #      ALT_DXSDK_PATH
 #      ALT_MSVCRT_DLL_PATH
 #      ALT_MSVCR71_DLL_PATH
@@ -221,8 +218,6 @@
     # VisualStudio .NET 2003 VC++ 7.1 (VS71COMNTOOLS should be defined)
     vs_root=$(${cygpath} "${VS71COMNTOOLS}/../..")
     # Fill in PATH, LIB, and INCLUDE (unset all others to make sure)
-    msdev_root="${vs_root}/Common7/Tools"
-    msdevtools_path="${msdev_root}/bin"
     vc7_root="${vs_root}/Vc7"
     compiler_path="${vc7_root}/bin"
     platform_sdk="${vc7_root}/PlatformSDK"
@@ -260,12 +255,6 @@
     else
       compiler_path="${platform_sdk}/Bin/win64/x86/AMD64"
     fi
-    if [ "${ALT_MSDEVTOOLS_PATH}" != "" ] ; then
-      msdevtools_path=${ALT_MSDEVTOOLS_PATH}
-    else
-      msdevtools_path="${platform_sdk}/Bin/win64/x86/AMD64"
-    fi
-    msdevtools_path="${compiler_path}"
     # LIB and INCLUDE must use ; as a separator
     include4sdk="${platform_sdk}/Include"
     include4sdk="${include4sdk};${platform_sdk}/Include/crt/sys"
@@ -313,28 +302,6 @@
   export ALT_JDK_IMPORT_PATH
 fi
 
-# Get the latest JDK binary plugs or build to import pre-built binaries
-if [ "${ALT_BINARY_PLUGS_PATH}" = "" ] ; then
-  binplugs=${jdk_instances}/openjdk-binary-plugs
-  jdkplugs=${jdk_instances}/${importjdk}
-  if [ -d ${binplugs} ] ; then
-    ALT_BINARY_PLUGS_PATH=${binplugs}
-    export ALT_BINARY_PLUGS_PATH
-  elif [  "${ALT_CLOSED_JDK_IMPORT_PATH}" = "" -a -d ${jdkplugs} ] ; then
-    ALT_CLOSED_JDK_IMPORT_PATH=${jdkplugs}
-    export ALT_CLOSED_JDK_IMPORT_PATH
-  fi
-  if [ "${ALT_BINARY_PLUGS_PATH}" = "" ] ; then
-    echo "WARNING: Missing ALT_BINARY_PLUGS_PATH: ${binplugs}"
-  fi
-fi
-if [ "${ALT_BINARY_PLUGS_PATH}" != "" -a ! -d "${ALT_BINARY_PLUGS_PATH}" ] ; then
-  echo "WARNING: Cannot access ALT_BINARY_PLUGS_PATH=${ALT_BINARY_PLUGS_PATH}"
-fi
-if [ "${ALT_CLOSED_JDK_IMPORT_PATH}" != "" -a ! -d "${ALT_CLOSED_JDK_IMPORT_PATH}" ] ; then
-  echo "WARNING: Cannot access ALT_CLOSED_JDK_IMPORT_PATH=${ALT_CLOSED_JDK_IMPORT_PATH}"
-fi
-
 # Export PATH setting
 PATH="${path4sdk}"
 export PATH
--- a/jdk/make/jpda/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/jpda/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/jpda/back/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/jpda/back/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/jpda/transport/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/jpda/transport/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/jpda/transport/shmem/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/jpda/transport/shmem/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/make/jpda/transport/socket/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/jpda/transport/socket/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/jpda/tty/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/jpda/tty/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/jprt.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/jprt.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/jprt.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/jprt.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/launchers/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/launchers/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/make/mkdemo/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mkdemo/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/mkdemo/applets/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mkdemo/applets/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/mkdemo/jfc/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mkdemo/jfc/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/mkdemo/jni/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mkdemo/jni/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/make/mkdemo/jvmti/hprof/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mkdemo/jvmti/hprof/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/make/mkdemo/management/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mkdemo/management/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/make/mkdemo/nio/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mkdemo/nio/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/mkdemo/nio/zipfs/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mkdemo/nio/zipfs/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/mkdemo/scripting/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mkdemo/scripting/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/mksample/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/make/mksample/dtrace/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/dtrace/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/mksample/jmx/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/jmx/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/mksample/jmx/jmx-scandir/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/jmx/jmx-scandir/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/mksample/nbproject/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/nbproject/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/mksample/nio/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/nio/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/make/mksample/nio/file/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/nio/file/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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
--- a/jdk/make/mksample/nio/multicast/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/nio/multicast/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/make/mksample/nio/server/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/nio/server/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/make/mksample/scripting/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/scripting/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/mksample/scripting/scriptpad/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/scripting/scriptpad/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/mksample/webservices/EbayClient/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/webservices/EbayClient/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/mksample/webservices/EbayServer/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/webservices/EbayServer/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/mksample/webservices/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/mksample/webservices/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/modules/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/modules/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/make/modules/modules.config	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/modules/modules.config	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/make/modules/optional.depconfig	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/modules/optional.depconfig	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/make/modules/tools/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/modules/tools/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/make/modules/tools/nbproject/project.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/modules/tools/nbproject/project.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/make/modules/tools/src/com/sun/classanalyzer/Module.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/modules/tools/src/com/sun/classanalyzer/Module.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/make/netbeans/README	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/netbeans/README	Tue Jan 04 17:10:35 2011 -0800
@@ -93,7 +93,6 @@
 
         make.options=\
             ALT_BOOTDIR=/home/me/bin/jdk1.6.0 \
-            ALT_BINARY_PLUGS_PATH=/home/me/bin/openjdk-binary-plugs \
             ALT_JDK_IMPORT_PATH=/home/me/bin/jdk1.7.0 \
             OPENJDK=true
 
--- a/jdk/make/netbeans/world/build.xml	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/netbeans/world/build.xml	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2010, 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
--- a/jdk/make/org/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/org/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/org/ietf/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/org/ietf/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/sun/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/jdk/make/sun/applet/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/applet/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/jdk/make/sun/awt/FILES_c_unix.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/awt/FILES_c_unix.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/sun/awt/FILES_c_windows.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/awt/FILES_c_windows.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/sun/awt/FILES_export_unix.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/awt/FILES_export_unix.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/sun/awt/FILES_export_windows.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/awt/FILES_export_windows.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/sun/awt/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/awt/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/jdk/make/sun/awt/mapfile-mawt-vers	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/awt/mapfile-mawt-vers	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, 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
--- a/jdk/make/sun/awt/mapfile-vers	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/awt/mapfile-vers	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/sun/awt/mapfile-vers-linux	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/awt/mapfile-vers-linux	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/jdk/make/sun/cmm/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/cmm/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/jdk/make/sun/cmm/kcms/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/cmm/kcms/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/sun/cmm/lcms/FILES_c_unix.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/cmm/lcms/FILES_c_unix.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/make/sun/cmm/lcms/FILES_c_windows.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/cmm/lcms/FILES_c_windows.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/make/sun/cmm/lcms/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/cmm/lcms/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/make/sun/dcpr/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/dcpr/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
@@ -23,8 +23,6 @@
 # questions.
 #
 
-# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk
-
 BUILDDIR = ../..
 MODULE  = java2d
 PACKAGE = sun.dc
--- a/jdk/make/sun/font/FILES_c.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/font/FILES_c.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/sun/font/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/font/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/sun/font/t2k/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/font/t2k/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
@@ -23,8 +23,6 @@
 # questions.
 #
 
-# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk
-
 #
 # Makefile for building t2k rasteriser.
 #
--- a/jdk/make/sun/headless/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/headless/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/sun/headless/mapfile-vers	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/headless/mapfile-vers	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, 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
--- a/jdk/make/sun/image/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/image/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/sun/image/generic/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/image/generic/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/sun/image/vis/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/image/vis/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/sun/jar/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/jar/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/sun/javazic/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/javazic/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/sun/jawt/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/jawt/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/make/sun/jconsole/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/jconsole/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/make/sun/jdbc/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/jdbc/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/sun/jdga/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/jdga/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/sun/jkernel/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/jkernel/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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
--- a/jdk/make/sun/jpeg/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/jpeg/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/jdk/make/sun/launcher/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/launcher/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/make/sun/management/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/management/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
@@ -37,12 +37,8 @@
 
 all build:: properties aclfile jmxremotefiles
 
-# When building the openjdk, build snmp only if importing binary plugs,
-ifdef OPENJDK
-  ifeq ($(IMPORT_BINARY_PLUGS),true)
-    SUBDIRS = snmp
-  endif
-else
+# When building the openjdk, no snmp
+ifndef OPENJDK
   SUBDIRS = snmp
 endif
 SUBDIRS += jmxremote
--- a/jdk/make/sun/native2ascii/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/native2ascii/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/sun/net/FILES_java.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/net/FILES_java.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/sun/net/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/net/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/jdk/make/sun/net/others/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/net/others/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/sun/net/spi/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/net/spi/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/sun/net/spi/nameservice/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/net/spi/nameservice/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/sun/net/spi/nameservice/dns/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/net/spi/nameservice/dns/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/make/sun/nio/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/nio/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/make/sun/nio/cs/FILES_java.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/nio/cs/FILES_java.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/sun/nio/cs/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/nio/cs/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/sun/org/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/org/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/sun/org/mozilla/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/org/mozilla/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/sun/org/mozilla/javascript/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/org/mozilla/javascript/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/sun/pisces/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/pisces/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/make/sun/rmi/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/rmi/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/sun/rmi/cgi/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/rmi/cgi/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/sun/rmi/oldtools/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/rmi/oldtools/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/sun/rmi/registry/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/rmi/registry/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/sun/rmi/rmi/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/rmi/rmi/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/sun/rmi/rmic/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/rmi/rmic/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/sun/rmi/rmid/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/rmi/rmid/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/jdk/make/sun/security/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/security/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/sun/security/ec/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/security/ec/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/make/sun/security/jgss/wrapper/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/security/jgss/wrapper/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/sun/security/krb5/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/security/krb5/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/make/sun/security/mscapi/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/security/mscapi/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/sun/security/pkcs11/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/security/pkcs11/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/make/sun/security/smartcardio/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/security/smartcardio/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/sun/serialver/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/serialver/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/make/sun/splashscreen/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/splashscreen/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/sun/text/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/text/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, 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
--- a/jdk/make/sun/tools/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/tools/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/make/sun/tracing/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/tracing/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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
--- a/jdk/make/sun/tracing/dtrace/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/tracing/dtrace/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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
--- a/jdk/make/sun/xawt/FILES_c_unix.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/xawt/FILES_c_unix.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/jdk/make/sun/xawt/FILES_export_unix.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/xawt/FILES_export_unix.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/jdk/make/sun/xawt/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/xawt/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/jdk/make/sun/xawt/mapfile-vers	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/sun/xawt/mapfile-vers	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/jdk/make/tools/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/tools/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/make/tools/freetypecheck/freetypecheck.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/tools/freetypecheck/freetypecheck.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/make/tools/src/build/tools/charsetmapping/JIS0213.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/tools/src/build/tools/charsetmapping/JIS0213.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/make/tools/src/build/tools/charsetmapping/Main.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/tools/src/build/tools/charsetmapping/Main.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/make/tools/src/build/tools/charsetmapping/SBCS.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/tools/src/build/tools/charsetmapping/SBCS.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/make/tools/src/build/tools/charsetmapping/Utils.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/tools/src/build/tools/charsetmapping/Utils.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/make/tools/src/build/tools/jarreorder/JarReorder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/tools/src/build/tools/jarreorder/JarReorder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/make/tools/src/build/tools/javazic/RuleDay.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/make/tools/src/build/tools/javazic/RuleDay.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/bin/main.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/bin/main.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/bin/parse_manifest.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/bin/parse_manifest.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/bin/wildcard.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/bin/wildcard.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Histogram.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Histogram.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/src/share/classes/com/sun/net/httpserver/Filter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/net/httpserver/Filter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/com/sun/net/httpserver/Headers.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/net/httpserver/Headers.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/com/sun/net/httpserver/HttpsConfigurator.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/net/httpserver/HttpsConfigurator.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/com/sun/net/httpserver/HttpsParameters.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/net/httpserver/HttpsParameters.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/src/share/classes/com/sun/security/sasl/CramMD5Client.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/security/sasl/CramMD5Client.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/com/sun/security/sasl/CramMD5Server.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/security/sasl/CramMD5Server.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/com/sun/security/sasl/ExternalClient.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/security/sasl/ExternalClient.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/com/sun/servicetag/Registry.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/servicetag/Registry.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/com/sun/servicetag/SunConnection.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/servicetag/SunConnection.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/com/sun/servicetag/resources/register.html	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/register.html	Tue Jan 04 17:10:35 2011 -0800
@@ -6,7 +6,7 @@
 <title>Register your JDK</title>
 
 <!--
-Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/com/sun/servicetag/resources/register_ja.html	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/register_ja.html	Tue Jan 04 17:10:35 2011 -0800
@@ -6,7 +6,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>JDK 製品登録</title>
 
 <!--
-Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html	Tue Jan 04 17:10:35 2011 -0800
@@ -6,7 +6,7 @@
 <title>注册您的 JDK</title>
 
 <!--
-Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/java/awt/AWTEvent.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/AWTEvent.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/awt/AlphaComposite.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/AlphaComposite.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/awt/Canvas.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/Canvas.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/Color.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/Color.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/Component.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/Component.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/Container.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/Container.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/Dialog.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/Dialog.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/EventDispatchThread.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/EventDispatchThread.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/awt/EventQueue.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/EventQueue.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/awt/FileDialog.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/FileDialog.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/Font.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/Font.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/Frame.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/Frame.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/GraphicsEnvironment.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/GraphicsEnvironment.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/awt/GridBagConstraints.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/GridBagConstraints.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/KeyboardFocusManager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/KeyboardFocusManager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/awt/ScrollPane.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/ScrollPane.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/awt/Scrollbar.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/Scrollbar.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/SequencedEvent.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/SequencedEvent.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/awt/SplashScreen.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/SplashScreen.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/java/awt/Toolkit.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/Toolkit.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/Window.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/Window.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/event/ActionEvent.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/event/ActionEvent.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/awt/event/InputEvent.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/event/InputEvent.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/awt/image/IndexColorModel.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/image/IndexColorModel.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/awt/image/SampleModel.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/awt/image/SampleModel.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/beans/MetaData.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/beans/MetaData.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/beans/XMLDecoder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/beans/XMLDecoder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/dyn/Linkage.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/dyn/Linkage.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/java/dyn/MethodType.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/dyn/MethodType.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/java/dyn/package-info.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/dyn/package-info.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/java/io/Bits.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/io/Bits.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/java/io/BufferedInputStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/io/BufferedInputStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/io/ByteArrayInputStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/io/ByteArrayInputStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/io/ByteArrayOutputStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/io/ByteArrayOutputStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/io/Closeable.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/io/Closeable.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/java/io/FileOutputStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/io/FileOutputStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/io/FilterInputStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/io/FilterInputStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/io/ObjectInput.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/io/ObjectInput.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/io/ObjectOutput.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/io/ObjectOutput.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/io/PushbackInputStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/io/PushbackInputStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/io/package.html	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/io/package.html	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/java/lang/AbstractStringBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/AbstractStringBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/java/lang/AssertionError.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/AssertionError.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/lang/Deprecated.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/Deprecated.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/java/lang/Error.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/Error.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/lang/Exception.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/Exception.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/lang/Integer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/Integer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/lang/Iterable.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/Iterable.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/java/lang/Math.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/Math.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/lang/Object.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/Object.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/lang/ProcessBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/ProcessBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/java/lang/Readable.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/Readable.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/java/lang/RuntimeException.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/RuntimeException.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/lang/String.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/String.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/lang/SuppressWarnings.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/SuppressWarnings.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/java/lang/System.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/System.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/lang/Thread.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/Thread.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/lang/ThreadGroup.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/ThreadGroup.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/lang/reflect/Constructor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/lang/reflect/Constructor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/net/DatagramSocket.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/net/DatagramSocket.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/net/HttpCookie.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/net/HttpCookie.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/java/net/HttpURLConnection.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/net/HttpURLConnection.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/net/Inet6Address.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/net/Inet6Address.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/net/InetAddress.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/net/InetAddress.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/net/NetPermission.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/net/NetPermission.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/net/NetworkInterface.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/net/NetworkInterface.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/net/ServerSocket.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/net/ServerSocket.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/net/SocketInputStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/net/SocketInputStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/net/SocksSocketImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/net/SocksSocketImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/net/URI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/net/URI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/nio/Bits.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/Bits.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/nio/Direct-X-Buffer.java.template	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/Direct-X-Buffer.java.template	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/nio/MappedByteBuffer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/MappedByteBuffer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/nio/StringCharBuffer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/StringCharBuffer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/java/nio/channels/FileLock.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/channels/FileLock.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/java/nio/channels/package-info.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/channels/package-info.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/nio/channels/spi/AbstractSelector.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/channels/spi/AbstractSelector.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/java/nio/charset/Charset.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/charset/Charset.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/nio/charset/package.html	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/charset/package.html	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/java/nio/file/DirectoryStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/file/DirectoryStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/java/nio/file/FileTreeWalker.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/file/FileTreeWalker.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/java/nio/file/FileVisitOption.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/file/FileVisitOption.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/java/nio/file/FileVisitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/file/FileVisitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/java/nio/file/Files.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/file/Files.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/java/nio/file/Path.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/file/Path.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/java/nio/file/SecureDirectoryStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/file/SecureDirectoryStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/java/nio/file/SimpleFileVisitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/nio/file/SimpleFileVisitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/java/security/IdentityScope.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/security/IdentityScope.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/security/Security.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/security/Security.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/security/cert/PKIXParameters.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/security/cert/PKIXParameters.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/text/CollationElementIterator.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/text/CollationElementIterator.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/text/DateFormat.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/text/DateFormat.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/text/MessageFormat.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/text/MessageFormat.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/text/NumberFormat.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/text/NumberFormat.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/text/RuleBasedBreakIterator.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/text/RuleBasedBreakIterator.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/java/util/AbstractCollection.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/AbstractCollection.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/AbstractList.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/AbstractList.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/AbstractMap.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/AbstractMap.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/ArrayList.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/ArrayList.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/Arrays.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Arrays.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/Collection.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Collection.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/Collections.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Collections.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/ConcurrentModificationException.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/ConcurrentModificationException.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/Currency.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Currency.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/util/Date.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Date.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/util/FormattableFlags.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/FormattableFlags.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/java/util/Formatter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Formatter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/java/util/Hashtable.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Hashtable.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/util/Iterator.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Iterator.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/LinkedList.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/LinkedList.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/List.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/List.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/ListResourceBundle.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/ListResourceBundle.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/util/PriorityQueue.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/PriorityQueue.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/java/util/Properties.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Properties.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/util/Random.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Random.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/java/util/Scanner.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Scanner.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/java/util/Stack.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Stack.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/util/TreeMap.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/TreeMap.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/TreeSet.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/TreeSet.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/java/util/Vector.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/Vector.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/java/util/XMLUtils.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/XMLUtils.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/java/util/jar/JarInputStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/jar/JarInputStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/java/util/logging/LogRecord.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/logging/LogRecord.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/java/util/regex/Pattern.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/regex/Pattern.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/java/util/spi/CurrencyNameProvider.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/spi/CurrencyNameProvider.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/java/util/spi/LocaleServiceProvider.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/spi/LocaleServiceProvider.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/java/util/zip/Deflater.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/zip/Deflater.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/java/util/zip/ZipFile.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/java/util/zip/ZipFile.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/javax/imageio/stream/ImageInputStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/imageio/stream/ImageInputStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/management/remote/JMXServiceURL.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/management/remote/JMXServiceURL.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/naming/event/EventDirContext.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/naming/event/EventDirContext.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/naming/ldap/Control.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/naming/ldap/Control.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/naming/ldap/ControlFactory.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/naming/ldap/ControlFactory.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/naming/ldap/ExtendedRequest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/naming/ldap/ExtendedRequest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/naming/ldap/ExtendedResponse.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/naming/ldap/ExtendedResponse.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/naming/ldap/LdapName.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/naming/ldap/LdapName.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/javax/naming/ldap/Rdn.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/naming/ldap/Rdn.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotification.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotification.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/net/SocketFactory.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/net/SocketFactory.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/net/ssl/SSLContext.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/net/ssl/SSLContext.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/print/DocFlavor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/print/DocFlavor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/javax/sound/midi/MidiDevice.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/sound/midi/MidiDevice.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/sound/midi/MidiSystem.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/sound/midi/MidiSystem.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/sound/midi/Receiver.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/sound/midi/Receiver.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/sound/midi/Transmitter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/sound/midi/Transmitter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/sound/sampled/Line.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/sound/sampled/Line.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/swing/AbstractButton.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/AbstractButton.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/DebugGraphics.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/DebugGraphics.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/DefaultDesktopManager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/DefaultDesktopManager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/GroupLayout.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/GroupLayout.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/src/share/classes/javax/swing/JColorChooser.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/JColorChooser.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/javax/swing/JComponent.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/JComponent.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/JDesktopPane.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/JDesktopPane.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/JEditorPane.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/JEditorPane.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/JLayer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/JLayer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/share/classes/javax/swing/JList.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/JList.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/JSplitPane.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/JSplitPane.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/JTabbedPane.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/JTabbedPane.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/JTextField.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/JTextField.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/JTree.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/JTree.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/JViewport.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/JViewport.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/Popup.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/Popup.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/swing/RepaintManager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/RepaintManager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/SwingUtilities.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/SwingUtilities.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/ToolTipManager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/ToolTipManager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/UIDefaults.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/UIDefaults.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/LayerUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/LayerUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicViewportUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicViewportUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthListUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthListUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthParser.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthParser.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthViewportUI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthViewportUI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/DefaultCaret.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/DefaultCaret.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/DefaultHighlighter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/DefaultHighlighter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/GlyphView.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/GlyphView.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/InternationalFormatter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/InternationalFormatter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/JTextComponent.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/JTextComponent.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/MaskFormatter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/MaskFormatter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/NumberFormatter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/NumberFormatter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/PlainDocument.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/PlainDocument.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/TabSet.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/TabSet.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/Utilities.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/Utilities.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/html/FormView.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/html/FormView.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/html/MinimalHTMLWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/html/MinimalHTMLWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/javax/swing/text/rtf/AbstractFilter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/javax/swing/text/rtf/AbstractFilter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/sun/awt/AWTAccessor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/awt/AWTAccessor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/awt/EmbeddedFrame.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/awt/EmbeddedFrame.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/awt/HKSCS.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/awt/HKSCS.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/awt/PlatformFont.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/awt/PlatformFont.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/awt/SunToolkit.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/awt/SunToolkit.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/sun/awt/UngrabEvent.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/awt/UngrabEvent.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/sun/awt/image/ImageRepresentation.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/awt/image/ImageRepresentation.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/AdapterMethodHandle.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/AdapterMethodHandle.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/BoundMethodHandle.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/BoundMethodHandle.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/CallSiteImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/CallSiteImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/FilterGeneric.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/FilterGeneric.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/FilterOneArgument.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/FilterOneArgument.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/FromGeneric.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/FromGeneric.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/Invokers.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/Invokers.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/MethodTypeImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/MethodTypeImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/SpreadGeneric.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/SpreadGeneric.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/ToGeneric.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/ToGeneric.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/empty/Empty.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/empty/Empty.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/package-info.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/package-info.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/util/BytecodeDescriptor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/util/BytecodeDescriptor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/util/BytecodeName.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/util/BytecodeName.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/util/ValueConversions.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/util/ValueConversions.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/util/VerifyAccess.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/util/VerifyAccess.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/util/VerifyType.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/util/VerifyType.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/dyn/util/Wrapper.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/dyn/util/Wrapper.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/font/FontManagerFactory.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/font/FontManagerFactory.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/font/FontUtilities.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/font/FontUtilities.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/font/StrikeCache.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/font/StrikeCache.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/sun/font/SunFontManager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/font/SunFontManager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/io/ByteToCharBig5.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/ByteToCharBig5.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/io/ByteToCharBig5_HKSCS.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/ByteToCharBig5_HKSCS.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/sun/io/ByteToCharBig5_Solaris.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/ByteToCharBig5_Solaris.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/sun/io/ByteToCharISO2022.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/ByteToCharISO2022.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/sun/io/ByteToCharISO2022JP.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/ByteToCharISO2022JP.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/io/ByteToCharJISAutoDetect.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/ByteToCharJISAutoDetect.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/sun/io/ByteToCharMS950_HKSCS.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/ByteToCharMS950_HKSCS.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/sun/io/ByteToCharUTF8.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/ByteToCharUTF8.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/io/CharToByteBig5.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/CharToByteBig5.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/io/CharToByteBig5_HKSCS.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/CharToByteBig5_HKSCS.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/sun/io/CharToByteBig5_Solaris.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/CharToByteBig5_Solaris.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/sun/io/CharToByteDBCS_ASCII.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/CharToByteDBCS_ASCII.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/sun/io/CharToByteMS950_HKSCS.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/CharToByteMS950_HKSCS.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/sun/io/CharToBytePCK.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/CharToBytePCK.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/sun/io/CharToByteUnicode.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/CharToByteUnicode.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/io/Converters.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/io/Converters.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/Disposer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/Disposer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/SurfaceData.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/SurfaceData.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/cmm/CMSManager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/cmm/CMSManager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/loops/DrawParallelogram.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/loops/DrawParallelogram.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/loops/FillParallelogram.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/loops/FillParallelogram.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/loops/RenderLoops.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/loops/RenderLoops.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/pisces/Curve.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/pisces/Curve.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/pisces/Dasher.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/pisces/Dasher.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/pisces/Helpers.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/pisces/Helpers.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/pisces/Renderer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/pisces/Renderer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/pisces/Stroker.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/pisces/Stroker.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/jkernel/DownloadManager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jkernel/DownloadManager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/jvmstat/monitor/AbstractMonitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jvmstat/monitor/AbstractMonitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/jvmstat/monitor/Monitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jvmstat/monitor/Monitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/jvmstat/monitor/Units.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jvmstat/monitor/Units.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/sun/jvmstat/monitor/Variability.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jvmstat/monitor/Variability.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/management/Flag.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/management/Flag.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/sun/management/resources/agent_de.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/management/resources/agent_de.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/management/resources/agent_es.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/management/resources/agent_es.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/management/resources/agent_fr.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/management/resources/agent_fr.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/management/resources/agent_it.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/management/resources/agent_it.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/management/resources/agent_ja.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/management/resources/agent_ja.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/management/resources/agent_ko.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/management/resources/agent_ko.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/management/resources/agent_pt_BR.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/management/resources/agent_pt_BR.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/management/resources/agent_sv.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/management/resources/agent_sv.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/management/resources/agent_zh_CN.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/management/resources/agent_zh_CN.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/management/resources/agent_zh_TW.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/management/resources/agent_zh_TW.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/misc/BootClassLoaderHook.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/misc/BootClassLoaderHook.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/share/classes/sun/misc/Launcher.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/misc/Launcher.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/sun/misc/VM.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/misc/VM.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/net/InetAddressCachePolicy.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/InetAddressCachePolicy.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/sun/net/NetworkClient.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/NetworkClient.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/sun/net/ftp/impl/FtpClient.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/ftp/impl/FtpClient.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/share/classes/sun/net/httpserver/ChunkedInputStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/httpserver/ChunkedInputStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/net/httpserver/Event.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/httpserver/Event.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/net/httpserver/ExchangeImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/httpserver/ExchangeImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/net/httpserver/FixedLengthInputStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/httpserver/FixedLengthInputStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/net/httpserver/HttpConnection.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/httpserver/HttpConnection.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/net/httpserver/Request.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/httpserver/Request.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/net/httpserver/SSLStreams.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/httpserver/SSLStreams.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/net/www/MessageHeader.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/www/MessageHeader.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/sun/net/www/MimeTable.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/www/MimeTable.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/sun/net/www/http/HttpClient.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/www/http/HttpClient.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/sun/net/www/protocol/file/FileURLConnection.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/www/protocol/file/FileURLConnection.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/FileDispatcher.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/FileDispatcher.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/IOUtil.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/IOUtil.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/IOVecWrapper.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/IOVecWrapper.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/Interruptible.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/Interruptible.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/nio/ch/Util.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/ch/Util.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/UTF_32Coder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/UTF_32Coder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/UTF_8.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/UTF_8.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/UnicodeEncoder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/UnicodeEncoder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/Big5_Solaris.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/Big5_Solaris.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_Open.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_Open.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/GB18030.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/GB18030.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/IBM33722.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/IBM33722.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/IBM964.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/IBM964.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/PCK.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/PCK.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/sun/nio/cs/ext/SJIS.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/cs/ext/SJIS.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/sun/nio/fs/AbstractPath.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/fs/AbstractPath.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/rmi/rmic/resources/rmic.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/rmi/rmic/resources/rmic.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/sun/security/jca/Providers.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/jca/Providers.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
--- a/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/sun/security/ssl/Krb5Helper.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/ssl/Krb5Helper.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/share/classes/sun/security/ssl/Krb5Proxy.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/ssl/Krb5Proxy.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/AuthResources_de.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_de.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/AuthResources_es.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_es.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/AuthResources_fr.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_fr.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/AuthResources_it.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_it.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/AuthResources_ja.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_ja.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/AuthResources_ko.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_ko.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/AuthResources_sv.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_sv.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/Resources_fr.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/Resources_fr.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/Resources_it.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/Resources_it.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/sun/security/x509/X509Key.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/security/x509/X509Key.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/swing/SwingUtilities2.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/swing/SwingUtilities2.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/text/resources/FormatData_be.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/text/resources/FormatData_be.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/classes/sun/text/resources/FormatData_fr.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/text/resources/FormatData_fr.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/text/resources/FormatData_fr_BE.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/text/resources/FormatData_fr_BE.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/text/resources/FormatData_fr_CA.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/text/resources/FormatData_fr_CA.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/text/resources/FormatData_fr_CH.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/text/resources/FormatData_fr_CH.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/tools/jar/Main.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jar/Main.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/tools/jstat/Arguments.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jstat/Arguments.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/tools/jstat/ExpressionResolver.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jstat/ExpressionResolver.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/tools/jstat/JStatLogger.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jstat/JStatLogger.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/tools/jstat/Jstat.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jstat/Jstat.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/tools/jstat/OptionFinder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jstat/OptionFinder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/tools/jstat/OptionLister.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jstat/OptionLister.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/tools/jstat/resources/jstat_options	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/jstat/resources/jstat_options	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/classes/sun/util/BuddhistCalendar.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/util/BuddhistCalendar.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/classes/sun/util/logging/PlatformLogger.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/util/logging/PlatformLogger.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/classes/sun/util/resources/CalendarData_hu.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/util/resources/CalendarData_hu.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_uk_UA.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_uk_UA.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_nl.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_nl.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/J2DBench.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/J2DBench.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Option.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Option.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Result.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Result.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/javavm/export/classfile_constants.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/javavm/export/classfile_constants.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/share/native/common/check_code.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/common/check_code.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/native/common/jdk_util.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/common/jdk_util.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/native/common/jni_util.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/common/jni_util.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/native/java/io/RandomAccessFile.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/io/RandomAccessFile.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/native/java/io/io_util.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/io/io_util.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/native/java/io/io_util.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/io/io_util.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/native/java/lang/Class.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/lang/Class.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/native/java/lang/ClassLoader.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/lang/ClassLoader.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/share/native/java/lang/System.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/lang/System.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/native/java/lang/java_props.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/lang/java_props.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/native/java/lang/reflect/Proxy.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/lang/reflect/Proxy.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/native/java/net/net_util.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/net/net_util.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/native/java/nio/Bits.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/nio/Bits.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/share/native/java/util/zip/Deflater.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/util/zip/Deflater.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/native/java/util/zip/Inflater.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/util/zip/Inflater.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/native/java/util/zip/ZipFile.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/util/zip/ZipFile.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/share/native/java/util/zip/zip_util.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/util/zip/zip_util.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/native/java/util/zip/zip_util.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/java/util/zip/zip_util.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/share/native/sun/awt/medialib/safe_alloc.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/awt/medialib/safe_alloc.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/native/sun/font/AccelGlyphCache.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/font/AccelGlyphCache.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/native/sun/font/fontscalerdefs.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/font/fontscalerdefs.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/native/sun/font/freetypeScaler.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/font/freetypeScaler.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/native/sun/font/sunFont.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/font/sunFont.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/share/native/sun/java2d/loops/Any3Byte.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/Any3Byte.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/native/sun/java2d/loops/Any4Byte.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/Any4Byte.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/native/sun/java2d/loops/AnyByte.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/AnyByte.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/native/sun/java2d/loops/AnyInt.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/AnyInt.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/native/sun/java2d/loops/AnyShort.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/AnyShort.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/native/sun/java2d/loops/DrawParallelogram.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/DrawParallelogram.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/native/sun/java2d/loops/FillParallelogram.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/FillParallelogram.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/native/sun/java2d/loops/LoopMacros.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/LoopMacros.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/share/native/sun/java2d/loops/ProcessPath.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/ProcessPath.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/native/sun/management/Flag.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/management/Flag.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/share/native/sun/misc/VM.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/misc/VM.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/share/native/sun/misc/VMSupport.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/misc/VMSupport.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/share/sample/nio/file/Chmod.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/sample/nio/file/Chmod.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/sample/nio/file/Copy.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/sample/nio/file/Copy.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/share/sample/nio/file/WatchDir.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/share/sample/nio/file/WatchDir.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/solaris/bin/jexec.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/bin/jexec.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/solaris/classes/java/io/UnixFileSystem.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/java/io/UnixFileSystem.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/solaris/classes/java/lang/ProcessImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/java/lang/ProcessImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/UNIXToolkit.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/UNIXToolkit.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFrame.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFrame.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11/XWindow.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWindow.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/X11InputMethod.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11InputMethod.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 # 
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 # 
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 # 
-# Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/src/solaris/classes/sun/awt/motif/MToolkit.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/motif/MToolkit.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/solaris/classes/sun/net/NetHooks.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/net/NetHooks.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/solaris/classes/sun/net/sdp/SdpProvider.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/net/sdp/SdpProvider.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/ch/PipeImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/ch/PipeImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/ch/PollSelectorImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/ch/PollSelectorImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/solaris/demo/jni/Poller/Poller.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/demo/jni/Poller/Poller.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/solaris/native/java/io/FileOutputStream_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/io/FileOutputStream_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/solaris/native/java/io/canonicalize_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/io/canonicalize_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, 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
--- a/jdk/src/solaris/native/java/io/io_util_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/io/io_util_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/solaris/native/java/io/io_util_md.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/io/io_util_md.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/native/java/lang/java_props_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/lang/java_props_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/solaris/native/java/lang/locale_str.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/lang/locale_str.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/solaris/native/java/net/Inet4AddressImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/net/Inet4AddressImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/solaris/native/java/net/NetworkInterface.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/net/NetworkInterface.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/solaris/native/java/net/net_util_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/net/net_util_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/solaris/native/java/net/net_util_md.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/net/net_util_md.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/solaris/native/java/nio/MappedByteBuffer.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/java/nio/MappedByteBuffer.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/solaris/native/sun/awt/awt.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/awt/awt.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/solaris/native/sun/awt/awt_Robot.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/awt/awt_Robot.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S16Func.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S16Func.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S16Func.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S16Func.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/native/sun/awt/swing_GTKStyle.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/awt/swing_GTKStyle.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/solaris/native/sun/java2d/loops/java2d_Mlib.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/java2d/loops/java2d_Mlib.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/solaris/native/sun/net/sdp/SdpSupport.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/net/sdp/SdpSupport.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/solaris/native/sun/nio/ch/IOUtil.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/nio/ch/IOUtil.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/solaris/native/sun/nio/ch/Net.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/nio/ch/Net.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/solaris/native/sun/xawt/XlibWrapper.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/xawt/XlibWrapper.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/solaris/native/sun/xawt/awt_Desktop.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/solaris/native/sun/xawt/awt_Desktop.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/windows/classes/java/io/Win32FileSystem.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/java/io/Win32FileSystem.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/windows/classes/java/lang/ProcessImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/java/lang/ProcessImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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
--- a/jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/classes/sun/awt/windows/fontconfig.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/awt/windows/fontconfig.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 #
 # 
-# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/windows/native/common/jni_util_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/common/jni_util_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/windows/native/java/io/FileOutputStream_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/java/io/FileOutputStream_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/windows/native/java/io/WinNTFileSystem_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/java/io/WinNTFileSystem_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/windows/native/java/io/io_util_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/java/io/io_util_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/windows/native/java/io/io_util_md.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/java/io/io_util_md.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/windows/native/java/lang/ProcessImpl_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/java/lang/ProcessImpl_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/windows/native/java/lang/java_props_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/java/lang/java_props_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/windows/native/java/net/NetworkInterface_winXP.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/java/net/NetworkInterface_winXP.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/windows/native/java/net/net_util_md.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/java/net/net_util_md.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/windows/native/java/nio/MappedByteBuffer.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/java/nio/MappedByteBuffer.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/windows/native/java/util/TimeZone_md.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/java/util/TimeZone_md.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/windows/native/sun/font/fontpath.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/font/fontpath.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/windows/native/sun/java2d/windows/WindowsFlags.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/java2d/windows/WindowsFlags.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/src/windows/native/sun/jkernel/DownloadDialog.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/jkernel/DownloadDialog.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/windows/native/sun/jkernel/DownloadHelper.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/jkernel/DownloadHelper.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/windows/native/sun/jkernel/kernel.rc	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/jkernel/kernel.rc	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/windows/native/sun/jkernel/kernel_pt_BR.rc	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/jkernel/kernel_pt_BR.rc	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/windows/native/sun/jkernel/stdafx.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/jkernel/stdafx.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/windows/native/sun/net/spi/DefaultProxySelector.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/net/spi/DefaultProxySelector.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/windows/native/sun/nio/ch/FileDispatcherImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/nio/ch/FileDispatcherImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/windows/native/sun/nio/ch/Net.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/nio/ch/Net.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/windows/native/sun/nio/ch/ServerSocketChannelImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/nio/ch/ServerSocketChannelImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/windows/native/sun/nio/ch/SocketChannelImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/nio/ch/SocketChannelImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/src/windows/native/sun/nio/ch/nio_util.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/nio/ch/nio_util.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/src/windows/native/sun/windows/WPrinterJob.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/WPrinterJob.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_Choice.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_Choice.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_Choice.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_Choice.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_Desktop.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_Desktop.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_Dialog.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_Dialog.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_DrawingSurface.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_DrawingSurface.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_FileDialog.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_FileDialog.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_FileDialog.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_FileDialog.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_Font.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_Font.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_InputMethod.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_InputMethod.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_MenuItem.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_MenuItem.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_PrintJob.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_PrintJob.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_Robot.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_Robot.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_TextArea.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_TextArea.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_TextComponent.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_TextComponent.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_TextField.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_TextField.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_TextField.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_TextField.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_Toolkit.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awt_Window.cpp	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/src/windows/native/sun/windows/awtmsg.h	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/src/windows/native/sun/windows/awtmsg.h	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
--- a/jdk/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/crypto/provider/TLS/Utils.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/crypto/provider/TLS/Utils.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/java/swing/plaf/gtk/Test6635110.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/java/swing/plaf/gtk/Test6635110.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/com/sun/jdi/PopAndInvokeTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/jdi/PopAndInvokeTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/Test1.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/Test1.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/Test11.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/Test11.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/Test12.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/Test12.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/Test13.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/Test13.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/Test6a.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/Test6a.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/Test7a.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/Test7a.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/Test8a.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/Test8a.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/Test9.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/Test9.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/Test9a.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/Test9a.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/bugs/6725892/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/bugs/6725892/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/bugs/B6361557.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/bugs/B6361557.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/bugs/B6373555.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/bugs/B6373555.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/com/sun/net/httpserver/bugs/B6401598.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/net/httpserver/bugs/B6401598.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/com/sun/nio/sctp/SctpChannel/Connect.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/nio/sctp/SctpChannel/Connect.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/com/sun/nio/sctp/SctpChannel/Send.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/nio/sctp/SctpChannel/Send.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/com/sun/nio/sctp/SctpMultiChannel/Send.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/nio/sctp/SctpMultiChannel/Send.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/com/sun/servicetag/FindServiceTags.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/servicetag/FindServiceTags.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/com/sun/servicetag/JavaServiceTagTest1.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/servicetag/JavaServiceTagTest1.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/com/sun/servicetag/SystemRegistryTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/servicetag/SystemRegistryTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/com/sun/servicetag/Util.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/servicetag/Util.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/com/sun/tools/attach/ProviderTests.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/tools/attach/ProviderTests.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/test/com/sun/tracing/BasicFunctionality.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/com/sun/tracing/BasicFunctionality.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/awt/regtesthelpers/process/ProcessCommunicator.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/awt/regtesthelpers/process/ProcessCommunicator.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/beans/Beans/Test4080522.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/beans/Beans/Test4080522.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/beans/EventHandler/Test6277246.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/beans/EventHandler/Test6277246.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/beans/EventHandler/Test6277266.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/beans/EventHandler/Test6277266.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/beans/Introspector/Test6277246.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/beans/Introspector/Test6277246.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/beans/XMLEncoder/java_awt_GridBagConstraints.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/beans/XMLEncoder/java_awt_GridBagConstraints.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/io/BufferedReader/BigMark.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/BufferedReader/BigMark.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/test/java/io/BufferedReader/ReadLineSync.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/BufferedReader/ReadLineSync.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/io/DataInputStream/OpsAfterClose.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/DataInputStream/OpsAfterClose.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/io/DataInputStream/ReadFully.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/DataInputStream/ReadFully.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/io/File/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/File/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/io/File/DeleteOnExit.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/File/DeleteOnExit.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/io/File/DeleteOnExitNPE.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/File/DeleteOnExitNPE.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/io/File/IsHidden.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/File/IsHidden.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/io/File/SetAccess.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/File/SetAccess.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/io/File/SetReadOnly.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/File/SetReadOnly.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/io/FileInputStream/LeadingSlash.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/FileInputStream/LeadingSlash.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/io/InputStream/OpsAfterClose.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/InputStream/OpsAfterClose.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/io/InputStream/ReadParams.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/InputStream/ReadParams.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/io/InputStreamReader/GrowAfterEOF.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/InputStreamReader/GrowAfterEOF.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/io/ObjectInputStream/ResolveProxyClass.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/ObjectInputStream/ResolveProxyClass.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/io/RandomAccessFile/EOF.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/RandomAccessFile/EOF.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/test/java/io/RandomAccessFile/ParameterCheck.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/RandomAccessFile/ParameterCheck.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/test/java/io/RandomAccessFile/ReadLine.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/RandomAccessFile/ReadLine.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/test/java/io/RandomAccessFile/Seek.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/RandomAccessFile/Seek.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/io/RandomAccessFile/WriteBytesChars.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/RandomAccessFile/WriteBytesChars.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/test/java/io/RandomAccessFile/WriteUTF.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/RandomAccessFile/WriteUTF.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/test/java/io/RandomAccessFile/skipBytes/SkipBytes.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/RandomAccessFile/skipBytes/SkipBytes.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/test/java/io/Reader/Skip.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Reader/Skip.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/io/Reader/SkipNegative.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Reader/SkipNegative.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/io/Serializable/ClassCastExceptionDetail/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/ClassCastExceptionDetail/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/io/Serializable/backRefCNFException/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/backRefCNFException/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/io/Serializable/checkModifiers/CheckModifiers.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/checkModifiers/CheckModifiers.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/io/Serializable/classDescFlagConflict/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/classDescFlagConflict/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/io/Serializable/classDescHooks/ClassDescHooks.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/classDescHooks/ClassDescHooks.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/io/Serializable/duplicateSerialFields/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/duplicateSerialFields/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/io/Serializable/enum/badResolve/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/enum/badResolve/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/io/Serializable/enum/constantSubclasses/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/enum/constantSubclasses/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/io/Serializable/enum/missingConstant/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/enum/missingConstant/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/io/Serializable/fieldTypeString/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/fieldTypeString/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/io/Serializable/illegalHandle/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/illegalHandle/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/io/Serializable/longString/LongString.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/longString/LongString.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/io/Serializable/oldTests/AnnotateClass.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/oldTests/AnnotateClass.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/io/Serializable/oldTests/ArrayFields.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/oldTests/ArrayFields.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/io/Serializable/oldTests/ArraysOfArrays.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/oldTests/ArraysOfArrays.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/io/Serializable/oldTests/BinaryTree.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/oldTests/BinaryTree.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/io/Serializable/oldTests/CircularList.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/oldTests/CircularList.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/io/Serializable/oldTests/SimpleArrays.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/oldTests/SimpleArrays.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/io/Serializable/oldTests/WritePrimitive.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/oldTests/WritePrimitive.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/io/Serializable/packageAccess/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/packageAccess/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/io/Serializable/parents/EvolvedClass.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/parents/EvolvedClass.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/io/Serializable/parents/OriginalClass.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/parents/OriginalClass.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/io/Serializable/proxy/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/proxy/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/io/Serializable/proxy/skipMissing/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/proxy/skipMissing/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/io/Serializable/proxy/skipMissing/Write.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/proxy/skipMissing/Write.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/io/Serializable/readObjectNoData/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/readObjectNoData/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/io/Serializable/serialver/classpath/run.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/serialver/classpath/run.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/io/Serializable/serialver/nested/run.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/serialver/nested/run.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/io/Serializable/skipWriteObject/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/skipWriteObject/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/io/Serializable/skippedObjCNFException/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/skippedObjCNFException/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/io/Serializable/stopCustomDeserialization/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/stopCustomDeserialization/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/io/Serializable/unresolvedClassDesc/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/unresolvedClassDesc/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/io/Serializable/unshared/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/unshared/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/io/Serializable/wrongReturnTypes/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/Serializable/wrongReturnTypes/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/io/StreamTokenizer/Comment.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/StreamTokenizer/Comment.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/io/pathNames/GeneralWin32.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/pathNames/GeneralWin32.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/io/readBytes/ReadBytesBounds.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/io/readBytes/ReadBytesBounds.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/test/java/lang/ClassLoader/UninitializedParent.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/ClassLoader/UninitializedParent.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/ClassLoader/findSystemClass/Loader.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/ClassLoader/findSystemClass/Loader.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/lang/ProcessBuilder/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/ProcessBuilder/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/Runtime/exec/ExecWithDir.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/Runtime/exec/ExecWithDir.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/lang/String/Supplementary.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/String/Supplementary.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/StringBuffer/Supplementary.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/StringBuffer/Supplementary.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/StringBuilder/Supplementary.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/StringBuilder/Supplementary.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/StringCoding/CheckEncodings.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/StringCoding/CheckEncodings.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/lang/System/ExitFinalizersAndJIT.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/System/ExitFinalizersAndJIT.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/lang/System/IgnoreNullSecurityManager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/System/IgnoreNullSecurityManager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/lang/Thread/GenerifyStackTraces.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/Thread/GenerifyStackTraces.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/test/java/lang/Thread/StackTraces.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/Thread/StackTraces.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/annotation/ParameterAnnotations.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/annotation/ParameterAnnotations.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdConcMarkSweepGC.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdConcMarkSweepGC.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/management/MemoryMXBean/Pending.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/MemoryMXBean/Pending.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/management/ThreadMXBean/DisableTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/ThreadMXBean/DisableTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/management/ThreadMXBean/EnableTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/ThreadMXBean/EnableTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/management/ThreadMXBean/Locks.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/management/ThreadMXBean/Locks.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/reflect/Proxy/Boxing.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/reflect/Proxy/Boxing.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/lang/reflect/Proxy/ClassRestrictions.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/reflect/Proxy/ClassRestrictions.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/lang/reflect/Proxy/returnTypes/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/lang/reflect/Proxy/returnTypes/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/net/Authenticator/B4769350.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Authenticator/B4769350.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/net/BindException/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/BindException/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/CookieHandler/CookieHandlerTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/CookieHandler/CookieHandlerTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/net/CookieHandler/TestHttpCookie.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/CookieHandler/TestHttpCookie.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/net/DatagramSocket/DatagramTimeout.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/DatagramSocket/DatagramTimeout.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/net/DatagramSocket/SendSize.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/DatagramSocket/SendSize.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/jdk/test/java/net/Inet6Address/B6214234.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Inet6Address/B6214234.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/net/Inet6Address/B6558853.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Inet6Address/B6558853.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/net/Inet6Address/serialize/Serialize.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Inet6Address/serialize/Serialize.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/net/InetAddress/CheckJNI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/InetAddress/CheckJNI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/net/MulticastSocket/NoLoopbackPackets.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/MulticastSocket/NoLoopbackPackets.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/net/MulticastSocket/SetOutgoingIf.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/MulticastSocket/SetOutgoingIf.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/net/ProxySelector/B6737819.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/ProxySelector/B6737819.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/java/net/ResponseCache/B6181108.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/ResponseCache/B6181108.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/test/java/net/ResponseCache/ResponseCacheTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/ResponseCache/ResponseCacheTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/net/ResponseCache/getResponseCode.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/ResponseCache/getResponseCode.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/net/Socket/CloseAvailable.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/CloseAvailable.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/net/Socket/DeadlockTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/DeadlockTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/net/Socket/LingerTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/LingerTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/net/Socket/LinkLocal.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/LinkLocal.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/Socket/ProxyCons.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/ProxyCons.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/net/Socket/ReadTimeout.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/ReadTimeout.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/net/Socket/SetReceiveBufferSize.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/SetReceiveBufferSize.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/net/Socket/SetSoLinger.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/SetSoLinger.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/net/Socket/ShutdownBoth.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/ShutdownBoth.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/Socket/SoTimeout.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/SoTimeout.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/net/Socket/Timeout.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/Timeout.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/net/Socket/UrgentDataTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/UrgentDataTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/Socket/asyncClose/BrokenPipe.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/asyncClose/BrokenPipe.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/Socket/setReuseAddress/Restart.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/Socket/setReuseAddress/Restart.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/SocketInputStream/SocketClosedException.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/SocketInputStream/SocketClosedException.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/net/SocketInputStream/SocketTimeout.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/SocketInputStream/SocketTimeout.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/net/URI/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URI/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/net/URL/GetContent.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URL/GetContent.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/net/URL/TestIPv6Addresses.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URL/TestIPv6Addresses.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/URLClassLoader/ClassLoad.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLClassLoader/ClassLoad.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/net/URLClassLoader/HttpTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLClassLoader/HttpTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/java/net/URLConnection/B5052093.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLConnection/B5052093.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/net/URLConnection/DisconnectAfterEOF.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLConnection/DisconnectAfterEOF.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/jdk/test/java/net/URLConnection/HttpContinueStackOverflow.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLConnection/HttpContinueStackOverflow.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/net/URLConnection/Redirect307Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLConnection/Redirect307Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/URLConnection/RedirectLimit.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLConnection/RedirectLimit.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/URLConnection/ResendPostBody.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLConnection/ResendPostBody.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/URLConnection/SetIfModifiedSince.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLConnection/SetIfModifiedSince.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/net/URLConnection/TimeoutTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLConnection/TimeoutTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/URLConnection/URLConnectionHeaders.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLConnection/URLConnectionHeaders.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/URLConnection/ZeroContentLength.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLConnection/ZeroContentLength.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/net/URLConnection/contentHandler/UserContentHandler.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/URLConnection/contentHandler/UserContentHandler.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/net/ipv6tests/B6521014.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/ipv6tests/B6521014.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/net/ipv6tests/TcpTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/ipv6tests/TcpTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/net/ipv6tests/Tests.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/net/ipv6tests/Tests.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/nio/Buffer/StringCharBufferSliceTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/Buffer/StringCharBufferSliceTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/nio/BufferPoolMXBean/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/BufferPoolMXBean/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/nio/MappedByteBuffer/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/MappedByteBuffer/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/MappedByteBuffer/Force.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/MappedByteBuffer/Force.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/MappedByteBuffer/ZeroMap.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/MappedByteBuffer/ZeroMap.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/nio/channels/AsyncCloseAndInterrupt.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/AsyncCloseAndInterrupt.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/AsynchronousChannelGroup/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Identity.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/AsynchronousChannelGroup/Identity.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/AsynchronousServerSocketChannel/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/AsynchronousServerSocketChannel/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Leaky.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/AsynchronousSocketChannel/Leaky.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/Channels/Basic2.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Channels/Basic2.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/Channels/Write.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Channels/Write.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/DatagramChannel/Connect.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/DatagramChannel/Connect.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/DatagramChannel/EmptyBuffer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/DatagramChannel/EmptyBuffer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/DatagramChannel/NoSender.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/DatagramChannel/NoSender.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/DatagramChannel/ReceiveISA.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/DatagramChannel/ReceiveISA.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/DatagramChannel/SRTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/DatagramChannel/SRTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/DatagramChannel/Sender.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/DatagramChannel/Sender.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/DatagramChannel/SocketOptionTests.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/DatagramChannel/SocketOptionTests.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/Args.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/Args.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/ClosedChannelTransfer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/ClosedChannelTransfer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/ExpandingMap.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/ExpandingMap.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/Lock.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/Lock.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/MapOverEnd.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/MapOverEnd.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/MapReadOnly.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/MapReadOnly.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/MapTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/MapTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/Mode.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/Mode.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/Position.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/Position.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/Pread.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/Pread.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/Pwrite.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/Pwrite.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/Read.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/Read.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/ReadFull.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/ReadFull.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/ReadToLimit.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/ReadToLimit.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/ScatteringRead.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/ScatteringRead.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/Size.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/Size.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/Transfer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/Transfer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/TransferToChannel.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/TransferToChannel.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/TransferToNonWritable.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/TransferToNonWritable.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/Transfers.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/Transfers.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/Truncate.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/Truncate.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/TryLock.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/TryLock.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/FileChannel/Write.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/FileChannel/Write.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/Pipe/NonBlocking.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Pipe/NonBlocking.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/Pipe/SelectPipe.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Pipe/SelectPipe.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/SelectionKey/AtomicAttachTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SelectionKey/AtomicAttachTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/BasicAccept.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/BasicAccept.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/BasicConnect.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/BasicConnect.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/ByteServer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/ByteServer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/CheckLocking.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/CheckLocking.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/CloseInvalidatesKeys.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/CloseInvalidatesKeys.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/CloseThenRegister.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/CloseThenRegister.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/CloseWhenKeyIdle.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/CloseWhenKeyIdle.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/Connect.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/Connect.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/ConnectWrite.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/ConnectWrite.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/HelperSlowToDie.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/HelperSlowToDie.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/KeysReady.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/KeysReady.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/LotsOfChannels.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/LotsOfChannels.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/OpRead.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/OpRead.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/ReadAfterConnect.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/ReadAfterConnect.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/RegAfterPreClose.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/RegAfterPreClose.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/SelectAfterRead.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/SelectAfterRead.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/SelectAndCancel.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/SelectAndCancel.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/SelectWrite.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/SelectWrite.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/SelectorLimit.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/SelectorLimit.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/SelectorTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/SelectorTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/WakeupNow.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/WakeupNow.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/WakeupOverflow.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/WakeupOverflow.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/WakeupSpeed.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/WakeupSpeed.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/Selector/lots_of_updates.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/Selector/lots_of_updates.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/test/java/nio/channels/ServerSocketChannel/SocketOptionTests.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/ServerSocketChannel/SocketOptionTests.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/AdaptSocket.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/AdaptSocket.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/BigReadWrite.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/BigReadWrite.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/Bind.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/Bind.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/Close.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/Close.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/CloseRegisteredChannel.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/CloseRegisteredChannel.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/CloseTimeoutChannel.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/CloseTimeoutChannel.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/IsConnectable.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/IsConnectable.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/OpenLeak.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/OpenLeak.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/SocketInheritance.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/SocketInheritance.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/SocketOptionTests.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/SocketOptionTests.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/Trivial.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/Trivial.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/UnboundSocketTests.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/UnboundSocketTests.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/VectorIO.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/VectorIO.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/java/nio/channels/SocketChannel/Write.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/SocketChannel/Write.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/nio/channels/etc/Shadow.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/etc/Shadow.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/ClosedStreams.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/ClosedStreams.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/java/nio/file/DirectoryStream/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/DirectoryStream/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/DirectoryStream/SecureDS.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/DirectoryStream/SecureDS.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/FileStore/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/FileStore/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/Files/Misc.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/Files/Misc.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/Files/PrintFileTree.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/Files/PrintFileTree.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/Files/SkipSiblings.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/Files/SkipSiblings.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/Files/TerminateWalk.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/Files/TerminateWalk.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/Files/WalkWithSecurity.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/Files/WalkWithSecurity.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/java/nio/file/Files/walk_file_tree.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/Files/walk_file_tree.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/Path/CheckPermissions.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/Path/CheckPermissions.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/java/nio/file/Path/CopyAndMove.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/Path/CopyAndMove.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/Path/InterruptCopy.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/Path/InterruptCopy.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/Path/Misc.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/Path/Misc.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/Path/PathOps.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/Path/PathOps.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/Path/delete_on_close.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/Path/delete_on_close.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/nio/file/TestUtil.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/nio/file/TestUtil.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/java/security/Provider/Turkish.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/security/Provider/Turkish.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/java/util/Collection/BiggernYours.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/Collection/BiggernYours.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/util/Collection/IteratorAtEnd.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/Collection/IteratorAtEnd.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/Collection/MOAT.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/Collection/MOAT.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/util/Collections/RacingCollections.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/Collections/RacingCollections.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/util/Deque/ChorusLine.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/Deque/ChorusLine.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/util/Formatter/Constructors.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/Formatter/Constructors.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/test/java/util/Locale/PrintDefaultLocale.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/Locale/PrintDefaultLocale.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/Locale/data/deflocale.c	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/Locale/data/deflocale.c	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/Locale/data/deflocale.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/Locale/data/deflocale.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/PluggableLocale/ExecTest.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/PluggableLocale/ExecTest.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/ResourceBundle/Bug6359330.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/ResourceBundle/Bug6359330.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/ResourceBundle/Test4300693.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/ResourceBundle/Test4300693.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/ResourceBundle/TestBug4179766.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/ResourceBundle/TestBug4179766.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/ServiceLoader/basic.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/ServiceLoader/basic.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/util/concurrent/BlockingQueue/Interrupt.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/BlockingQueue/Interrupt.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/util/concurrent/CopyOnWriteArraySet/RacingCows.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/CopyOnWriteArraySet/RacingCows.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/util/concurrent/CyclicBarrier/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/CyclicBarrier/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/util/concurrent/Executors/AutoShutdown.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/Executors/AutoShutdown.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/util/concurrent/Executors/Throws.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/Executors/Throws.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/util/concurrent/FutureTask/Customized.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/FutureTask/Customized.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/concurrent/ThreadPoolExecutor/Custom.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/ThreadPoolExecutor/Custom.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ScheduledTickleService.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/ThreadPoolExecutor/ScheduledTickleService.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/test/java/util/concurrent/locks/Lock/FlakyMutex.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/locks/Lock/FlakyMutex.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/Bug6571733.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/Bug6571733.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/java/util/regex/RegExTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/regex/RegExTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/java/util/zip/ZipFile/ReadZip.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/java/util/zip/ZipFile/ReadZip.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/jdk/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/javax/print/attribute/ServiceDialogTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/print/attribute/ServiceDialogTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/test/javax/print/attribute/SidesPageRangesTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/print/attribute/SidesPageRangesTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/javax/script/ProviderTest.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/script/ProviderTest.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/javax/swing/JLayer/SerializationTest/SerializationTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/swing/JLayer/SerializationTest/SerializationTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/javax/swing/JTextArea/Test6593649.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/swing/JTextArea/Test6593649.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/javax/swing/plaf/nimbus/Test6919629.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/swing/plaf/nimbus/Test6919629.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/javax/swing/system/6799345/TestShutdown.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/javax/swing/system/6799345/TestShutdown.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/sun/java2d/GdiRendering/InsetClipping.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/java2d/GdiRendering/InsetClipping.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/sun/java2d/SunGraphics2D/DrawImageBilinear.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/java2d/SunGraphics2D/DrawImageBilinear.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/sun/java2d/pipe/MutableColorTest/MutableColorTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/java2d/pipe/MutableColorTest/MutableColorTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/jvmstat/testlibrary/utils.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/jvmstat/testlibrary/utils.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/test/sun/misc/BootClassLoaderHook/TestHook.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/misc/BootClassLoaderHook/TestHook.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/sun/net/ftp/FtpGetContent.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/ftp/FtpGetContent.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/sun/net/ftp/FtpURL.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/ftp/FtpURL.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/sun/net/sdp/ProbeIB.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/sdp/ProbeIB.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/sun/net/sdp/sanity.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/sdp/sanity.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
--- a/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/net/www/http/ChunkedOutputStream/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/www/http/ChunkedOutputStream/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/net/www/http/HttpClient/B6726695.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/www/http/HttpClient/B6726695.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/sun/net/www/http/HttpClient/MultiThreadTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/www/http/HttpClient/MultiThreadTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/sun/net/www/http/HttpClient/ProxyTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/www/http/HttpClient/ProxyTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/sun/net/www/http/KeepAliveCache/B5045306.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/www/http/KeepAliveCache/B5045306.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/sun/net/www/httptest/HttpServer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/www/httptest/HttpServer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/sun/net/www/protocol/http/ChunkedErrorStream.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/www/protocol/http/ChunkedErrorStream.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/sun/net/www/protocol/http/DigestTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/net/www/protocol/http/DigestTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/sun/nio/ch/Basic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/nio/ch/Basic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/sun/nio/ch/TempBuffer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/nio/ch/TempBuffer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/jdk/test/sun/nio/cs/CheckHistoricalNames.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/nio/cs/CheckHistoricalNames.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/sun/nio/cs/FindDecoderBugs.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/nio/cs/FindDecoderBugs.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/sun/nio/cs/ReadZero.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/nio/cs/ReadZero.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/sun/nio/cs/Test4200310.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/nio/cs/Test4200310.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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
--- a/jdk/test/sun/nio/cs/Test4206507.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/nio/cs/Test4206507.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/sun/nio/cs/TestStringCoding.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/nio/cs/TestStringCoding.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/jdk/test/sun/nio/cs/TestX11CNS.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/nio/cs/TestX11CNS.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/sun/rmi/rmic/manifestClassPath/run.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/rmi/rmic/manifestClassPath/run.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jdk/test/sun/security/krb5/auto/Context.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/security/krb5/auto/Context.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/jdk/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/sun/security/pkcs11/tls/TestPremaster.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/security/pkcs11/tls/TestPremaster.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientModeClientAuth.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientModeClientAuth.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/jdk/test/sun/text/resources/LocaleDataTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/sun/tools/jps/jps-Vvml_2.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/tools/jps/jps-Vvml_2.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/tools/jps/jps-help.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/tools/jps/jps-help.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/tools/jps/jps-m_2.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/tools/jps/jps-m_2.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/tools/jstat/jstatHelp.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/tools/jstat/jstatHelp.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/tools/jstat/jstatOptions1.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/tools/jstat/jstatOptions1.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/tools/jstatd/jstatdDefaults.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/tools/jstatd/jstatdDefaults.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/tools/jstatd/jstatdPort.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/tools/jstatd/jstatdPort.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/tools/jstatd/jstatdServerName.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/tools/jstatd/jstatdServerName.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/tools/jstatd/jstatdUsage1.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/tools/jstatd/jstatdUsage1.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/sun/util/logging/PlatformLoggerTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/util/logging/PlatformLoggerTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/jdk/test/sun/util/resources/TimeZone/Bug6317929.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/sun/util/resources/TimeZone/Bug6317929.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/jdk/test/tools/jar/JarEntryTime.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/tools/jar/JarEntryTime.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/jdk/test/tools/jar/index/MetaInf.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/tools/jar/index/MetaInf.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/jdk/test/tools/launcher/ChangeDataModel.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/tools/launcher/ChangeDataModel.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, 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
--- a/jdk/test/tools/launcher/DefaultLocaleTest.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/tools/launcher/DefaultLocaleTest.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/jdk/test/tools/launcher/UnicodeTest.sh	Thu Dec 23 12:29:21 2010 -0800
+++ b/jdk/test/tools/launcher/UnicodeTest.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/langtools/make/Makefile	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/make/Makefile	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/langtools/make/build.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/make/build.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/langtools/make/tools/CompileProperties/CompileProperties.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/make/tools/CompileProperties/CompileProperties.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/make/tools/CompileProperties/CompilePropertiesTask.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/make/tools/CompileProperties/CompilePropertiesTask.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/langtools/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/src/share/classes/com/sun/source/tree/MethodTree.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/source/tree/MethodTree.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/source/tree/Tree.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/source/tree/Tree.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/source/tree/TryTree.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/source/tree/TryTree.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/source/util/TreeScanner.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/source/util/TreeScanner.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/source/util/Trees.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/source/util/Trees.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/apt/main/CommandLine.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/apt/main/CommandLine.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/apt/main/Main.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/apt/main/Main.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/apt/resources/apt_ja.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/apt/resources/apt_ja.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml	Tue Jan 04 17:10:35 2011 -0800
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 
 <!--
- Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/doclets/standard/Standard.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/standard/Standard.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/Launcher.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/Launcher.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/file/Paths.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/Paths.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Items.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Items.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Target.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Target.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/main/CommandLine.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/CommandLine.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/main/Main.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/Main.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/main/OptionName.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/OptionName.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Keywords.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Keywords.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Bits.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Bits.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/FatalError.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/FatalError.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/List.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/List.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Log.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Log.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Options.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Options.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Warner.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Warner.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Messager.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Messager.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Start.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Start.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javah/JNI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javah/JNI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javah/LLNI.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javah/LLNI.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javah/Mangle.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javah/Mangle.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javah/TypeSignature.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javah/TypeSignature.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javah/resources/version.properties-template	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javah/resources/version.properties-template	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2010, 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
--- a/langtools/src/share/classes/com/sun/tools/javap/SourceWriter.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javap/SourceWriter.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/element/ElementKind.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/element/ElementKind.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/element/ElementVisitor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/element/ElementVisitor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/classes/javax/tools/ToolProvider.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/classes/javax/tools/ToolProvider.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/src/share/sample/javac/processing/src/CheckNamesProcessor.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/src/share/sample/javac/processing/src/CheckNamesProcessor.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/AccessH1/AccessH1.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/AccessH1/AccessH1.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/MetaTag/MetaTag.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/MetaTag/MetaTag.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/ValidHtml/ValidHtml.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/ValidHtml/ValidHtml.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/WindowTitles/WindowTitles.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/WindowTitles/WindowTitles.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testHref/TestHref.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testHref/TestHref.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testTaglets/taglets/Foo.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testTaglets/taglets/Foo.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/test/tools/javac/6341866/Anno.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/6341866/Anno.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/6341866/T6341866.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/6341866/T6341866.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/6402516/CheckLocalElements.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/6402516/CheckLocalElements.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/ClassFileModifiers/ClassModifiers.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/ClassFileModifiers/ClassModifiers.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
--- a/langtools/test/tools/javac/ClassFileModifiers/MemberModifiers.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/ClassFileModifiers/MemberModifiers.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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
--- a/langtools/test/tools/javac/EarlyAssert.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/EarlyAssert.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/test/tools/javac/InterfaceAssert.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/InterfaceAssert.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/test/tools/javac/OverrideChecks/6738538/T6738538a.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/OverrideChecks/6738538/T6738538a.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/OverrideChecks/6738538/T6738538b.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/OverrideChecks/6738538/T6738538b.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/T6358024.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/T6358024.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/T6403466.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/T6403466.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/T6411379.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/T6411379.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/T6423583.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/T6423583.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/T6705935.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/T6705935.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/ThrowsIntersection_1.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/ThrowsIntersection_1.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/langtools/test/tools/javac/ThrowsIntersection_2.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/ThrowsIntersection_2.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/langtools/test/tools/javac/ThrowsIntersection_3.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/ThrowsIntersection_3.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/langtools/test/tools/javac/ThrowsIntersection_4.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/ThrowsIntersection_4.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
--- a/langtools/test/tools/javac/annotations/6214965/T6214965.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/annotations/6214965/T6214965.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javac/annotations/6365854/T6365854.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/annotations/6365854/T6365854.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javac/annotations/neg/Constant.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/annotations/neg/Constant.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/tools/javac/annotations/neg/Dep.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/annotations/neg/Dep.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/tools/javac/annotations/pos/TrailingComma.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/annotations/pos/TrailingComma.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/test/tools/javac/api/6421111/T6421111.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/api/6421111/T6421111.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/api/6468404/T6468404.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/api/6468404/T6468404.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/api/6731573/T6731573.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/api/6731573/T6731573.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/api/T6392782.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/api/T6392782.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/api/T6412669.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/api/T6412669.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/api/TestOperators.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/api/TestOperators.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javac/cast/6548436/T6548436d.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/cast/6548436/T6548436d.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/cast/6558559/T6558559a.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/cast/6558559/T6558559a.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/cast/6558559/T6558559b.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/cast/6558559/T6558559b.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/cast/6586091/T6586091.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/cast/6586091/T6586091.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/danglingDep/DepX.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/danglingDep/DepX.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javac/danglingDep/NoDepX.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/danglingDep/NoDepX.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javac/danglingDep/Test1.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/danglingDep/Test1.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javac/depOverrides/annotation/Test1.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/depOverrides/annotation/Test1.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javac/depOverrides/annotation/Test2.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/depOverrides/annotation/Test2.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javac/depOverrides/doccomment/Test1.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test1.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javac/depOverrides/doccomment/Test2.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test2.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javac/diags/examples/BadSourceFileHeader/sourcepath/p/A.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/diags/examples/BadSourceFileHeader/sourcepath/p/A.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/enum/6424358/T6424358.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/enum/6424358/T6424358.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/enum/T6724345.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/enum/T6724345.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/generics/Casting.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/Casting.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/test/tools/javac/generics/Casting3.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/Casting3.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/test/tools/javac/generics/Casting4.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/Casting4.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/test/tools/javac/generics/InnerInterface1.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/InnerInterface1.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/test/tools/javac/generics/InnerInterface2.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/InnerInterface2.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/test/tools/javac/generics/Multibound1.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/Multibound1.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/test/tools/javac/generics/MultipleInheritance.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/MultipleInheritance.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/test/tools/javac/generics/NameOrder.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/NameOrder.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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
--- a/langtools/test/tools/javac/generics/PermuteBound.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/PermuteBound.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
--- a/langtools/test/tools/javac/generics/PrimitiveVariant.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/PrimitiveVariant.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
--- a/langtools/test/tools/javac/generics/T6557954.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/T6557954.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/generics/T6751514.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/T6751514.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/generics/T6869075.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/T6869075.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/test/tools/javac/generics/inference/6569789/T6569789.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/inference/6569789/T6569789.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/generics/inference/6650759/T6650759a.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759a.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/test/tools/javac/generics/typevars/5060485/Compatibility.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/typevars/5060485/Compatibility.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/generics/typevars/5060485/Compatibility02.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/typevars/5060485/Compatibility02.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/generics/typevars/T6880344.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/typevars/T6880344.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/test/tools/javac/generics/wildcards/T6732484.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/generics/wildcards/T6732484.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/meth/InvokeMHTrans.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/meth/InvokeMHTrans.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/nio/compileTest/CompileTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/nio/compileTest/CompileTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/test/tools/javac/policy/test1/Test1a.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/policy/test1/Test1a.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javac/policy/test2/Test.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/policy/test2/Test.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/processing/model/util/elements/Foo.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/processing/model/util/elements/Foo.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/test/tools/javac/rawDiags/Note.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/rawDiags/Note.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/test/tools/javac/tree/TreeKindTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/tree/TreeKindTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
--- a/langtools/test/tools/javac/typeAnnotations/newlocations/BasicTest.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/typeAnnotations/newlocations/BasicTest.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/varargs/T6746184.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/varargs/T6746184.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javac/varargs/warning/Warn1.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javac/varargs/warning/Warn1.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
--- a/langtools/test/tools/javadoc/T4994049/FileWithTabs.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javadoc/T4994049/FileWithTabs.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javadoc/T4994049/T4994049.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javadoc/T4994049/T4994049.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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
--- a/langtools/test/tools/javap/T6715251.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javap/T6715251.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javap/T6715753.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javap/T6715753.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2010, 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
--- a/langtools/test/tools/javap/T6729471.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javap/T6729471.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/langtools/test/tools/javap/T6868539.java	Thu Dec 23 12:29:21 2010 -0800
+++ b/langtools/test/tools/javap/T6868539.java	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
--- a/make/Defs-internal.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/make/Defs-internal.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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
--- a/make/deploy-rules.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/make/deploy-rules.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/make/hotspot-rules.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/make/hotspot-rules.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, 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
--- a/make/install-rules.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/make/install-rules.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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
--- a/make/jprt.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/make/jprt.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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
--- a/make/sanity-rules.gmk	Thu Dec 23 12:29:21 2010 -0800
+++ b/make/sanity-rules.gmk	Tue Jan 04 17:10:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/scripts/hgforest.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2009, 2010, 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.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Shell script for a fast parallel forest command
+
+tmp=/tmp/forest.$$
+rm -f -r ${tmp}
+mkdir -p ${tmp}
+
+# Remove tmp area on A. B. Normal termination
+trap 'rm -f -r ${tmp}' KILL
+trap 'rm -f -r ${tmp}' EXIT
+
+# Only look in specific locations for possible forests (avoids long searches)
+pull_default=""
+if [ "$1" = "clone" -o "$1" = "fclone" ] ; then
+  subrepos="corba jaxp jaxws langtools jdk hotspot"
+  if [ -f .hg/hgrc ] ; then
+    pull_default=`hg paths default`
+  fi
+  if [ "${pull_default}" = "" ] ; then
+    echo "ERROR: Need initial clone with 'hg paths default' defined"
+    exit 1
+  fi
+  repos=""
+  for i in ${subrepos} ; do
+    if [ ! -f ${i}/.hg/hgrc ] ; then
+      repos="${repos} ${i}"
+    fi
+  done
+  at_a_time=2
+else
+  hgdirs=`ls -d ./.hg ./*/.hg ./*/*/.hg ./*/*/*/.hg ./*/*/*/*/.hg 2>/dev/null`
+  # Derive repository names from the .hg directory locations
+  repos=""
+  for i in ${hgdirs} ; do
+    repos="${repos} `echo ${i} | sed -e 's@/.hg$@@'`"
+  done
+  at_a_time=8
+fi
+
+# Any repos to deal with?
+if [ "${repos}" = "" ] ; then
+  echo "No repositories to process."
+  exit
+fi
+
+# Echo out what repositories we will process
+echo "# Repos: ${repos}"
+
+# Run the supplied command on all repos in parallel, save output until end
+n=0
+for i in ${repos} ; do
+  echo "Starting on ${i}"
+  n=`expr ${n} '+' 1`
+  (
+    (
+      if [ "$1" = "clone" -o "$1" = "fclone" ] ; then
+        cline="hg $* ${pull_default}/${i} ${i}"
+        echo "# ${cline}"
+        ( eval "${cline}" )
+      else
+        cline="hg $*"
+        echo "# cd ${i} && ${cline}"
+        ( cd ${i} && eval "${cline}" )
+      fi
+      echo "# exit code $?"
+    ) > ${tmp}/repo.${n} 2>&1 ; cat ${tmp}/repo.${n} ) &
+  if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then
+    sleep 5
+  fi
+done
+
+# Wait for all hg commands to complete
+wait
+
+# Cleanup
+rm -f -r ${tmp}
+
+# Terminate with exit 0 all the time (hard to know when to say "failed")
+exit 0
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/scripts/update_copyright_year.sh	Tue Jan 04 17:10:35 2011 -0800
@@ -0,0 +1,189 @@
+#!/bin/sh -f
+
+#
+# Copyright (c) 2010, 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.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Script to update the Copyright YEAR range in Mercurial sources.
+#  (Originally from xdono, Thanks!)
+
+if [ "`uname -s`" = "SunOS" ] ; then
+  awk=nawk
+else
+  awk=awk
+fi
+
+# Stop on any error
+set -e
+
+# Temp area
+tmp=/tmp/`basename $0`.${USER}.$$
+rm -f -r ${tmp}
+mkdir -p ${tmp}
+total=0
+
+# This year or supplied year
+if [ "$1" != "" ] ; then
+  year="$1"
+else
+  year=`date +%Y`
+fi
+
+# Return true if it makes sense to edit this file
+saneFileToCheck()
+{
+  if [ "$1" != "" -a -f $1 ] ; then
+    isText=`file "$1" | egrep -i '(text|source)' | cat`
+    hasCopyright=`grep 'Copyright' "$1" | cat`
+    lastLineCount=`tail -1 "$1" | wc -l`
+    if [ "${isText}" != ""  \
+         -a "${hasCopyright}" != "" \
+	 -a ${lastLineCount} -eq 1 ] ; then
+      echo "true"
+    else
+      echo "false"
+    fi
+  else
+    echo "false"
+  fi
+}
+
+# Update the copyright year on a file
+updateFile() # file
+{
+  changed="false"
+  if [ `saneFileToCheck "$1"` = "true" ] ; then
+    copyright="Copyright (c)"
+    company="Oracle"
+    rm -f $1.OLD
+    mv $1 $1.OLD
+    cat $1.OLD | \
+      sed -e "s@\(${copyright} [12][0-9][0-9][0-9],\) [12][0-9][0-9][0-9], ${company}@\1 ${year}, ${company}@" | \
+      sed -e "s@\(${copyright} [12][0-9][0-9][0-9],\) ${company}@\1 ${year}, ${company}@" | \
+      sed -e "s@${copyright} ${year}, ${year}, ${company}@${copyright} ${year}, ${company}@"  \
+      > $1
+    if ! diff -b -w $1.OLD $1 > /dev/null ; then \
+      changed="true"
+      rm -f $1.OLD
+    else
+      rm -f $1
+      mv $1.OLD $1
+    fi
+  fi
+  echo "${changed}"
+}
+
+# Update the copyright year on all files changed by this changeset
+updateChangesetFiles() # changeset
+{
+  count=0
+  files=${tmp}/files.$1
+  rm -f ${files}
+  hg log --rev $1 -v --template '{files}\n' | expand \
+    | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}' \
+    > ${files}
+  if [ -f "${files}" -a -s "${files}" ] ; then
+    copyright="Copyright (c)"
+    company="Oracle"
+    fcount=`cat ${files}| wc -l`
+    for i in `cat ${files}` ; do
+      if [ `updateFile "${i}"` = "true" ] ; then
+        count=`expr ${count} '+' 1`
+      fi
+    done
+    if [ ${count} -gt 0 ] ; then
+      printf "  UPDATED year on %d of %d files.\n" ${count} ${fcount}
+      total=`expr ${total} '+' ${count}`
+    else
+      printf "  None of the %d files were changed.\n" ${fcount}
+    fi
+  else
+    printf "  ERROR: No files changed in the changeset? Must be a mistake.\n"
+    set -x
+    ls -al ${files}
+    hg log --rev $1 -v --template '{files}\n'
+    hg log --rev $1 -v --template '{files}\n' | expand \
+      | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}'
+    set +x
+    exit 1
+  fi
+  rm -f ${files}
+}
+
+# Check if repository is clean
+previous=`hg status|wc -l`
+if [ ${previous} -ne 0 ] ; then
+  echo "WARNING: This repository contains previously edited working set files."
+  echo "  hg status | wc -l = `hg status | wc -l`"
+fi
+
+# Get all changesets this year
+all_changesets=${tmp}/all_changesets
+rm -f ${all_changesets}
+hg log --no-merges -v -d "${year}-01-01 to ${year}-12-31" --template '{node}\n' > ${all_changesets}
+
+# Check changeset to see if it is Copyright only changes, filter changesets
+if [ -s ${all_changesets} ] ; then
+  echo "Changesets made in ${year}: `cat ${all_changesets} | wc -l`"
+  index=0
+  cat ${all_changesets} | while read changeset ; do
+    index=`expr ${index} '+' 1`
+    desc=${tmp}/desc.${changeset}
+    rm -f ${desc}
+    echo "------------------------------------------------"
+    hg log --rev ${changeset} --template '{desc}\n' > ${desc}
+    printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`"
+    if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then
+      printf "  EXCLUDED tag changeset.\n"
+    elif cat ${desc} | fgrep -i rebrand > /dev/null ; then
+      printf "  EXCLUDED rebrand changeset.\n"
+    elif cat ${desc} | fgrep -i copyright > /dev/null ; then
+      printf "  EXCLUDED copyright changeset.\n"
+    else
+      updateChangesetFiles ${changeset}
+    fi
+    rm -f ${desc}
+  done
+fi
+
+if [ ${total} -gt 0 ] ; then
+   echo "---------------------------------------------"
+   echo "Updated the copyright year on a total of ${total} files."
+   if [ ${previous} -eq 0 ] ; then
+     echo "This count should match the count of modified files in the repository: hg status -m"
+   else
+     echo "WARNING: This repository contained previously edited working set files."
+   fi
+   echo "  hg status -m | wc -l = `hg status -m | wc -l`"
+else
+   echo "---------------------------------------------"
+   echo "No files were changed"
+   if [ ${previous} -ne 0 ] ; then
+     echo "WARNING: This repository contained previously edited working set files."
+   fi
+   echo "  hg status -m | wc -l = `hg status -m | wc -l`"
+fi
+
+# Cleanup
+rm -f -r ${tmp}
+exit 0
+