United StatesChange Country, Oracle Worldwide Web Sites Communities I am a... I want to...
JDK-6772068 : Fix copyright in test/tools/javac/Paths/6638501

Details
Type:
Bug
Submit Date:
2008-11-16
Status:
Resolved
Updated Date:
2010-04-02
Project Name:
JDK
Resolved Date:
2008-11-17
Component:
tools
OS:
generic
Sub-Component:
javac
CPU:
generic
Priority:
P2
Resolution:
Fixed
Affected Versions:
OpenJDK6
Fixed Versions:
OpenJDK6 (b14)

Related Reports
Backport:
Relates:

Sub Tasks

Description
Files under test/tools/javac/Paths/6638501 are improperly licensed; one source files has the TLDA instead of the GPL, another is missing a copyright statment.  These need to be fixed.

                                    

Comments
SUGGESTED FIX

Patch file:
--- old/test/tools/javac/Paths/6638501/JarFromManifestFailure.java	Sun Nov 16 15:47:52 2008
+++ new/test/tools/javac/Paths/6638501/JarFromManifestFailure.java	Sun Nov 16 15:47:51 2008
@@ -1,6 +1,24 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * Copyright 2007-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.
  */
 
 /*
@@ -31,10 +49,11 @@
         arList.add(new File("HelloLib.jar"));
         jar(new File(libFile, "JarPointer.jar"), arList, testClasses);
 
-        String [] args1 = new String[3];
-        args1[0] = "-cp";
-        args1[1] = new File(libFile, "JarPointer.jar").toString().replace('\\', '/');
-        args1[2] = new File(testSrc, "test/SayHello.java").toString().replace('\\', '/');
+        String[] args1 = {
+            "-d", ".",
+            "-cp", new File(libFile, "JarPointer.jar").getPath().replace('\\', '/'),
+            new File(testSrc, "test/SayHello.java").getPath().replace('\\', '/')
+        };
         System.err.println("First compile!!!");
         if (com.sun.tools.javac.Main.compile(args1) != 0) {
             throw new AssertionError("Failure in first compile!");
@@ -42,10 +61,11 @@
 
         System.err.println("Second compile!!!");
 
-        args1 = new String[3];
-        args1[0] = "-cp";
-        args1[1] = new File(libFile, "JarPointer.jar").toString().replace('\\', '/');
-        args1[2] = new File(testSrc, "test1/SayHelloToo.java").toString().replace('\\', '/');
+        args1 = new String[] {
+            "-d", ".",
+            "-cp", new File(libFile, "JarPointer.jar").getPath().replace('\\', '/'),
+            new File(testSrc, "test1/SayHelloToo.java").getPath().replace('\\', '/')
+        };
         if (com.sun.tools.javac.Main.compile(args1) != 0) {
             throw new AssertionError("Failure in second compile!");
         }
--- old/test/tools/javac/Paths/6638501/WsCompileExample.java	Sun Nov 16 15:48:05 2008
+++ new/test/tools/javac/Paths/6638501/WsCompileExample.java	Sun Nov 16 15:48:05 2008
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2007-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;
 import java.util.ArrayList;
 import java.io.File;
--- old/test/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java	Sun Nov 16 15:48:07 2008
+++ new/test/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java	Sun Nov 16 15:48:06 2008
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2007-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.
+ */
+
 package test;
 
 public class HelloImpl {
--- old/test/tools/javac/Paths/6638501/test/SayHello.java	Sun Nov 16 15:48:08 2008
+++ new/test/tools/javac/Paths/6638501/test/SayHello.java	Sun Nov 16 15:48:08 2008
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2007-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 test.HelloImpl;
 
 public class SayHello extends HelloImpl {
--- old/test/tools/javac/Paths/6638501/test1/SayHelloToo.java	Sun Nov 16 15:48:09 2008
+++ new/test/tools/javac/Paths/6638501/test1/SayHelloToo.java	Sun Nov 16 15:48:09 2008
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2007-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 test.HelloImpl;
 
 public class SayHelloToo extends HelloImpl {
                                     
2008-11-17
EVALUATION

Yes, must be fixed.
                                     
2008-11-16



Hardware and Software, Engineered to Work Together