13 files changed, 218 insertions, 14 deletions
diff --git a/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java b/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java
index 255946711..251e2199e 100644
--- a/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java
+++ b/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java
@@ -17,7 +17,24 @@ 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. */
+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 gnu.classpath.tools.rmic;
 
diff --git a/tools/gnu/classpath/tools/rmic/CompilationError.java b/tools/gnu/classpath/tools/rmic/CompilationError.java
index 176a09598..244b46913 100644
--- a/tools/gnu/classpath/tools/rmic/CompilationError.java
+++ b/tools/gnu/classpath/tools/rmic/CompilationError.java
@@ -17,7 +17,24 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301 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 gnu.classpath.tools.rmic;
 
diff --git a/tools/gnu/classpath/tools/rmic/Generator.java b/tools/gnu/classpath/tools/rmic/Generator.java
index 70793cf6c..270f6eaf8 100644
--- a/tools/gnu/classpath/tools/rmic/Generator.java
+++ b/tools/gnu/classpath/tools/rmic/Generator.java
@@ -17,7 +17,24 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301 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 gnu.classpath.tools.rmic;
 
diff --git a/tools/gnu/classpath/tools/rmic/GiopIo.java b/tools/gnu/classpath/tools/rmic/GiopIo.java
index 0d77d1a78..42f291b4f 100644
--- a/tools/gnu/classpath/tools/rmic/GiopIo.java
+++ b/tools/gnu/classpath/tools/rmic/GiopIo.java
@@ -17,7 +17,24 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301 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 gnu.classpath.tools.rmic;
 
diff --git a/tools/gnu/classpath/tools/rmic/HashFinder.java b/tools/gnu/classpath/tools/rmic/HashFinder.java
index cf4d67f0c..c3e363c8d 100644
--- a/tools/gnu/classpath/tools/rmic/HashFinder.java
+++ b/tools/gnu/classpath/tools/rmic/HashFinder.java
@@ -17,7 +17,23 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301 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 gnu.classpath.tools.rmic;
diff --git a/tools/gnu/classpath/tools/rmic/Main.java b/tools/gnu/classpath/tools/rmic/Main.java
index 28f4d1931..204bb3be7 100644
--- a/tools/gnu/classpath/tools/rmic/Main.java
+++ b/tools/gnu/classpath/tools/rmic/Main.java
@@ -17,7 +17,24 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301 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 gnu.classpath.tools.rmic;
 
diff --git a/tools/gnu/classpath/tools/rmic/MethodGenerator.java b/tools/gnu/classpath/tools/rmic/MethodGenerator.java
index 650468d94..ecac90765 100644
--- a/tools/gnu/classpath/tools/rmic/MethodGenerator.java
+++ b/tools/gnu/classpath/tools/rmic/MethodGenerator.java
@@ -17,7 +17,24 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301 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 gnu.classpath.tools.rmic;
 
diff --git a/tools/gnu/classpath/tools/rmic/RMICException.java b/tools/gnu/classpath/tools/rmic/RMICException.java
index 300d60947..28eb8d42c 100644
--- a/tools/gnu/classpath/tools/rmic/RMICException.java
+++ b/tools/gnu/classpath/tools/rmic/RMICException.java
@@ -16,8 +16,24 @@ 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. */
+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 gnu.classpath.tools.rmic;
 
@@ -25,7 +41,7 @@ package gnu.classpath.tools.rmic;
  * Thrown by the underlying compiler used by RMIC when it fails to compile a
  * file.
  * 
- * @author Dalibor Topic <robilad@kaffe.org>
+ * @author Dalibor Topic (robilad@kaffe.org)
  */
 public class RMICException
     extends Exception
diff --git a/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java b/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java
index b526bbb9f..8d1a1e805 100644
--- a/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java
+++ b/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java
@@ -22,8 +22,18 @@
  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 gnu.classpath.tools.rmic;
 
diff --git a/tools/gnu/classpath/tools/rmic/RmicBackend.java b/tools/gnu/classpath/tools/rmic/RmicBackend.java
index 60eb854ca..db71b21ef 100644
--- a/tools/gnu/classpath/tools/rmic/RmicBackend.java
+++ b/tools/gnu/classpath/tools/rmic/RmicBackend.java
@@ -17,7 +17,24 @@ 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. */
+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 gnu.classpath.tools.rmic;
 public interface RmicBackend
diff --git a/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java b/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java
index 20ab8c156..a6f642b79 100644
--- a/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java
+++ b/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java
@@ -22,8 +22,18 @@ 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 gnu.classpath.tools.rmic;
 
diff --git a/tools/gnu/classpath/tools/rmic/Variables.java b/tools/gnu/classpath/tools/rmic/Variables.java
index bddf5f783..e3568e933 100644
--- a/tools/gnu/classpath/tools/rmic/Variables.java
+++ b/tools/gnu/classpath/tools/rmic/Variables.java
@@ -17,7 +17,24 @@ 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. */
+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 gnu.classpath.tools.rmic;
 
diff --git a/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java b/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java
index c51925fa6..3737334a4 100644
--- a/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java
+++ b/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java
@@ -17,7 +17,23 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301 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 gnu.classpath.tools.rmic;