changeset 404:ed31953ca025

6875336: some tests should use /nodynamiccopyright/ Reviewed-by: darcy
author jjg
date Thu, 27 Aug 2009 11:08:27 -0700
parents 8109aa93b212
children 74760fd5197f
files test/tools/javac/6521805/T6521805a.java test/tools/javac/6521805/T6521805a_1.out test/tools/javac/6521805/T6521805a_2.out test/tools/javac/6521805/T6521805d.java test/tools/javac/6521805/T6521805d.out test/tools/javac/6717241/T6717241a.java test/tools/javac/6717241/T6717241a.out test/tools/javac/6717241/T6717241b.java test/tools/javac/6717241/T6717241b.out test/tools/javac/6734819/T6734819c.java test/tools/javac/6734819/T6734819c.out test/tools/javac/6758789/T6758789a.java test/tools/javac/6758789/T6758789a.out test/tools/javac/6758789/T6758789b.java test/tools/javac/6758789/T6758789b.out test/tools/javac/6840059/T6840059.java test/tools/javac/6840059/T6840059.out test/tools/javac/Diagnostics/6722234/T6722234a.java test/tools/javac/Diagnostics/6722234/T6722234a_1.out test/tools/javac/Diagnostics/6722234/T6722234a_2.out test/tools/javac/Diagnostics/6722234/T6722234b.java test/tools/javac/Diagnostics/6722234/T6722234b_1.out test/tools/javac/Diagnostics/6722234/T6722234b_2.out test/tools/javac/Diagnostics/6722234/T6722234c.java test/tools/javac/Diagnostics/6722234/T6722234c.out test/tools/javac/Diagnostics/6722234/T6722234d.java test/tools/javac/Diagnostics/6722234/T6722234d_1.out test/tools/javac/Diagnostics/6722234/T6722234d_2.out test/tools/javac/Diagnostics/6799605/T6799605.java test/tools/javac/Diagnostics/6799605/T6799605.out test/tools/javac/Diagnostics/6860795/T6860795.java test/tools/javac/Diagnostics/6860795/T6860795.out test/tools/javac/Diagnostics/6862608/T6862608a.java test/tools/javac/Diagnostics/6862608/T6862608a.out test/tools/javac/Diagnostics/6862608/T6862608b.java test/tools/javac/Diagnostics/6862608/T6862608b.out test/tools/javac/Diagnostics/6864382/T6864382.java test/tools/javac/Diagnostics/6864382/T6864382.out test/tools/javac/OverrideChecks/6199153/T6199153.java test/tools/javac/OverrideChecks/6199153/T6199153.out test/tools/javac/OverrideChecks/6400189/T6400189a.java test/tools/javac/OverrideChecks/6400189/T6400189a.out test/tools/javac/OverrideChecks/6400189/T6400189b.java test/tools/javac/OverrideChecks/6400189/T6400189b.out test/tools/javac/cast/6467183/T6467183a.java test/tools/javac/cast/6467183/T6467183a.out test/tools/javac/cast/6557182/T6557182.java test/tools/javac/cast/6557182/T6557182.out test/tools/javac/cast/6665356/T6665356.java test/tools/javac/cast/6665356/T6665356.out test/tools/javac/cast/6795580/T6795580.java test/tools/javac/cast/6795580/T6795580.out test/tools/javac/generics/5009937/T5009937.java test/tools/javac/generics/5009937/T5009937.out test/tools/javac/generics/6182950/T6182950a.java test/tools/javac/generics/6182950/T6182950a.out test/tools/javac/generics/6182950/T6182950b.java test/tools/javac/generics/6182950/T6182950b.out test/tools/javac/generics/6677785/T6677785.java test/tools/javac/generics/6677785/T6677785.out test/tools/javac/generics/6711619/T6711619a.java test/tools/javac/generics/6711619/T6711619a.out test/tools/javac/generics/6711619/T6711619b.java test/tools/javac/generics/6711619/T6711619b.out test/tools/javac/generics/6723444/T6723444.java test/tools/javac/generics/6723444/T6723444.out test/tools/javac/generics/inference/6315770/T6315770.java test/tools/javac/generics/inference/6315770/T6315770.out test/tools/javac/generics/inference/6611449/T6611449.java test/tools/javac/generics/inference/6611449/T6611449.out test/tools/javac/generics/inference/6638712/T6638712a.java test/tools/javac/generics/inference/6638712/T6638712a.out test/tools/javac/generics/inference/6638712/T6638712b.java test/tools/javac/generics/inference/6638712/T6638712b.out test/tools/javac/generics/inference/6638712/T6638712c.java test/tools/javac/generics/inference/6638712/T6638712c.out test/tools/javac/generics/inference/6638712/T6638712d.java test/tools/javac/generics/inference/6638712/T6638712d.out test/tools/javac/generics/inference/6638712/T6638712e.java test/tools/javac/generics/inference/6638712/T6638712e.out test/tools/javac/generics/inference/6718364/T6718364.java test/tools/javac/generics/inference/6718364/T6718364.out test/tools/javac/generics/rare/6665356/T6665356.java test/tools/javac/generics/rare/6665356/T6665356.out test/tools/javac/generics/typevars/6569404/T6569404b.java test/tools/javac/generics/typevars/6569404/T6569404b.out test/tools/javac/generics/typevars/6680106/T6680106.java test/tools/javac/generics/typevars/6680106/T6680106.out test/tools/javac/generics/typevars/6804733/T6804733.java test/tools/javac/generics/typevars/6804733/T6804733.out test/tools/javac/typeAnnotations/failures/AnnotationVersion.java test/tools/javac/typeAnnotations/failures/AnnotationVersion.out test/tools/javac/typeAnnotations/failures/IncompleteArray.java test/tools/javac/typeAnnotations/failures/IncompleteArray.out test/tools/javac/typeAnnotations/failures/IncompleteVararg.java test/tools/javac/typeAnnotations/failures/IncompleteVararg.out test/tools/javac/typeAnnotations/failures/IndexArray.java test/tools/javac/typeAnnotations/failures/IndexArray.out test/tools/javac/typeAnnotations/failures/LintCast.java test/tools/javac/typeAnnotations/failures/LintCast.out test/tools/javac/typeAnnotations/failures/Scopes.java test/tools/javac/typeAnnotations/failures/Scopes.out test/tools/javac/typeAnnotations/failures/StaticFields.java test/tools/javac/typeAnnotations/failures/StaticFields.out test/tools/javac/typeAnnotations/failures/StaticMethods.java test/tools/javac/typeAnnotations/failures/StaticMethods.out test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.java test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.out test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.java test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.out test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.out test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.java test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.out test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.java test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.out test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.java test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.out test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.java test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.out test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.java test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.out test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.java test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.out test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out test/tools/javac/typeAnnotations/failures/target/Constructor.java test/tools/javac/typeAnnotations/failures/target/Constructor.out test/tools/javac/typeAnnotations/failures/target/IncompleteArray.java test/tools/javac/typeAnnotations/failures/target/IncompleteArray.out test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.java test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.out test/tools/javac/typeAnnotations/failures/target/NotTypeUse.java test/tools/javac/typeAnnotations/failures/target/NotTypeUse.out test/tools/javac/typeAnnotations/failures/target/VoidMethod.java test/tools/javac/typeAnnotations/failures/target/VoidMethod.out test/tools/javac/varargs/6806876/T6806876.java test/tools/javac/varargs/6806876/T6806876.out test/tools/javac/warnings/6747671/T6747671.java test/tools/javac/warnings/6747671/T6747671.out
diffstat 200 files changed, 293 insertions(+), 2547 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/javac/6521805/T6521805a.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6521805/T6521805a.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6521805
  * @summary Regression: JDK5/JDK6 javac allows write access to outer class reference
  * @author mcimadamore
--- a/test/tools/javac/6521805/T6521805a_1.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6521805/T6521805a_1.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6521805a.java:40:12: compiler.err.synthetic.name.conflict: this$0, T6521805a.Outer
+T6521805a.java:17:12: compiler.err.synthetic.name.conflict: this$0, T6521805a.Outer
 1 error
--- a/test/tools/javac/6521805/T6521805a_2.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6521805/T6521805a_2.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6521805a.java:40:12: compiler.warn.synthetic.name.conflict: this$0, T6521805a.Outer
+T6521805a.java:17:12: compiler.warn.synthetic.name.conflict: this$0, T6521805a.Outer
 1 warning
--- a/test/tools/javac/6521805/T6521805d.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6521805/T6521805d.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6521805
  * @summary Regression: JDK5/JDK6 javac allows write access to outer class reference
  * @author mcimadamore
--- a/test/tools/javac/6521805/T6521805d.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6521805/T6521805d.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6521805d.java:41:18: compiler.err.synthetic.name.conflict: this$0, T6521805.Inner
+T6521805d.java:18:18: compiler.err.synthetic.name.conflict: this$0, T6521805.Inner
 1 error
--- a/test/tools/javac/6717241/T6717241a.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6717241/T6717241a.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6717241
  * @summary some diagnostic argument is prematurely converted into a String object
  * @author  Maurizio Cimadamore
--- a/test/tools/javac/6717241/T6717241a.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6717241/T6717241a.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,4 +1,4 @@
-T6717241a.java:36:21: compiler.err.cant.resolve: kindname.variable, v, , 
-T6717241a.java:38:10: compiler.err.cant.resolve.args: kindname.method, m1, , int,java.lang.String
-T6717241a.java:40:10: compiler.err.cant.resolve.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String
+T6717241a.java:13:21: compiler.err.cant.resolve: kindname.variable, v, , 
+T6717241a.java:15:10: compiler.err.cant.resolve.args: kindname.method, m1, , int,java.lang.String
+T6717241a.java:17:10: compiler.err.cant.resolve.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String
 3 errors
--- a/test/tools/javac/6717241/T6717241b.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6717241/T6717241b.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6717241
  * @summary some diagnostic argument is prematurely converted into a String object
  * @author  Maurizio Cimadamore
--- a/test/tools/javac/6717241/T6717241b.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6717241/T6717241b.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,4 +1,4 @@
-T6717241b.java:35:20: compiler.err.cant.resolve.location: kindname.variable, v, , , kindname.class, T6717241b
-T6717241b.java:37:9: compiler.err.cant.resolve.location.args: kindname.method, m1, , int,java.lang.String, kindname.class, T6717241b
-T6717241b.java:39:18: compiler.err.cant.resolve.location.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String, kindname.class, T6717241b
+T6717241b.java:12:20: compiler.err.cant.resolve.location: kindname.variable, v, , , kindname.class, T6717241b
+T6717241b.java:14:9: compiler.err.cant.resolve.location.args: kindname.method, m1, , int,java.lang.String, kindname.class, T6717241b
+T6717241b.java:16:18: compiler.err.cant.resolve.location.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String, kindname.class, T6717241b
 3 errors
--- a/test/tools/javac/6734819/T6734819c.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6734819/T6734819c.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6734819
  * @summary Javac performs flows analysis on already translated classes
  * @author Maurizio Cimadamore
--- a/test/tools/javac/6734819/T6734819c.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6734819/T6734819c.out	Thu Aug 27 11:08:27 2009 -0700
@@ -4,5 +4,5 @@
 [flow W]
 [attribute Z]
 [flow Z]
-T6734819c.java:38:11: compiler.err.unreachable.stmt
+T6734819c.java:15:11: compiler.err.unreachable.stmt
 1 error
--- a/test/tools/javac/6758789/T6758789a.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6758789/T6758789a.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6758789
  * @summary 6758789: Some method resolution diagnostic should be improved
  * @author Maurizio Cimadamore
--- a/test/tools/javac/6758789/T6758789a.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6758789/T6758789a.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,3 +1,3 @@
-T6758789a.java:37:9: compiler.err.cant.apply.symbol: kindname.method, m1, compiler.misc.no.args, int, kindname.class, T6758789a, null
-T6758789a.java:38:9: compiler.err.cant.apply.symbol: kindname.method, m2, int, compiler.misc.no.args, kindname.class, T6758789a, null
-2 errors
\ No newline at end of file
+T6758789a.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m1, compiler.misc.no.args, int, kindname.class, T6758789a, null
+T6758789a.java:15:9: compiler.err.cant.apply.symbol: kindname.method, m2, int, compiler.misc.no.args, kindname.class, T6758789a, null
+2 errors
--- a/test/tools/javac/6758789/T6758789b.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6758789/T6758789b.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6758789
  * @summary 6758789: Some method resolution diagnostic should be improved
  * @author Maurizio Cimadamore
--- a/test/tools/javac/6758789/T6758789b.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6758789/T6758789b.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,5 +1,5 @@
-T6758789b.java:39:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X>
-T6758789b.java:39:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a
+T6758789b.java:16:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X>
+T6758789b.java:16:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a
 - compiler.err.warnings.and.werror
 1 error
 2 warnings
--- a/test/tools/javac/6840059/T6840059.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6840059/T6840059.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6840059
  * @summary 6758789: Some method resolution diagnostic should be improved
  * @author Maurizio Cimadamore
--- a/test/tools/javac/6840059/T6840059.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/6840059/T6840059.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,3 +1,3 @@
-T6840059.java:38:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , java.lang.String, kindname.class, T6840059
-T6840059.java:38:25: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , , kindname.class, T6840059
+T6840059.java:15:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , java.lang.String, kindname.class, T6840059
+T6840059.java:15:25: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , , kindname.class, T6840059
 2 errors
--- a/test/tools/javac/Diagnostics/6722234/T6722234a.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6722234/T6722234a.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6722234
  * @summary javac diagnostics need better integration with the type-system
  * @author  mcimadamore
--- a/test/tools/javac/Diagnostics/6722234/T6722234a_1.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6722234/T6722234a_1.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6722234a.java:35:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
+T6722234a.java:12:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
 1 error
--- a/test/tools/javac/Diagnostics/6722234/T6722234a_2.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6722234/T6722234a_2.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,3 +1,3 @@
-T6722234a.java:35:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
+T6722234a.java:12:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
 - compiler.misc.where.description.typevar.1: compiler.misc.type.var: T, 1,compiler.misc.type.var: T, 2,{(compiler.misc.where.typevar: compiler.misc.type.var: T, 1, java.lang.String, kindname.class, T6722234a),(compiler.misc.where.typevar: compiler.misc.type.var: T, 2, java.lang.Integer, kindname.method, <compiler.misc.type.var: T, 2>test(compiler.misc.type.var: T, 2))}
 1 error
--- a/test/tools/javac/Diagnostics/6722234/T6722234b.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6722234/T6722234b.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6722234
  * @summary javac diagnostics need better integration with the type-system
  * @author  mcimadamore
--- a/test/tools/javac/Diagnostics/6722234/T6722234b_1.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6722234/T6722234b_1.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6722234b.java:39:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.type.captureof: 1, ? extends T6722234b>,List<compiler.misc.type.captureof: 2, ? extends T6722234b>, kindname.class, T6722234b, null
+T6722234b.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.type.captureof: 1, ? extends T6722234b>,List<compiler.misc.type.captureof: 2, ? extends T6722234b>, kindname.class, T6722234b, null
 1 error
--- a/test/tools/javac/Diagnostics/6722234/T6722234b_2.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6722234/T6722234b_2.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,4 +1,4 @@
-T6722234b.java:39:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.captured.type: 1>,List<compiler.misc.captured.type: 2>, kindname.class, T6722234b, null
+T6722234b.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.captured.type: 1>,List<compiler.misc.captured.type: 2>, kindname.class, T6722234b, null
 - compiler.misc.where.description.typevar: T,{(compiler.misc.where.typevar: T, Object, kindname.method, <T>m(List<T>,List<T>))}
 - compiler.misc.where.description.captured.1: compiler.misc.captured.type: 1,compiler.misc.captured.type: 2,{(compiler.misc.where.captured.1: compiler.misc.captured.type: 1, T6722234b, compiler.misc.type.null, ? extends T6722234b),(compiler.misc.where.captured.1: compiler.misc.captured.type: 2, T6722234b, compiler.misc.type.null, ? extends T6722234b)}
 1 error
--- a/test/tools/javac/Diagnostics/6722234/T6722234c.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6722234/T6722234c.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6722234
  * @summary javac diagnostics need better integration with the type-system
  * @author  mcimadamore
--- a/test/tools/javac/Diagnostics/6722234/T6722234c.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6722234/T6722234c.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6722234c.java:37:9: compiler.err.cant.apply.symbol: kindname.method, m, T6722234c.String, java.lang.String, kindname.class, T6722234c, null
+T6722234c.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m, T6722234c.String, java.lang.String, kindname.class, T6722234c, null
 1 error
--- a/test/tools/javac/Diagnostics/6722234/T6722234d.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6722234/T6722234d.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6722234
  * @summary javac diagnostics need better integration with the type-system
  * @author  mcimadamore
--- a/test/tools/javac/Diagnostics/6722234/T6722234d_1.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6722234/T6722234d_1.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,3 +1,3 @@
-T6722234d.java:41:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
+T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
 - compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, java.lang.Object,T6722234d.I1,T6722234d.I2)}
 1 error
--- a/test/tools/javac/Diagnostics/6722234/T6722234d_2.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6722234/T6722234d_2.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,3 +1,3 @@
-T6722234d.java:41:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
+T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
 - compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, Object,I1,I2)}
 1 error
--- a/test/tools/javac/Diagnostics/6799605/T6799605.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6799605/T6799605.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6799605
  * @summary Basic/Raw formatters should use type/symbol printer instead of toString()
  * @author  mcimadamore
--- a/test/tools/javac/Diagnostics/6799605/T6799605.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6799605/T6799605.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,4 +1,4 @@
-T6799605.java:40:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>, kindname.class, T6799605<X>
-T6799605.java:41:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>, kindname.class, T6799605<X>
-T6799605.java:42:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,T6799605<compiler.misc.type.captureof: 3, ?>, kindname.class, T6799605<X>
+T6799605.java:17:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>, kindname.class, T6799605<X>
+T6799605.java:18:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>, kindname.class, T6799605<X>
+T6799605.java:19:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,T6799605<compiler.misc.type.captureof: 3, ?>, kindname.class, T6799605<X>
 3 errors
--- a/test/tools/javac/Diagnostics/6860795/T6860795.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6860795/T6860795.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6860795
  * @summary NullPointerException when compiling a negative java source
  * @author  mcimadamore
--- a/test/tools/javac/Diagnostics/6860795/T6860795.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6860795/T6860795.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6860795.java:33:27: compiler.err.already.defined: x, foo
+T6860795.java:10:27: compiler.err.already.defined: x, foo
 1 error
--- a/test/tools/javac/Diagnostics/6862608/T6862608a.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6862608/T6862608a.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6862608
  * @summary rich diagnostic sometimes contain wrong type variable numbering
  * @author  mcimadamore
--- a/test/tools/javac/Diagnostics/6862608/T6862608a.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6862608/T6862608a.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,3 +1,3 @@
-T6862608a.java:42:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
+T6862608a.java:19:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
 - compiler.misc.where.description.typevar: T,{(compiler.misc.where.typevar: T, java.lang.Object, kindname.method, <T>compound(java.lang.Iterable<? extends java.util.Comparator<? super T>>))}
 1 error
--- a/test/tools/javac/Diagnostics/6862608/T6862608b.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6862608/T6862608b.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6862608
  * @summary rich diagnostic sometimes contain wrong type variable numbering
  * @author  mcimadamore
--- a/test/tools/javac/Diagnostics/6862608/T6862608b.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6862608/T6862608b.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,3 +1,3 @@
-T6862608b.java:34:7: compiler.err.cant.apply.symbol: kindname.method, test, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T66862608b<compiler.misc.type.var: T, 1,compiler.misc.type.var: S, 2>, null
+T6862608b.java:11:7: compiler.err.cant.apply.symbol: kindname.method, test, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T66862608b<compiler.misc.type.var: T, 1,compiler.misc.type.var: S, 2>, null
 - compiler.misc.where.description.typevar.1: compiler.misc.type.var: T, 1,compiler.misc.type.var: T, 2,compiler.misc.type.var: S, 1,compiler.misc.type.var: S, 2,{(compiler.misc.where.typevar: compiler.misc.type.var: T, 1, java.lang.String, kindname.class, T66862608b),(compiler.misc.where.typevar: compiler.misc.type.var: T, 2, compiler.misc.type.var: S, 1, kindname.method, <compiler.misc.type.var: S, 1,compiler.misc.type.var: T, 2>foo(compiler.misc.type.var: T, 2)),(compiler.misc.where.typevar: compiler.misc.type.var: S, 1, java.lang.Object, kindname.method, <compiler.misc.type.var: S, 1,compiler.misc.type.var: T, 2>foo(compiler.misc.type.var: T, 2)),(compiler.misc.where.typevar: compiler.misc.type.var: S, 2, java.lang.Object, kindname.class, T66862608b)}
 1 error
--- a/test/tools/javac/Diagnostics/6864382/T6864382.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6864382/T6864382.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6864382
  * @summary NullPointerException when compiling a negative java source
  * @author  mcimadamore
--- a/test/tools/javac/Diagnostics/6864382/T6864382.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/Diagnostics/6864382/T6864382.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6864382.java:32:27: compiler.err.type.found.req: (compiler.misc.type.parameter: T), (compiler.misc.type.req.class)
+T6864382.java:9:27: compiler.err.type.found.req: (compiler.misc.type.parameter: T), (compiler.misc.type.req.class)
 1 error
--- a/test/tools/javac/OverrideChecks/6199153/T6199153.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/OverrideChecks/6199153/T6199153.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6199153
  * @summary Generic throws and overriding
  * @author  mcimadamore
--- a/test/tools/javac/OverrideChecks/6199153/T6199153.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/OverrideChecks/6199153/T6199153.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,4 +1,4 @@
-T6199153.java:41:21: compiler.warn.override.unchecked.thrown: (compiler.misc.cant.override: m(), T6199153.B, <T>m(), T6199153.A), java.io.IOException
+T6199153.java:18:21: compiler.warn.override.unchecked.thrown: (compiler.misc.cant.override: m(), T6199153.B, <T>m(), T6199153.A), java.io.IOException
 - compiler.err.warnings.and.werror
 1 error
 1 warning
--- a/test/tools/javac/OverrideChecks/6400189/T6400189a.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/OverrideChecks/6400189/T6400189a.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6400189
  * @summary raw types and inference
  * @author  mcimadamore
--- a/test/tools/javac/OverrideChecks/6400189/T6400189a.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/OverrideChecks/6400189/T6400189a.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,4 +1,4 @@
-T6400189a.java:37:35: compiler.warn.unchecked.call.mbr.of.raw.type: <T>getAnnotation(java.lang.Class<T>), java.lang.reflect.Constructor
-T6400189a.java:37:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.annotation.Annotation, java.lang.annotation.Documented
+T6400189a.java:14:35: compiler.warn.unchecked.call.mbr.of.raw.type: <T>getAnnotation(java.lang.Class<T>), java.lang.reflect.Constructor
+T6400189a.java:14:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.annotation.Annotation, java.lang.annotation.Documented
 1 error
 1 warning
--- a/test/tools/javac/OverrideChecks/6400189/T6400189b.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/OverrideChecks/6400189/T6400189b.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6400189
  * @summary raw types and inference
  * @author  mcimadamore
--- a/test/tools/javac/OverrideChecks/6400189/T6400189b.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/OverrideChecks/6400189/T6400189b.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,4 +1,4 @@
-T6400189b.java:47:24: compiler.warn.unchecked.call.mbr.of.raw.type: <T>m(T6400189b<T>), T6400189b.B
-T6400189b.java:47:24: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.Object, java.lang.Integer
+T6400189b.java:24:24: compiler.warn.unchecked.call.mbr.of.raw.type: <T>m(T6400189b<T>), T6400189b.B
+T6400189b.java:24:24: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.Object, java.lang.Integer
 1 error
 1 warning
--- a/test/tools/javac/cast/6467183/T6467183a.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/cast/6467183/T6467183a.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @author mcimadamore
  * @bug     6467183
  * @summary
--- a/test/tools/javac/cast/6467183/T6467183a.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/cast/6467183/T6467183a.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,6 +1,6 @@
-T6467183a.java:39:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.B, T6467183a<T>.A<T>
-T6467183a.java:47:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Number>
-T6467183a.java:51:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Integer>
+T6467183a.java:16:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.B, T6467183a<T>.A<T>
+T6467183a.java:24:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Number>
+T6467183a.java:28:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Integer>
 - compiler.err.warnings.and.werror
 1 error
 3 warnings
--- a/test/tools/javac/cast/6557182/T6557182.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/cast/6557182/T6557182.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @author Maurizio Cimadamore
  * @bug     6557182
  * @summary  Unchecked warning *and* inconvertible types
--- a/test/tools/javac/cast/6557182/T6557182.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/cast/6557182/T6557182.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,4 +1,4 @@
-T6557182.java:35:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T, java.lang.Comparable<java.lang.Integer>
-T6557182.java:39:56: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
+T6557182.java:12:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T, java.lang.Comparable<java.lang.Integer>
+T6557182.java:16:56: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
 1 error
 1 warning
--- a/test/tools/javac/cast/6665356/T6665356.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/cast/6665356/T6665356.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @author Maurizio Cimadamore
  * @bug     6665356
  * @summary Cast not allowed when both qualifying type and inner class are parameterized
@@ -77,4 +54,4 @@
     void cast11(Outer<Integer>.Inner<Long> p) {
         Object o = (Outer<Integer>.Inner<? super String>)p;
     }
-}
\ No newline at end of file
+}
--- a/test/tools/javac/cast/6665356/T6665356.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/cast/6665356/T6665356.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,8 +1,8 @@
-T6665356.java:54:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<java.lang.Long>
-T6665356.java:58:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.Number>
-T6665356.java:62:65: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>
-T6665356.java:66:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? extends java.lang.String>.Inner<java.lang.Long>
-T6665356.java:70:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? extends java.lang.String>
-T6665356.java:74:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.String>.Inner<java.lang.Long>
-T6665356.java:78:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.String>
-7 errors
\ No newline at end of file
+T6665356.java:31:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<java.lang.Long>
+T6665356.java:35:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.Number>
+T6665356.java:39:65: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>
+T6665356.java:43:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? extends java.lang.String>.Inner<java.lang.Long>
+T6665356.java:47:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? extends java.lang.String>
+T6665356.java:51:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.String>.Inner<java.lang.Long>
+T6665356.java:55:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.String>
+7 errors
--- a/test/tools/javac/cast/6795580/T6795580.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/cast/6795580/T6795580.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @author Maurizio Cimadamore
  * @bug     6795580
  * @summary parser confused by square brackets in qualified generic cast
@@ -77,4 +54,4 @@
     void cast11(Outer<Integer>.Inner<Long>[] p) {
         Object o = (Outer<Integer>.Inner<? super String>[])p;
     }
-}
\ No newline at end of file
+}
--- a/test/tools/javac/cast/6795580/T6795580.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/cast/6795580/T6795580.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,8 +1,8 @@
-T6795580.java:54:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<java.lang.Long>[]
-T6795580.java:58:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.Number>[]
-T6795580.java:62:67: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>[]
-T6795580.java:66:59: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? extends java.lang.String>.Inner<java.lang.Long>[]
-T6795580.java:70:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? extends java.lang.String>[]
-T6795580.java:74:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.String>.Inner<java.lang.Long>[]
-T6795580.java:78:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.String>[]
+T6795580.java:31:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<java.lang.Long>[]
+T6795580.java:35:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.Number>[]
+T6795580.java:39:67: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>[]
+T6795580.java:43:59: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? extends java.lang.String>.Inner<java.lang.Long>[]
+T6795580.java:47:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? extends java.lang.String>[]
+T6795580.java:51:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.String>.Inner<java.lang.Long>[]
+T6795580.java:55:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.String>[]
 7 errors
--- a/test/tools/javac/generics/5009937/T5009937.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/5009937/T5009937.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 5009937
  * @summary hiding versus generics versus binary compatibility
  * @author Maurizio Cimadamore
--- a/test/tools/javac/generics/5009937/T5009937.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/5009937/T5009937.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T5009937.java:39:21: compiler.err.name.clash.same.erasure.no.override: m(T5009937<java.lang.Integer>), T5009937.B, m(T5009937<java.lang.String>), T5009937.A
+T5009937.java:16:21: compiler.err.name.clash.same.erasure.no.override: m(T5009937<java.lang.Integer>), T5009937.B, m(T5009937<java.lang.String>), T5009937.A
 1 error
--- a/test/tools/javac/generics/6182950/T6182950a.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/6182950/T6182950a.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6182950
  * @summary methods clash algorithm should not depend on return type
  * @author  mcimadamore
--- a/test/tools/javac/generics/6182950/T6182950a.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/6182950/T6182950a.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6182950a.java:35:12: compiler.err.name.clash.same.erasure: m(java.util.List<java.lang.Integer>), m(java.util.List<java.lang.String>)
+T6182950a.java:12:12: compiler.err.name.clash.same.erasure: m(java.util.List<java.lang.Integer>), m(java.util.List<java.lang.String>)
 1 error
--- a/test/tools/javac/generics/6182950/T6182950b.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/6182950/T6182950b.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6182950
  * @summary methods clash algorithm should not depend on return type
  * @author  mcimadamore
--- a/test/tools/javac/generics/6182950/T6182950b.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/6182950/T6182950b.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6182950b.java:38:16: compiler.err.name.clash.same.erasure.no.override: m(java.util.List<java.lang.Integer>), T6182950b.B, m(java.util.List<java.lang.String>), T6182950b.A
+T6182950b.java:15:16: compiler.err.name.clash.same.erasure.no.override: m(java.util.List<java.lang.Integer>), T6182950b.B, m(java.util.List<java.lang.String>), T6182950b.A
 1 error
--- a/test/tools/javac/generics/6677785/T6677785.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/6677785/T6677785.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6677785
  * @summary REGRESSION: StackOverFlowError with Cyclic Class level Type Parameters when used in constructors
  * @author Maurizio Cimadamore
--- a/test/tools/javac/generics/6677785/T6677785.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/6677785/T6677785.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6677785.java:31:23: compiler.err.cyclic.inheritance: E
+T6677785.java:8:23: compiler.err.cyclic.inheritance: E
 1 error
--- a/test/tools/javac/generics/6711619/T6711619a.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/6711619/T6711619a.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6711619
  *
  * @summary javac doesn't allow access to protected members in intersection types
@@ -71,4 +48,4 @@
         ta = arg.w.a;
         tb = arg.w.b;
     }
-}
\ No newline at end of file
+}
--- a/test/tools/javac/generics/6711619/T6711619a.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/6711619/T6711619a.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,7 +1,7 @@
-T6711619a.java:63:14: compiler.err.cant.resolve.args: kindname.method, a, , 
-T6711619a.java:64:14: compiler.err.cant.resolve.args: kindname.method, b, , 
-T6711619a.java:69:19: compiler.err.report.access: a, private, T6711619a.A
-T6711619a.java:70:19: compiler.err.report.access: b, private, T6711619a.B
-T6711619a.java:71:19: compiler.err.report.access: a, private, T6711619a.A
-T6711619a.java:72:19: compiler.err.report.access: b, private, T6711619a.B
+T6711619a.java:40:14: compiler.err.cant.resolve.args: kindname.method, a, , 
+T6711619a.java:41:14: compiler.err.cant.resolve.args: kindname.method, b, , 
+T6711619a.java:46:19: compiler.err.report.access: a, private, T6711619a.A
+T6711619a.java:47:19: compiler.err.report.access: b, private, T6711619a.B
+T6711619a.java:48:19: compiler.err.report.access: a, private, T6711619a.A
+T6711619a.java:49:19: compiler.err.report.access: b, private, T6711619a.B
 6 errors
--- a/test/tools/javac/generics/6711619/T6711619b.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/6711619/T6711619b.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6711619
  *
  * @summary javac doesn't allow access to protected members in intersection types
@@ -61,4 +38,4 @@
              return E.i;
          }
     }
-}
\ No newline at end of file
+}
--- a/test/tools/javac/generics/6711619/T6711619b.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/6711619/T6711619b.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,5 +1,5 @@
-T6711619b.java:39:22: compiler.err.report.access: i, private, T6711619b.X1
-T6711619b.java:46:22: compiler.err.report.access: i, private, T6711619b.X2
-T6711619b.java:54:22: compiler.err.report.access: i, private, T6711619b.X3
-T6711619b.java:61:22: compiler.err.report.access: i, private, T6711619b.X4
+T6711619b.java:16:22: compiler.err.report.access: i, private, T6711619b.X1
+T6711619b.java:23:22: compiler.err.report.access: i, private, T6711619b.X2
+T6711619b.java:31:22: compiler.err.report.access: i, private, T6711619b.X3
+T6711619b.java:38:22: compiler.err.report.access: i, private, T6711619b.X4
 4 errors
--- a/test/tools/javac/generics/6723444/T6723444.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/6723444/T6723444.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6723444
  *
  * @summary javac fails to substitute type variables into a constructor's throws clause
--- a/test/tools/javac/generics/6723444/T6723444.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/6723444/T6723444.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,13 +1,13 @@
-T6723444.java:65:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
-T6723444.java:66:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
-T6723444.java:68:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:69:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:71:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:72:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:73:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:74:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:75:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:76:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:77:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:78:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-12 errors
\ No newline at end of file
+T6723444.java:42:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
+T6723444.java:43:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
+T6723444.java:45:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:46:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:48:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:49:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:50:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:51:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:52:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:53:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:54:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:55:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+12 errors
--- a/test/tools/javac/generics/inference/6315770/T6315770.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6315770/T6315770.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6315770
  * @summary javac inference allows creation of strange types: Integer & Runnable
  * @author Maurizio Cimadamore
--- a/test/tools/javac/generics/inference/6315770/T6315770.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6315770/T6315770.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,3 +1,3 @@
-T6315770.java:39:42: compiler.err.undetermined.type.1: <T>T6315770<T>, (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
-T6315770.java:40:40: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.no.conforming.instance.exists: T, T6315770<T>, T6315770<? super java.lang.String>)), <T>T6315770<T>, T6315770<? super java.lang.String>
+T6315770.java:16:42: compiler.err.undetermined.type.1: <T>T6315770<T>, (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
+T6315770.java:17:40: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.no.conforming.instance.exists: T, T6315770<T>, T6315770<? super java.lang.String>)), <T>T6315770<T>, T6315770<? super java.lang.String>
 2 errors
--- a/test/tools/javac/generics/inference/6611449/T6611449.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6611449/T6611449.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6611449
  * @summary Internal Error thrown during generic method/constructor invocation
  * @compile/fail/ref=T6611449.out -XDstdout -XDrawDiagnostics T6611449.java
--- a/test/tools/javac/generics/inference/6611449/T6611449.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6611449/T6611449.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,5 +1,5 @@
-T6611449.java:41:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int, kindname.class, T6611449<S>
-T6611449.java:42:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int,int, kindname.class, T6611449<S>
-T6611449.java:43:9: compiler.err.cant.apply.symbol: kindname.method, m1, T, int, kindname.class, T6611449<S>, null
-T6611449.java:44:9: compiler.err.cant.apply.symbol: kindname.method, m2, T,T, int,int, kindname.class, T6611449<S>, null
+T6611449.java:18:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int, kindname.class, T6611449<S>
+T6611449.java:19:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int,int, kindname.class, T6611449<S>
+T6611449.java:20:9: compiler.err.cant.apply.symbol: kindname.method, m1, T, int, kindname.class, T6611449<S>, null
+T6611449.java:21:9: compiler.err.cant.apply.symbol: kindname.method, m2, T,T, int,int, kindname.class, T6611449<S>, null
 4 errors
--- a/test/tools/javac/generics/inference/6638712/T6638712a.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6638712/T6638712a.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6638712
  * @author  mcimadamore
  * @summary Inference with wildcard types causes selection of inapplicable method
--- a/test/tools/javac/generics/inference/6638712/T6638712a.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6638712/T6638712a.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6638712a.java:39:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
+T6638712a.java:16:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
 1 error
--- a/test/tools/javac/generics/inference/6638712/T6638712b.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6638712/T6638712b.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6638712
  * @author  mcimadamore
  * @summary Inference with wildcard types causes selection of inapplicable method
--- a/test/tools/javac/generics/inference/6638712/T6638712b.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6638712/T6638712b.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6638712b.java:37:21: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.bounds: T6638712b<java.lang.Integer>, T6638712b<java.lang.String>)
+T6638712b.java:14:21: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.bounds: T6638712b<java.lang.Integer>, T6638712b<java.lang.String>)
 1 error
--- a/test/tools/javac/generics/inference/6638712/T6638712c.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6638712/T6638712c.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6638712 6707034
  * @author  mcimadamore
  * @summary Inference with wildcard types causes selection of inapplicable method
--- a/test/tools/javac/generics/inference/6638712/T6638712c.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6638712/T6638712c.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6638712c.java:39:9: compiler.err.cant.apply.symbol: kindname.method, sort, T[],java.util.Comparator<? super T>, java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, kindname.class, T6638712c, null
+T6638712c.java:16:9: compiler.err.cant.apply.symbol: kindname.method, sort, T[],java.util.Comparator<? super T>, java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, kindname.class, T6638712c, null
 1 error
--- a/test/tools/javac/generics/inference/6638712/T6638712d.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6638712/T6638712d.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6638712 6730468
  * @author  mcimadamore
  * @summary Inference with wildcard types causes selection of inapplicable method
--- a/test/tools/javac/generics/inference/6638712/T6638712d.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6638712/T6638712d.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6638712d.java:39:9: compiler.err.cant.apply.symbol: kindname.method, m, U,java.util.List<java.util.List<U>>, int,java.util.List<java.util.List<java.lang.String>>, kindname.class, T6638712d, null
+T6638712d.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, U,java.util.List<java.util.List<U>>, int,java.util.List<java.util.List<java.lang.String>>, kindname.class, T6638712d, null
 1 error
--- a/test/tools/javac/generics/inference/6638712/T6638712e.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6638712/T6638712e.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6638712 6795689
  * @author  mcimadamore
  * @summary Inference with wildcard types causes selection of inapplicable method
--- a/test/tools/javac/generics/inference/6638712/T6638712e.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6638712/T6638712e.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6638712e.java:40:27: compiler.err.invalid.inferred.types: X, (compiler.misc.inferred.do.not.conform.to.params: T6638712e.Foo<? super java.lang.Object,? extends java.lang.Boolean>, T6638712e.Foo<java.lang.Boolean,java.lang.Boolean>)
+T6638712e.java:17:27: compiler.err.invalid.inferred.types: X, (compiler.misc.inferred.do.not.conform.to.params: T6638712e.Foo<? super java.lang.Object,? extends java.lang.Boolean>, T6638712e.Foo<java.lang.Boolean,java.lang.Boolean>)
 1 error
--- a/test/tools/javac/generics/inference/6718364/T6718364.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6718364/T6718364.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6718364
  * @summary inference fails when a generic method is invoked with raw arguments
  * @compile/ref=T6718364.out -XDstdout -XDrawDiagnostics -Xlint:unchecked T6718364.java
--- a/test/tools/javac/generics/inference/6718364/T6718364.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/inference/6718364/T6718364.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,3 +1,3 @@
-T6718364.java:36:32: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6718364.X, T6718364.X<java.lang.Integer>
-T6718364.java:36:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6718364.X<T>,T, T6718364.X<T6718364.X<java.lang.Integer>>,T6718364.X, kindname.class, T6718364
-2 warnings
\ No newline at end of file
+T6718364.java:13:32: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6718364.X, T6718364.X<java.lang.Integer>
+T6718364.java:13:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6718364.X<T>,T, T6718364.X<T6718364.X<java.lang.Integer>>,T6718364.X, kindname.class, T6718364
+2 warnings
--- a/test/tools/javac/generics/rare/6665356/T6665356.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/rare/6665356/T6665356.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @author Maurizio Cimadamore
  * @bug     6665356
  * @summary Cast not allowed when both qualifying type and inner class are parameterized
@@ -50,4 +27,4 @@
         o = (Outer.Inner<?>)null;
         o = (Outer<?>.Inner<?>)null;
     }
-}
\ No newline at end of file
+}
--- a/test/tools/javac/generics/rare/6665356/T6665356.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/rare/6665356/T6665356.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,5 +1,5 @@
-T6665356.java:40:37: compiler.err.improperly.formed.type.param.missing
-T6665356.java:41:40: compiler.err.improperly.formed.type.inner.raw.param
-T6665356.java:49:23: compiler.err.improperly.formed.type.param.missing
-T6665356.java:50:25: compiler.err.improperly.formed.type.inner.raw.param
-4 errors
\ No newline at end of file
+T6665356.java:17:37: compiler.err.improperly.formed.type.param.missing
+T6665356.java:18:40: compiler.err.improperly.formed.type.inner.raw.param
+T6665356.java:26:23: compiler.err.improperly.formed.type.param.missing
+T6665356.java:27:25: compiler.err.improperly.formed.type.inner.raw.param
+4 errors
--- a/test/tools/javac/generics/typevars/6569404/T6569404b.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/typevars/6569404/T6569404b.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6569404
  * @summary Regression: Cannot instantiate an inner class of a type variable
  * @author  mcimadamore
--- a/test/tools/javac/generics/typevars/6569404/T6569404b.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/typevars/6569404/T6569404b.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6569404b.java:36:48: compiler.err.type.var.cant.be.deref
+T6569404b.java:13:48: compiler.err.type.var.cant.be.deref
 1 error
--- a/test/tools/javac/generics/typevars/6680106/T6680106.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/typevars/6680106/T6680106.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6680106
  * @summary StackOverFlowError for Cyclic inheritance in TypeParameters with ArrayType Bounds
  * @author  Maurizio Cimadamore
--- a/test/tools/javac/generics/typevars/6680106/T6680106.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/typevars/6680106/T6680106.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,13 +1,13 @@
-T6680106.java:34:25: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
-T6680106.java:35:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
-T6680106.java:35:40: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
-T6680106.java:36:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
-T6680106.java:36:40: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
-T6680106.java:36:55: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
-T6680106.java:37:30: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
-T6680106.java:38:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
-T6680106.java:38:50: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
-T6680106.java:39:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
-T6680106.java:39:50: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
-T6680106.java:39:70: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
-12 errors
\ No newline at end of file
+T6680106.java:11:25: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
+T6680106.java:12:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
+T6680106.java:12:40: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
+T6680106.java:13:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
+T6680106.java:13:40: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
+T6680106.java:13:55: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
+T6680106.java:14:30: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
+T6680106.java:15:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
+T6680106.java:15:50: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
+T6680106.java:16:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
+T6680106.java:16:50: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
+T6680106.java:16:70: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
+12 errors
--- a/test/tools/javac/generics/typevars/6804733/T6804733.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/typevars/6804733/T6804733.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6804733
  * @summary javac generates spourious diagnostics for ill-formed type-variable bounds
  * @author  mcimadamore
--- a/test/tools/javac/generics/typevars/6804733/T6804733.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/generics/typevars/6804733/T6804733.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-T6804733.java:34:20: compiler.err.type.var.may.not.be.followed.by.other.bounds
+T6804733.java:11:20: compiler.err.type.var.may.not.be.followed.by.other.bounds
 1 error
--- a/test/tools/javac/typeAnnotations/failures/AnnotationVersion.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/AnnotationVersion.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test that only java 7 allows type annotations
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/AnnotationVersion.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/AnnotationVersion.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-AnnotationVersion.java:32:25: compiler.err.type.annotations.not.supported.in.source: 1.6
+AnnotationVersion.java:9:25: compiler.err.type.annotations.not.supported.in.source: 1.6
 1 error
--- a/test/tools/javac/typeAnnotations/failures/IncompleteArray.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/IncompleteArray.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test incomplete array declaration
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/IncompleteArray.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/IncompleteArray.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-IncompleteArray.java:32:13: compiler.err.illegal.start.of.type
+IncompleteArray.java:9:13: compiler.err.illegal.start.of.type
 1 error
--- a/test/tools/javac/typeAnnotations/failures/IncompleteVararg.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/IncompleteVararg.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test incomplete vararg declaration
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/IncompleteVararg.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/IncompleteVararg.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-IncompleteVararg.java:33:19: compiler.err.illegal.start.of.type
+IncompleteVararg.java:10:19: compiler.err.illegal.start.of.type
 1 error
--- a/test/tools/javac/typeAnnotations/failures/IndexArray.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/IndexArray.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test indexing of an array
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/IndexArray.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/IndexArray.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-IndexArray.java:33:15: compiler.err.illegal.start.of.expr
+IndexArray.java:10:15: compiler.err.illegal.start.of.expr
 1 error
--- a/test/tools/javac/typeAnnotations/failures/LintCast.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/LintCast.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,30 +1,7 @@
-/*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 import java.util.List;
 
 /*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test that compiler doesn't warn about annotated redundant casts
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/LintCast.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/LintCast.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,6 +1,6 @@
-LintCast.java:36:21: compiler.warn.redundant.cast: java.lang.String
-LintCast.java:42:27: compiler.warn.redundant.cast: java.util.List<java.lang.String>
-LintCast.java:48:20: compiler.warn.redundant.cast: int[]
-LintCast.java:60:24: compiler.warn.redundant.cast: java.lang.String
-LintCast.java:61:26: compiler.warn.redundant.cast: java.lang.String
+LintCast.java:13:21: compiler.warn.redundant.cast: java.lang.String
+LintCast.java:19:27: compiler.warn.redundant.cast: java.util.List<java.lang.String>
+LintCast.java:25:20: compiler.warn.redundant.cast: int[]
+LintCast.java:37:24: compiler.warn.redundant.cast: java.lang.String
+LintCast.java:38:26: compiler.warn.redundant.cast: java.lang.String
 5 warnings
--- a/test/tools/javac/typeAnnotations/failures/Scopes.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/Scopes.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check that A is accessible in the class type parameters
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/Scopes.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/Scopes.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-Scopes.java:31:25: compiler.err.cant.resolve: kindname.class, UniqueInner, , 
+Scopes.java:8:25: compiler.err.cant.resolve: kindname.class, UniqueInner, , 
 1 error
--- a/test/tools/javac/typeAnnotations/failures/StaticFields.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/StaticFields.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary static field access isn't a valid location
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/StaticFields.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/StaticFields.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-StaticFields.java:33:17: compiler.err.illegal.start.of.expr
+StaticFields.java:10:17: compiler.err.illegal.start.of.expr
 1 error
--- a/test/tools/javac/typeAnnotations/failures/StaticMethods.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/StaticMethods.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary static methods don't have receivers
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/StaticMethods.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/StaticMethods.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-StaticMethods.java:32:22: compiler.err.annotation.type.not.applicable
+StaticMethods.java:9:22: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:33:45: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:10:45: compiler.err.duplicate.annotation.member.value: value, A
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:34:26: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:11:26: compiler.err.duplicate.annotation
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-InvalidLocation.java:34:23: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:11:23: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:33:23: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:10:23: compiler.err.annotation.missing.default.value: A, field
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:33:34: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:10:34: compiler.err.duplicate.annotation.member.value: value, A
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:34:15: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:11:15: compiler.err.duplicate.annotation
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-InvalidLocation.java:34:12: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:11:12: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:33:12: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:10:12: compiler.err.annotation.missing.default.value: A, field
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values for type parameter
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:33:39: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:10:39: compiler.err.duplicate.annotation.member.value: value, A
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:33:20: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:10:20: compiler.err.duplicate.annotation
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-InvalidLocation.java:33:17: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:10:17: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:33:17: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:10:17: compiler.err.annotation.missing.default.value: A, field
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:33:51: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:10:51: compiler.err.duplicate.annotation.member.value: value, A
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:34:32: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:11:32: compiler.err.duplicate.annotation
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-InvalidLocation.java:34:29: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:11:29: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:33:29: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:10:29: compiler.err.annotation.missing.default.value: A, field
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values for type parameter
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:31:64: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:8:64: compiler.err.duplicate.annotation.member.value: value, A
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:32:38: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:9:38: compiler.err.duplicate.annotation
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-InvalidLocation.java:32:33: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:9:33: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:31:40: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:8:40: compiler.err.annotation.missing.default.value: A, field
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values in receiver
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:32:37: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:9:37: compiler.err.duplicate.annotation.member.value: value, A
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations in receiver
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:33:18: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:10:18: compiler.err.duplicate.annotation
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-InvalidLocation.java:33:15: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:10:15: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:32:15: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:9:15: compiler.err.annotation.missing.default.value: A, field
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for Duplicate annotation value
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:33:9: compiler.err.annotation.missing.default.value: A, field
+DuplicateAnnotationValue.java:10:9: compiler.err.annotation.missing.default.value: A, field
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:34:12: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:11:12: compiler.err.duplicate.annotation
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-InvalidLocation.java:34:9: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:11:9: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:33:9: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:10:9: compiler.err.annotation.missing.default.value: A, field
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values for type parameter
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:32:50: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:9:50: compiler.err.duplicate.annotation.member.value: value, A
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:33:24: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:10:24: compiler.err.duplicate.annotation
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-InvalidLocation.java:33:19: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:10:19: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:32:26: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:9:26: compiler.err.annotation.missing.default.value: A, field
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values for type parameter
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:31:54: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:8:54: compiler.err.duplicate.annotation.member.value: value, A
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:32:28: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:9:28: compiler.err.duplicate.annotation
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-InvalidLocation.java:32:23: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:9:23: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:31:30: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:8:30: compiler.err.annotation.missing.default.value: A, field
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values for type parameter
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:32:50: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:9:50: compiler.err.duplicate.annotation.member.value: value, A
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:33:24: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:10:24: compiler.err.duplicate.annotation
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-InvalidLocation.java:33:19: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:10:19: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:32:26: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:9:26: compiler.err.annotation.missing.default.value: A, field
 1 error
--- a/test/tools/javac/typeAnnotations/failures/target/Constructor.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/target/Constructor.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test invalid location of TypeUse
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/target/Constructor.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/target/Constructor.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-Constructor.java:36:3: compiler.err.annotation.type.not.applicable
+Constructor.java:13:3: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test incomplete array declaration
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-IncompleteArray.java:32:13: compiler.err.illegal.start.of.type
+IncompleteArray.java:9:13: compiler.err.illegal.start.of.type
 1 error
--- a/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test invalid location of TypeUse
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,3 +1,3 @@
-NotTypeParameter.java:36:3: compiler.err.annotation.type.not.applicable
-NotTypeParameter.java:35:18: compiler.err.annotation.type.not.applicable
+NotTypeParameter.java:13:3: compiler.err.annotation.type.not.applicable
+NotTypeParameter.java:12:18: compiler.err.annotation.type.not.applicable
 2 errors
--- a/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test invalid location of TypeUse
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-NotTypeUse.java:36:3: compiler.err.annotation.type.not.applicable
+NotTypeUse.java:13:3: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/typeAnnotations/failures/target/VoidMethod.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/target/VoidMethod.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test invalid location of TypeUse
  * @author Mahmood Ali
--- a/test/tools/javac/typeAnnotations/failures/target/VoidMethod.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/typeAnnotations/failures/target/VoidMethod.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,2 +1,2 @@
-VoidMethod.java:36:3: compiler.err.annotation.type.not.applicable
+VoidMethod.java:13:3: compiler.err.annotation.type.not.applicable
 1 error
--- a/test/tools/javac/varargs/6806876/T6806876.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/varargs/6806876/T6806876.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
 /*
- * Copyright 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6806876
  * @author mcimadamore
  * @summary  ClassCastException occurs in assignment expressions without any heap pollutions
@@ -37,4 +14,4 @@
     <T> T[] m(T...a) {
         return null;
     }
-}
\ No newline at end of file
+}
--- a/test/tools/javac/varargs/6806876/T6806876.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/varargs/6806876/T6806876.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,4 +1,4 @@
-T6806876.java:34:32: compiler.warn.unchecked.generic.array.creation: java.lang.Number&java.lang.Comparable<? extends java.lang.Number&java.lang.Comparable<?>>[]
+T6806876.java:11:32: compiler.warn.unchecked.generic.array.creation: java.lang.Number&java.lang.Comparable<? extends java.lang.Number&java.lang.Comparable<?>>[]
 - compiler.err.warnings.and.werror
 1 error
 1 warning
--- a/test/tools/javac/warnings/6747671/T6747671.java	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/warnings/6747671/T6747671.java	Thu Aug 27 11:08:27 2009 -0700
@@ -1,28 +1,5 @@
-/*
- * Copyright 2008 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
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6747671
  * @summary -Xlint:rawtypes
  * @compile/ref=T6747671.out -XDrawDiagnostics -Xlint:rawtypes T6747671.java
@@ -55,4 +32,4 @@
         A a2 = new A() {};//raw warning (2)
         a2.new Z() {};//raw warning
     }
-}
\ No newline at end of file
+}
--- a/test/tools/javac/warnings/6747671/T6747671.out	Thu Aug 27 13:40:48 2009 +0100
+++ b/test/tools/javac/warnings/6747671/T6747671.out	Thu Aug 27 11:08:27 2009 -0700
@@ -1,12 +1,12 @@
-T6747671.java:42:6: compiler.warn.raw.class.use: T6747671.A.X, T6747671<E>.A<X>.X
-T6747671.java:43:6: compiler.warn.raw.class.use: T6747671.A.Z, T6747671<E>.A<X>.Z<Y>
-T6747671.java:46:13: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
-T6747671.java:50:14: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
-T6747671.java:50:7: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
-T6747671.java:52:28: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
-T6747671.java:53:37: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
-T6747671.java:54:21: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
-T6747671.java:55:9: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
-T6747671.java:55:20: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
-T6747671.java:56:16: compiler.warn.raw.class.use: T6747671.A.Z, T6747671<E>.A<X>.Z<Y>
-11 warnings
\ No newline at end of file
+T6747671.java:19:6: compiler.warn.raw.class.use: T6747671.A.X, T6747671<E>.A<X>.X
+T6747671.java:20:6: compiler.warn.raw.class.use: T6747671.A.Z, T6747671<E>.A<X>.Z<Y>
+T6747671.java:23:13: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
+T6747671.java:27:14: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
+T6747671.java:27:7: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
+T6747671.java:29:28: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
+T6747671.java:30:37: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
+T6747671.java:31:21: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
+T6747671.java:32:9: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
+T6747671.java:32:20: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
+T6747671.java:33:16: compiler.warn.raw.class.use: T6747671.A.Z, T6747671<E>.A<X>.Z<Y>
+11 warnings