sun proprietary/confidential JarFromManifestFailure.java in openjdk6

[Joseph D. Darcy]

Joseph D. Darcy wrote:
> 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
>

On a related note, below a few fixes to malformed copyright statements 
for bug 6773363: Fix bad copyrights in src/share/classes/java/awt/dnd 
and test/javax/script/Test3.java.  These fixes will be in the next 
OpenJDK 6 build.

-Joe

--- old/src/share/classes/java/awt/dnd/DragSource.java	Tue Nov 18 22:18:49 2008
+++ new/src/share/classes/java/awt/dnd/DragSource.java	Tue Nov 18 22:18:49 2008
@@ -7,10 +7,6 @@
  * published by the Free Software Foundation.  Sun designates this
  * particular file as subject to the "Classpath" exception as provided
  * by Sun in the LICENSE file that accompanied this code.
-import java.awt.AWTError;
-import java.awt.AWTException;
-import java.awt.event.InputEvent;
-import java.awt.AWTPermission;
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -22,7 +18,6 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
-import java.io.Serializable;
  * 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.
--- old/src/share/classes/java/awt/dnd/DragSourceContext.java	Tue Nov 18 22:18:52 2008
+++ new/src/share/classes/java/awt/dnd/DragSourceContext.java	Tue Nov 18 22:18:52 2008
@@ -7,7 +7,6 @@
  * published by the Free Software Foundation.  Sun designates this
  * particular file as subject to the "Classpath" exception as provided
  * by Sun in the LICENSE file that accompanied this code.
-import java.awt.event.InputEvent;
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,11 +16,6 @@
  *
  * 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,
-import java.awt.dnd.DragGestureEvent;
-import java.awt.dnd.DragSource;
-import java.awt.dnd.DragSourceListener;
-import java.awt.dnd.InvalidDnDOperationException;
-
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
--- old/test/javax/script/Test3.java	Tue Nov 18 22:18:53 2008
+++ new/test/javax/script/Test3.java	Tue Nov 18 22:18:53 2008
@@ -4,7 +4,6 @@
  *
  * 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