diff --git a/make/build.properties b/make/build.properties
index 6e792bb106d5a68d6c0980cd63ee92f3051e0b37..1f3b7c2e4062b7d3c50b8a45d712f4b7bd0c663f 100644
--- a/make/build.properties
+++ b/make/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/make/build.xml b/make/build.xml
index 770f3dd040ce67e5ebbf14fc71f0814b3ec4a23f..932332d295a6194e215dd47d59e04837a6402bff 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff --git a/make/netbeans/langtools/build.xml b/make/netbeans/langtools/build.xml
index 8f2b95f303103ae7def7ca02ae7e87cf6ebfb868..790ded56d77f763cbf22618a58c4061bb6b674dd 100644
--- a/make/netbeans/langtools/build.xml
+++ b/make/netbeans/langtools/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/make/netbeans/langtools/nbproject/project.xml b/make/netbeans/langtools/nbproject/project.xml
index e750960055652817563b3436ee6df603fabf669e..2f6bd544c0c436477b873bdde85519a7adcb3dd7 100644
--- a/make/netbeans/langtools/nbproject/project.xml
+++ b/make/netbeans/langtools/nbproject/project.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/make/netbeans/langtools/nbproject/standard-context-menu-items.ent b/make/netbeans/langtools/nbproject/standard-context-menu-items.ent
index ab0568a009dad33a356e6449b5e142b57506fe38..cd77a187ed91537f0dcac7417c1b03bd8717c17e 100644
--- a/make/netbeans/langtools/nbproject/standard-context-menu-items.ent
+++ b/make/netbeans/langtools/nbproject/standard-context-menu-items.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/make/netbeans/langtools/nbproject/standard-ide-actions.ent b/make/netbeans/langtools/nbproject/standard-ide-actions.ent
index 3081fdfcdf0eb08c7c9207cb6a5cf6de179b2a4e..7369581bb1866cfa554422a2dfe56536bc5b9de5 100644
--- a/make/netbeans/langtools/nbproject/standard-ide-actions.ent
+++ b/make/netbeans/langtools/nbproject/standard-ide-actions.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/make/tools/SelectTool/SelectToolTask.java b/make/tools/SelectTool/SelectToolTask.java
index 0646c306e8a7f514f028d510fb99b16d1a761628..cc4e1212127a3e78f00d93fcbbf9e7ba5e53852d 100644
--- a/make/tools/SelectTool/SelectToolTask.java
+++ b/make/tools/SelectTool/SelectToolTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/apt/comp/AnnotationProcessingError.java b/src/share/classes/com/sun/tools/apt/comp/AnnotationProcessingError.java
index f14dc60e6e3fccc80026b8deefb62109e40da832..87510a56791faf5fef5caf2ff74434f4bac9954d 100644
--- a/src/share/classes/com/sun/tools/apt/comp/AnnotationProcessingError.java
+++ b/src/share/classes/com/sun/tools/apt/comp/AnnotationProcessingError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/apt/comp/Apt.java b/src/share/classes/com/sun/tools/apt/comp/Apt.java
index d01887b68884e8819a8f325ee57f5ab8e9faee83..68d5a458a668dac7cb5b842f6ce5f34e41118b14 100644
--- a/src/share/classes/com/sun/tools/apt/comp/Apt.java
+++ b/src/share/classes/com/sun/tools/apt/comp/Apt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/apt/comp/UsageMessageNeededException.java b/src/share/classes/com/sun/tools/apt/comp/UsageMessageNeededException.java
index 64a83ddb2c456465e5d648a38326ae118ef98146..9d0de2ed9188c662e3a582cd35d92c8d272bcc63 100644
--- a/src/share/classes/com/sun/tools/apt/comp/UsageMessageNeededException.java
+++ b/src/share/classes/com/sun/tools/apt/comp/UsageMessageNeededException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java b/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java
index 433a7dedf5129499627927b250b203de2ce04c1a..219cd8acb09257c7230cf4becfa4517fda7c63eb 100644
--- a/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java
+++ b/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java b/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java
index 403ea6ffb514f27cc9b09d7e4969374eb1692f08..4a4988af516d9b3530d48c8b36a403d7f9006b33 100644
--- a/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java
+++ b/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java b/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java
index 9505eb2230da3dc320012ae830c360698e04eb4f..40eb0d68e12ba85fa78941481967d33a5702c3c7 100644
--- a/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java
+++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java b/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java
index 3d6a9fcaa806cc241d15701ac8d430468c4b5cf1..9e65c82f8e8e7b55a8034f7aad9f6082d8775d50 100644
--- a/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java
+++ b/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/classfile/Annotation.java b/src/share/classes/com/sun/tools/classfile/Annotation.java
index 37423cacc67ed0dc11e284564336f28672a1ca3a..8078365bae7741e3cfaed165c6ae157ad7e053be 100644
--- a/src/share/classes/com/sun/tools/classfile/Annotation.java
+++ b/src/share/classes/com/sun/tools/classfile/Annotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/classfile/AttributeException.java b/src/share/classes/com/sun/tools/classfile/AttributeException.java
index 55d23f9c63b0a9312e9038430bb655c71af0f015..62ab6289a284179806278829d225e45cf146d42d 100644
--- a/src/share/classes/com/sun/tools/classfile/AttributeException.java
+++ b/src/share/classes/com/sun/tools/classfile/AttributeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/classfile/Code_attribute.java b/src/share/classes/com/sun/tools/classfile/Code_attribute.java
index ce99e119ade12a014fa8215143ccf278230da34a..b614767b3b423ad34cbe0e710a452beec9813ddf 100644
--- a/src/share/classes/com/sun/tools/classfile/Code_attribute.java
+++ b/src/share/classes/com/sun/tools/classfile/Code_attribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/classfile/ConstantPool.java b/src/share/classes/com/sun/tools/classfile/ConstantPool.java
index b9acd9640d9ddc62b2c346602e7ad2b1d5ce5cbd..95ac34426716dcaf79214583641c224cfd6afb71 100644
--- a/src/share/classes/com/sun/tools/classfile/ConstantPool.java
+++ b/src/share/classes/com/sun/tools/classfile/ConstantPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java b/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java
index 31d3473e6ca37d770ba43ae7d3302d5d4728afa8..a55ce37170e8947b62296c63fc07c544975966db 100644
--- a/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java
+++ b/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/classfile/Descriptor.java b/src/share/classes/com/sun/tools/classfile/Descriptor.java
index e446955399f23227d82b4cffdafacba3b42357d8..9dcdb2990360f797026df481f4d4b55afa967234 100644
--- a/src/share/classes/com/sun/tools/classfile/Descriptor.java
+++ b/src/share/classes/com/sun/tools/classfile/Descriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/classfile/DescriptorException.java b/src/share/classes/com/sun/tools/classfile/DescriptorException.java
index fad9a2ff3611cf11007d3aac664291f0ecdd2e68..32a66ae8d7fa392e966a19ae4ec208b530ad0b6b 100644
--- a/src/share/classes/com/sun/tools/classfile/DescriptorException.java
+++ b/src/share/classes/com/sun/tools/classfile/DescriptorException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java b/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java
index 26a9b6f973601a0989cb7bd2d4f42c7efb3f61ac..2fae45edad135c81620d5478c2417c7dfc0b8113 100644
--- a/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java
+++ b/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
index 70d487da2ba4c4e940be704c75424768958eb7d2..702f6f3fd3c7a4e0840e2964cd82b995ae5a2106 100644
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
index 352eeb7010b44511c77b05eb7f2689e1716cf6a2..62aaa55ea5de1dd6a1d66ab507146f85be5f2add 100644
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
index 3e84b00dbb6da998ddc5b20ea64f518696c86039..7942d24a0d245b579d9cf14646350b1507f81ba7 100644
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
index d7e7ee1696e8d95a58cf74b858b581ee72f9ca2f..4562e6e9354aad26195c6469de22d8ff67c54f45 100644
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/TagletOutputImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/TagletOutputImpl.java
index 9ecb4d6d5af0e129d46892a2615f5b1d0f554da9..f78b0e84a3b97173c3cf6c43ef7697dfdbd5c4ae 100644
--- a/src/share/classes/com/sun/tools/doclets/formats/html/TagletOutputImpl.java
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/TagletOutputImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
index d4cdd39b1cecbb70b09d8fa0250b5dcd1ed09f72..46073cf28bfa9a273fbbfcde70293353d1aa4228 100644
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
index cdafe1be907a98398d7d0c570ee4e3a1675efdab..fb553459907d4e9945b34b8b2d4cb36c0ca9eb09 100644
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
index eb8960f4c659a8fa1932d5af43d466fe2cac35b0..88e76405a8dd3d8158f5c39431444be0cee4f628 100644
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
index d1de4df22dd2c466883ec3bf8e056a491eb62ab9..897c419bc19599ebcff273eae0dfa7a47e8ddfe7 100644
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
index 1434bc0cd0ad91f9ad8b9f394c6a444e4ad390f0..b041dad8a018bc5215037cce189ce796362e0973 100644
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
index 8eaa2d77abcfb5edea60300417de5644cb9edebf..29c473790e4b5d951db0148dfb41c894a5bc5373 100644
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 
 <!--
- Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
index c08965e5b7dc304d7ae419e0f70a377a9d90dd98..0dfe3152b630e6deb3e1450cceb226b3a3ef90b8 100644
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
index 9f0b6417d6c97658e1f3025b399eda849efe092a..7a641becf429f7f44c8bbdf80c9950ad8bfa96ba 100644
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java
index 3de2951e06233b250b79f3b95cc54314d3792442..aeb024c057ce291e71f20267e2dcdd91e893a2de 100644
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
index 1d5eb19c22e43c1fc2852b64bc215b527e599c6b..5f739d9de8af6a76bca1b2fd1de8d23d1b50e737 100644
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java b/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
index 1c035fb0ab1027ab54a63add98de1058c117683c..576a1687f89f1e36f5d5e9a92b49859772227ea2 100644
--- a/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
+++ b/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/api/Messages.java b/src/share/classes/com/sun/tools/javac/api/Messages.java
index bc38794fe2da1fed545fed3135580116839eeb44..ad76d6ce794fc632e556a229b43e846c718e11dc 100644
--- a/src/share/classes/com/sun/tools/javac/api/Messages.java
+++ b/src/share/classes/com/sun/tools/javac/api/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/code/Types.java b/src/share/classes/com/sun/tools/javac/code/Types.java
index cc9c8100069651fc9f623e8024648588b9eea1cc..1726d33b614397d3d0879ade90ae25b822c7a4cc 100644
--- a/src/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/comp/Attr.java b/src/share/classes/com/sun/tools/javac/comp/Attr.java
index a7a4012bea8bb88c054846a432b246ae30dfe4fd..a920623806b03dae78e5e9b1bbc45641002bcff8 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/comp/Check.java b/src/share/classes/com/sun/tools/javac/comp/Check.java
index 911b9d7d46eb901d8aa12cf95d3951ad63be6e21..aa1ac6d101959a370149dce95b7e842a994ecdb8 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/comp/Flow.java b/src/share/classes/com/sun/tools/javac/comp/Flow.java
index 93a08fb8cf818d3ff780a009e03de97d59bc1373..9eb0db6a3911d1cde2975653037a5319856c2166 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/comp/Infer.java b/src/share/classes/com/sun/tools/javac/comp/Infer.java
index 9e0b2582b91f0d36912831035df086af895656ef..a299c6f28bbca1690af124e79690425cf3125ce6 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 8130dfc183eb2cb4962f094edd0e1f440933af00..9eccdfc39567a20f281e8bfbfd2e586bca855fe0 100644
--- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/main/Main.java b/src/share/classes/com/sun/tools/javac/main/Main.java
index 19f9f6e0e9950bc3001d80a30e7dbfe2281876c9..0ae7cd1c6b8d112d79225955ca4314d79e6b70b6 100644
--- a/src/share/classes/com/sun/tools/javac/main/Main.java
+++ b/src/share/classes/com/sun/tools/javac/main/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/main/OptionName.java b/src/share/classes/com/sun/tools/javac/main/OptionName.java
index 61a2d1ba98ee5c7cd07f9bd5a3495dfa37bc8701..18aedd84adc7453f603377cd92bfcd8579b588d0 100644
--- a/src/share/classes/com/sun/tools/javac/main/OptionName.java
+++ b/src/share/classes/com/sun/tools/javac/main/OptionName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java b/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java
index f69f0c1377e83df908be7dd04f9ea54d635ff150..8e0eb888f3197ca105c5a4e13bee237987d4f66c 100644
--- a/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java
+++ b/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
index a1bd2da6e555db89e5f330bc0e1348a882c8593d..e3668716283cffd8aa1d87547b06f14a84fbd57f 100644
--- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java b/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
index 2c266971c452cca9c87515e3222af8f75c6764d4..c80613360d5907a455f81c78a8c87016e1e003f1 100644
--- a/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
+++ b/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/share/classes/com/sun/tools/javac/resources/compiler.properties
index d892db0607761ebb9258b83e6c0bd14c75297a2b..a54253115eed9328e726662795b95d9a71047f13 100644
--- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/resources/javac.properties b/src/share/classes/com/sun/tools/javac/resources/javac.properties
index 4ef8a779c5785ffd99b4cf87c9448303091e0971..62e90966bb5e77d2797ef710dafd6687f506b879 100644
--- a/src/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/tree/JCTree.java b/src/share/classes/com/sun/tools/javac/tree/JCTree.java
index 1509a2999b6fa16559a67e54efa5093a8342eee0..6dc7d37e7c83f31b4cad53a32004654af5a86317 100644
--- a/src/share/classes/com/sun/tools/javac/tree/JCTree.java
+++ b/src/share/classes/com/sun/tools/javac/tree/JCTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java b/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
index 179e284a22c2ed562dc09109d1f431e2034f601a..abf703ea4c4aad0e3cb93061343ed75c410bee37 100644
--- a/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
+++ b/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java b/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
index e3cc45c06e43c8ccf041e79e765c49aed9f53f32..27e5e690141480f87a1fccf1c3831fe940ffffe2 100644
--- a/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
+++ b/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java b/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java
index b6f275f2d46a9404c930c68360ab4ac121895e36..dd4f4dd9e03fa6b1858c87af00566934f43df490 100644
--- a/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java
+++ b/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/util/Log.java b/src/share/classes/com/sun/tools/javac/util/Log.java
index e22f615c3a5497e9ba4a8fe38437818e3d89fa0e..d405de58224508dcde9ff3d07db639f5105d3e67 100644
--- a/src/share/classes/com/sun/tools/javac/util/Log.java
+++ b/src/share/classes/com/sun/tools/javac/util/Log.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java b/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
index db05a732dfeed37985489c2d1617f82209bb456d..b9fa933d750062900c61f3eef2564c87a1cc5dad 100644
--- a/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
+++ b/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java b/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
index e3f065650d1207704272bf79e1fdd194f4646146..6e5e9ba02294b39925542215a7d6ea436c3b603d 100644
--- a/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
+++ b/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/Comment.java b/src/share/classes/com/sun/tools/javadoc/Comment.java
index 6ce71e306002bc7e469cb170bb8dd0cacadcb2d8..e0ac8635c5df114120da9a212c8b64c802860958 100644
--- a/src/share/classes/com/sun/tools/javadoc/Comment.java
+++ b/src/share/classes/com/sun/tools/javadoc/Comment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/DocEnv.java b/src/share/classes/com/sun/tools/javadoc/DocEnv.java
index aeb39bf27587d2b42b8ecfdba6bf4a28cda3b7ee..1d7ae15e1ead7116032ce4f57b0c7a335bcc3b56 100644
--- a/src/share/classes/com/sun/tools/javadoc/DocEnv.java
+++ b/src/share/classes/com/sun/tools/javadoc/DocEnv.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/DocImpl.java b/src/share/classes/com/sun/tools/javadoc/DocImpl.java
index 636f9e852118fad8693ceeea2cc5735b1530464d..2985c7d0c7b265378d8277204d9186f575d37bc6 100644
--- a/src/share/classes/com/sun/tools/javadoc/DocImpl.java
+++ b/src/share/classes/com/sun/tools/javadoc/DocImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java b/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
index 34397953a58430cce985f76e2df0825e47de837b..4bc8902c61d2639daf0993eccdb2d2a5e037f76e 100644
--- a/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
+++ b/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java b/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
index 7647ac032119712f92951f636b71de739b5ad81e..85c887876c5ce205368665526f36d03e97e46780 100644
--- a/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
+++ b/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java b/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
index 4da1e1b819b2976e7d8af3aa874ec8504d9edb38..344ed3b37e8844722a19e2300b0adef81d37f204 100644
--- a/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
+++ b/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java b/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java
index dbda1435c3bf842f09d999bf27eda50a59eba84b..e9bc1e889b76a3b7bb5a848b5ef89343298b600c 100644
--- a/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java
+++ b/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/JavadocTool.java b/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
index 2cb3ab3288d56ea852860fb1dd7a6503a3358cef..21e3747dc6f24a8db8f5db8794b3f17c67acf7f5 100644
--- a/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
+++ b/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/Messager.java b/src/share/classes/com/sun/tools/javadoc/Messager.java
index 4419fc2ea185a7bf74678cdd8810a51c3cdcc7d9..74fe605ba4814e66eff55da858fea98e45a1a5a6 100644
--- a/src/share/classes/com/sun/tools/javadoc/Messager.java
+++ b/src/share/classes/com/sun/tools/javadoc/Messager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java b/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
index 97e1b09b66e56f1e4c4ed2e7de407c0f8ac21ae6..990cda4ed1ca496eea1c39383fb8b5c454c9c3b1 100644
--- a/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
+++ b/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java b/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
index e39f0b3e1d4c55a1b0a0f52b0aa9b880917f888c..945eb0d92d06fd47711d5a9b2d62567e99c58285 100644
--- a/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
+++ b/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java b/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
index 0e666b83f6dd5107777a8883ddb20c93339c6976..e445d3746df36c0ba015ef0105fc5c7648a11064 100644
--- a/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
+++ b/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javadoc/TypeMaker.java b/src/share/classes/com/sun/tools/javadoc/TypeMaker.java
index ec1bb1e800205f831a8945b11578f9cbb601954e..be700da7e191c71f98418aa76fe1482642850720 100644
--- a/src/share/classes/com/sun/tools/javadoc/TypeMaker.java
+++ b/src/share/classes/com/sun/tools/javadoc/TypeMaker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javah/Gen.java b/src/share/classes/com/sun/tools/javah/Gen.java
index 1f0bb5ebd8337122ab0f04feba8af7b99d62fc13..e4b688600d826381267c0aa8b2ed8234cf5b6144 100644
--- a/src/share/classes/com/sun/tools/javah/Gen.java
+++ b/src/share/classes/com/sun/tools/javah/Gen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/com/sun/tools/javap/InternalError.java b/src/share/classes/com/sun/tools/javap/InternalError.java
index cc3903e0f1bfd57cef33ba47bdc4654076913ffd..55d4a56bedb7e414f7c4b56cfd3e17f78bfa0b5b 100644
--- a/src/share/classes/com/sun/tools/javap/InternalError.java
+++ b/src/share/classes/com/sun/tools/javap/InternalError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/share/classes/sun/tools/javap/JavapPrinter.java b/src/share/classes/sun/tools/javap/JavapPrinter.java
index af5978aec267b94ba72c9ebf3c9612aebbbc0993..5f693e7fb2491d124e7f4ede9f88c2e994e9f33a 100644
--- a/src/share/classes/sun/tools/javap/JavapPrinter.java
+++ b/src/share/classes/sun/tools/javap/JavapPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/tools/javac/6668794/badClass/Test.java b/test/tools/javac/6668794/badClass/Test.java
index e78ce5fcc3da087158342203a69356e83465aa80..d111c581ee8197383e9161e33fc434b3df09ed9c 100644
--- a/test/tools/javac/6668794/badClass/Test.java
+++ b/test/tools/javac/6668794/badClass/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/tools/javac/cast/6558559/T6558559a.java b/test/tools/javac/cast/6558559/T6558559a.java
index c440e422f8e25ff78fc8b5b7bdd6d45b5fecc3ab..f02664d4e11297a882db93fa8709771a1364275f 100644
--- a/test/tools/javac/cast/6558559/T6558559a.java
+++ b/test/tools/javac/cast/6558559/T6558559a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/tools/javac/cast/6558559/T6558559b.java b/test/tools/javac/cast/6558559/T6558559b.java
index 9fe993392283969e6acc541f0c74a3883725b360..23cfdae9cc905d75acfde65b2bd53999d389a062 100644
--- a/test/tools/javac/cast/6558559/T6558559b.java
+++ b/test/tools/javac/cast/6558559/T6558559b.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/tools/javac/cast/6665356/T6665356.java b/test/tools/javac/cast/6665356/T6665356.java
index f9db58fa76043e7ae65df746bd05880372834066..92b93d2c5bfa10d844d30f4ee720cb686fb5d0b1 100644
--- a/test/tools/javac/cast/6665356/T6665356.java
+++ b/test/tools/javac/cast/6665356/T6665356.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/tools/javac/generics/6723444/T6723444.java b/test/tools/javac/generics/6723444/T6723444.java
index 4d32ba89c4ee19c9c9b2efd71b214cf15a1db0da..1edc6e593a4ded98137cac6af4184b12fff60b2c 100644
--- a/test/tools/javac/generics/6723444/T6723444.java
+++ b/test/tools/javac/generics/6723444/T6723444.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/tools/javac/generics/6729401/T6729401.java b/test/tools/javac/generics/6729401/T6729401.java
index dc7be410bfc93ad3681770020d434647f6d18d1b..8597e93b57f667703d49d868450d88aac6f3919a 100644
--- a/test/tools/javac/generics/6729401/T6729401.java
+++ b/test/tools/javac/generics/6729401/T6729401.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/tools/javac/generics/rare/6665356/T6665356.java b/test/tools/javac/generics/rare/6665356/T6665356.java
index 8f0949fcba9ff21cf5e46ab3090331f61e6cbca2..cf757c362df7cc08b9cc51eeeb0319ff7733c8ab 100644
--- a/test/tools/javac/generics/rare/6665356/T6665356.java
+++ b/test/tools/javac/generics/rare/6665356/T6665356.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/tools/javac/processing/model/testgetallmembers/Main.java b/test/tools/javac/processing/model/testgetallmembers/Main.java
index e783d29264fb77259e1a935b95ceaa83fcbc3a45..6cb584a084b1cc32e80554ef3deabb7b69bc1670 100644
--- a/test/tools/javac/processing/model/testgetallmembers/Main.java
+++ b/test/tools/javac/processing/model/testgetallmembers/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/tools/javadoc/6176978/T6176978.java b/test/tools/javadoc/6176978/T6176978.java
index 892271a8e3cd7651295af6652c79050176378ec1..9ab98981c82d69c14a2ae728b82864692d80f8f7 100644
--- a/test/tools/javadoc/6176978/T6176978.java
+++ b/test/tools/javadoc/6176978/T6176978.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/tools/javadoc/6176978/X.java b/test/tools/javadoc/6176978/X.java
index 2eb5bf4335b15bdda27ec0935fdfe228e2972d5a..6f5cf090cc3001d94e7127bd4659df2677ecd6fe 100644
--- a/test/tools/javadoc/6176978/X.java
+++ b/test/tools/javadoc/6176978/X.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it