sun proprietary/confidential JarFromManifestFailure.java in openjdk6
Joseph D. Darcy
Joe.Darcy at Sun.COM
Sun Nov 16 22:03:24 PST 2008
Joseph D. Darcy wrote:
> Hello.
>
> Mark Wielaard wrote:
>> Hi,
>>
>> I just filed http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=258
>>
>> In jdk6
>> langtools/test/tools/javac/Paths/6638501/JarFromManifestFailure.java is
>> marked as "SUN PROPRIETARY/CONFIDENTIAL" while the version in jdk7 is
>> under the
>> GPL.
>>
>> The version in jdk7 was alsways under the GPL, and never marked as
>> proprietary, but the version as imported in jdk6-b05 and updated in
>> jdk6-b13 was.
>>
>
> Sorry about that; I've filed Sun bug 6772068 for this issue and it
> will be fixed in the next OpenJDK 6 build.
>
> -Joe
>
>
The bug is now fixed in the upstream OpenJDK 6 sources; below is the patch.
Cheers,
-Joe
--- 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 {
More information about the jdk6-dev
mailing list