# HG changeset patch
# User tbell
# Date 1253913854 25200
# Node ID 9596dff460935f09684c11d156ce591f92584f0d
# Parent  789ee1acf10771b26a269663b57393f168c6cb6e# Parent  14735c7932d7212f8e265a184b478be206c5e623
Merge

diff -r 789ee1acf107 -r 9596dff46093 src/share/classes/com/sun/tools/javac/code/Type.java
--- a/src/share/classes/com/sun/tools/javac/code/Type.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Type.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 src/share/classes/com/sun/tools/javac/file/BaseFileObject.java
--- a/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
--- a/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 src/share/classes/com/sun/tools/javac/file/RegularFileObject.java
--- a/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 src/share/classes/com/sun/tools/javac/file/SymbolArchive.java
--- a/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 src/share/classes/com/sun/tools/javac/file/ZipArchive.java
--- a/src/share/classes/com/sun/tools/javac/file/ZipArchive.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/file/ZipArchive.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java
--- a/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 src/share/classes/com/sun/tools/javap/JavapTask.java
--- a/src/share/classes/com/sun/tools/javap/JavapTask.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/src/share/classes/com/sun/tools/javap/JavapTask.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 test/com/sun/javadoc/lib/JavadocTester.java
--- a/test/com/sun/javadoc/lib/JavadocTester.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/com/sun/javadoc/lib/JavadocTester.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
--- a/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java
--- a/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java
--- a/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java
--- a/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java	Fri Sep 25 14:24:14 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2004 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 -r 789ee1acf107 -r 9596dff46093 test/com/sun/javadoc/testTaglets/TestTaglets.java
--- a/test/com/sun/javadoc/testTaglets/TestTaglets.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/com/sun/javadoc/testTaglets/TestTaglets.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 test/tools/apt/Basics/apt.sh
--- a/test/tools/apt/Basics/apt.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/apt/Basics/apt.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 2004-2007 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 -r 789ee1acf107 -r 9596dff46093 test/tools/apt/Basics/print.sh
--- a/test/tools/apt/Basics/print.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/apt/Basics/print.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# 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 -r 789ee1acf107 -r 9596dff46093 test/tools/apt/Compile/compile.sh
--- a/test/tools/apt/Compile/compile.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/apt/Compile/compile.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/4846262/Test.sh
--- a/test/tools/javac/4846262/Test.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/4846262/Test.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh -f
 
 #
-# Copyright 2005 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/6302184/T6302184.sh
--- a/test/tools/javac/6302184/T6302184.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/6302184/T6302184.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #! /bin/sh -f
 
 #
-# Copyright 2005-2006 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/6627362/T6627362.java
--- a/test/tools/javac/6627362/T6627362.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/6627362/T6627362.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/ClassPathTest/ClassPathTest.sh
--- a/test/tools/javac/ClassPathTest/ClassPathTest.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/ClassPathTest/ClassPathTest.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 1999-2003 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/ExtDirs/ExtDirs.sh
--- a/test/tools/javac/ExtDirs/ExtDirs.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/ExtDirs/ExtDirs.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 1999-2004 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/MissingInclude.sh
--- a/test/tools/javac/MissingInclude.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/MissingInclude.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 2001-2002 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
--- a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 1998-2003 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/T5090006/compiler.sh
--- a/test/tools/javac/T5090006/compiler.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/T5090006/compiler.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/api/6440333/T6440333.java
--- a/test/tools/javac/api/6440333/T6440333.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/api/6440333/T6440333.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/api/Sibling.java
--- a/test/tools/javac/api/Sibling.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/api/Sibling.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/code/ArrayClone.java
--- a/test/tools/javac/code/ArrayClone.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/code/ArrayClone.java	Fri Sep 25 14:24:14 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/constDebug/ConstDebug.sh
--- a/test/tools/javac/constDebug/ConstDebug.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/constDebug/ConstDebug.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 2002-2003 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/fatalErrors/NoJavaLang.sh
--- a/test/tools/javac/fatalErrors/NoJavaLang.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/fatalErrors/NoJavaLang.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 1999-2005 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/generics/inference/6302954/T6476073.java
--- a/test/tools/javac/generics/inference/6302954/T6476073.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/generics/inference/6302954/T6476073.java	Fri Sep 25 14:24:14 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/innerClassFile/Driver.sh
--- a/test/tools/javac/innerClassFile/Driver.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/innerClassFile/Driver.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 2002 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/javazip/Test.sh
--- a/test/tools/javac/javazip/Test.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/javazip/Test.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #! /bin/sh -f
 
 #
-# Copyright 2005-2006 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/meth/MakeNegTests.sh
--- a/test/tools/javac/meth/MakeNegTests.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/meth/MakeNegTests.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/newlines/Newlines.sh
--- a/test/tools/javac/newlines/Newlines.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/newlines/Newlines.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/quid/MakeNegTests.sh
--- a/test/tools/javac/quid/MakeNegTests.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/quid/MakeNegTests.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/quid/QuotedIdent.java
--- a/test/tools/javac/quid/QuotedIdent.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/quid/QuotedIdent.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/quid/QuotedIdent2.java
--- a/test/tools/javac/quid/QuotedIdent2.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/quid/QuotedIdent2.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/stackmap/T4955930.sh
--- a/test/tools/javac/stackmap/T4955930.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/stackmap/T4955930.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 2005-2006 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javac/unicode/SupplementaryJavaID6.sh
--- a/test/tools/javac/unicode/SupplementaryJavaID6.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javac/unicode/SupplementaryJavaID6.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javah/6257087/foo.sh
--- a/test/tools/javah/6257087/foo.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javah/6257087/foo.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #! /bin/sh -f
 
 #
-# Copyright 2006-2007 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javah/ConstMacroTest.sh
--- a/test/tools/javah/ConstMacroTest.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javah/ConstMacroTest.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 2003-2007 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javah/MissingParamClassTest.sh
--- a/test/tools/javah/MissingParamClassTest.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javah/MissingParamClassTest.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 2003-2007 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javah/ReadOldClass.sh
--- a/test/tools/javah/ReadOldClass.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javah/ReadOldClass.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 2005-2007 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javap/T4975569.java
--- a/test/tools/javap/T4975569.java	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javap/T4975569.java	Fri Sep 25 14:24:14 2009 -0700
@@ -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 -r 789ee1acf107 -r 9596dff46093 test/tools/javap/pathsep.sh
--- a/test/tools/javap/pathsep.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javap/pathsep.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 2003-2007 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 -r 789ee1acf107 -r 9596dff46093 test/tools/javap/stackmap/T6271292.sh
--- a/test/tools/javap/stackmap/T6271292.sh	Mon Sep 21 21:08:11 2009 -0700
+++ b/test/tools/javap/stackmap/T6271292.sh	Fri Sep 25 14:24:14 2009 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright 2005-2007 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