This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: java.io - copyright statements merged with classpath
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 20 Mar 2003 08:49:48 +0100
- Subject: FYI: Patch: java.io - copyright statements merged with classpath
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to trunk to merge the copyright
statements of several classes in java.io with classpath. Now its
easier to merge this classes completely with classpath.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+eXKdWSOgCCdjSDsRAos7AJ0f1ZLkxl4rSgmA48u+qvECMcJGXACfblgM
/GI0T/r/WFdmtitH3HnmkZ4=
=Xn5R
-----END PGP SIGNATURE-----
diff -Nau /home/mkoch/src/gcc-cvs/libjava//ChangeLog /home/mkoch/src/gcc-work/libjava//ChangeLog
--- /home/mkoch/src/gcc-cvs/libjava//ChangeLog 2003-03-19 13:15:57.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava//ChangeLog 2003-03-20 08:42:49.000000000 +0100
@@ -1,3 +1,16 @@
+2003-03-20 Michael Koch <konqueror at gmx dot de>
+
+ * java/io/DataOutputStream.java,
+ java/io/File.java,
+ java/io/FileInputStream.java,
+ java/io/FileOutputStream.java,
+ java/io/InputStreamReader.java,
+ java/io/LineNumberReader.java,
+ java/io/OutputStreamWriter.java,
+ java/io/PrintStream.java,
+ java/io/RandomAccessFile.java:
+ Merged copyright statements with classpath for easier merging.
+
2003-03-19 Michael Koch <konqueror at gmx dot de>
* java/lang/Process.java:
diff -Nau /home/mkoch/src/gcc-cvs/libjava//java/io/DataOutputStream.java /home/mkoch/src/gcc-work/libjava//java/io/DataOutputStream.java
--- /home/mkoch/src/gcc-cvs/libjava//java/io/DataOutputStream.java 2001-12-16 01:14:57.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava//java/io/DataOutputStream.java 2003-03-20 08:36:02.000000000 +0100
@@ -1,12 +1,40 @@
-// DataOutputStream.java - Output filter that implements DataOutput
+/* DataOutputStream.java -- Writes primitive Java datatypes to streams
+ Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
-/* Copyright (C) 1998, 1999 Free Software Foundation
+This file is part of GNU Classpath.
- This file is part of libgcj.
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
package java.io;
diff -Nau /home/mkoch/src/gcc-cvs/libjava//java/io/File.java /home/mkoch/src/gcc-work/libjava//java/io/File.java
--- /home/mkoch/src/gcc-cvs/libjava//java/io/File.java 2003-03-02 14:36:39.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava//java/io/File.java 2003-03-20 08:36:37.000000000 +0100
@@ -1,12 +1,40 @@
-// File.java - File name
+/* File.java -- Class representing a file on disk
+ Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-/* Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+This file is part of GNU Classpath.
- This file is part of libgcj.
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
package java.io;
diff -Nau /home/mkoch/src/gcc-cvs/libjava//java/io/FileInputStream.java /home/mkoch/src/gcc-work/libjava//java/io/FileInputStream.java
--- /home/mkoch/src/gcc-cvs/libjava//java/io/FileInputStream.java 2003-01-04 20:38:04.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava//java/io/FileInputStream.java 2003-03-20 08:37:05.000000000 +0100
@@ -1,11 +1,36 @@
-/* Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation
+/* FileInputStream.java -- An input stream that reads from disk files.
+ Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
- This file is part of libgcj.
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
-
package java.io;
import java.nio.channels.FileChannel;
diff -Nau /home/mkoch/src/gcc-cvs/libjava//java/io/FileOutputStream.java /home/mkoch/src/gcc-work/libjava//java/io/FileOutputStream.java
--- /home/mkoch/src/gcc-cvs/libjava//java/io/FileOutputStream.java 2003-03-18 14:40:33.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava//java/io/FileOutputStream.java 2003-03-20 08:37:30.000000000 +0100
@@ -1,12 +1,40 @@
-// FileOutputStream.java - Write bytes to a file.
+/* FileOutputStream.java -- Writes to a file on disk.
+ Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
-/* Copyright (C) 1998, 1999, 2001 Free Software Foundation
+This file is part of GNU Classpath.
- This file is part of libgcj.
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
package java.io;
diff -Nau /home/mkoch/src/gcc-cvs/libjava//java/io/InputStreamReader.java /home/mkoch/src/gcc-work/libjava//java/io/InputStreamReader.java
--- /home/mkoch/src/gcc-cvs/libjava//java/io/InputStreamReader.java 2003-02-14 13:08:47.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava//java/io/InputStreamReader.java 2003-03-20 08:38:27.000000000 +0100
@@ -1,11 +1,41 @@
-/* Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation
+/* InputStreamReader.java -- Reader than transforms bytes to chars
+ Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
- This file is part of libgcj.
+This file is part of GNU Classpath.
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
package java.io;
import gnu.gcj.convert.*;
diff -Nau /home/mkoch/src/gcc-cvs/libjava//java/io/LineNumberReader.java /home/mkoch/src/gcc-work/libjava//java/io/LineNumberReader.java
--- /home/mkoch/src/gcc-cvs/libjava//java/io/LineNumberReader.java 2001-07-02 07:16:24.000000000 +0200
+++ /home/mkoch/src/gcc-work/libjava//java/io/LineNumberReader.java 2003-03-20 08:38:58.000000000 +0100
@@ -1,11 +1,40 @@
-/* Copyright (C) 1998, 1999, 2001 Free Software Foundation
+/* LineNumberReader.java -- A character input stream which counts line numbers
+ Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
- This file is part of libgcj.
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
-
package java.io;
/**
diff -Nau /home/mkoch/src/gcc-cvs/libjava//java/io/OutputStreamWriter.java /home/mkoch/src/gcc-work/libjava//java/io/OutputStreamWriter.java
--- /home/mkoch/src/gcc-cvs/libjava//java/io/OutputStreamWriter.java 2003-02-14 13:08:47.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava//java/io/OutputStreamWriter.java 2003-03-20 08:39:30.000000000 +0100
@@ -1,10 +1,40 @@
-/* Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation
+/* OutputStreamWriter.java -- Writer that converts chars to bytes
+ Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
- This file is part of libgcj.
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
package java.io;
import gnu.gcj.convert.UnicodeToBytes;
diff -Nau /home/mkoch/src/gcc-cvs/libjava//java/io/PrintStream.java /home/mkoch/src/gcc-work/libjava//java/io/PrintStream.java
--- /home/mkoch/src/gcc-cvs/libjava//java/io/PrintStream.java 2001-04-02 23:16:38.000000000 +0200
+++ /home/mkoch/src/gcc-work/libjava//java/io/PrintStream.java 2003-03-20 08:39:52.000000000 +0100
@@ -1,12 +1,40 @@
-// PrintStream.java - Print string representations
+/* PrintStream.java -- OutputStream for printing output
+ Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
-/* Copyright (C) 1998, 1999, 2001 Free Software Foundation
+This file is part of GNU Classpath.
- This file is part of libgcj.
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
package java.io;
import gnu.gcj.convert.UnicodeToBytes;
diff -Nau /home/mkoch/src/gcc-cvs/libjava//java/io/RandomAccessFile.java /home/mkoch/src/gcc-work/libjava//java/io/RandomAccessFile.java
--- /home/mkoch/src/gcc-cvs/libjava//java/io/RandomAccessFile.java 2003-01-08 16:42:38.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava//java/io/RandomAccessFile.java 2003-03-20 08:40:21.000000000 +0100
@@ -1,12 +1,40 @@
-// RandomAccessFile.java
+/* RandomAccessFile.java -- Class supporting random file I/O
+ Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
-/* Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation
+This file is part of GNU Classpath.
- This file is part of libgcj.
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
package java.io;