2006-03-23 Audrius Meskauskas <AudriusA@Bioinformatics.org>

	* tools/gnu/classpath/tools/giop/GRMIC.java (main): Accept -force.
	* tools/gnu/classpath/tools/giop/GRMIC.txt: Explain -force.
	* tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java
	(force): New field. (setForce): New method. (compile): Handle -force.
	* tools/gnu/classpath/tools/rmi/RMIC.java (main): Accept -force.
	* tools/gnu/classpath/tools/rmi/RMIC.txt: Explain -force.

6 files changed, 36 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b516893cc..acdbd1929 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-23  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	* tools/gnu/classpath/tools/giop/GRMIC.java (main): Accept -force.
+	* tools/gnu/classpath/tools/giop/GRMIC.txt: Explain -force.
+	* tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java
+	(force): New field. (setForce): New method. (compile): Handle -force.
+	* tools/gnu/classpath/tools/rmi/RMIC.java (main): Accept -force.
+	* tools/gnu/classpath/tools/rmi/RMIC.txt: Explain -force.
+
 2006-03-23  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/JTabbedPane.java
diff --git a/tools/gnu/classpath/tools/giop/GRMIC.java b/tools/gnu/classpath/tools/giop/GRMIC.java
index 16ff96f56..bb0ef9cdc 100644
--- a/tools/gnu/classpath/tools/giop/GRMIC.java
+++ b/tools/gnu/classpath/tools/giop/GRMIC.java
@@ -105,6 +105,10 @@ public class GRMIC
                 verbose = true;
                 compiler.setVerbose(true);
               }
+            else if (c.equals("-force"))
+              {
+                compiler.setForce(true);
+              }
             else if (c.equals("-d"))
               {
                 int f = i + 1;
diff --git a/tools/gnu/classpath/tools/giop/GRMIC.txt b/tools/gnu/classpath/tools/giop/GRMIC.txt
index fcde83895..08aaf148f 100644
--- a/tools/gnu/classpath/tools/giop/GRMIC.txt
+++ b/tools/gnu/classpath/tools/giop/GRMIC.txt
@@ -19,6 +19,9 @@ Usage: grmic <options> <class names>
   -help         Print this help text
   -v            Print version
   -verbose      Verbose output
+  -force        Try to generate code even if the input classes seem not
+                consistent with RMI specification. 
+  
   
  and <class names> can include one or more non abstract classes that implement
  Remote and are accessible via current class path.
diff --git a/tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java b/tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java
index c19f635c6..62456fd51 100644
--- a/tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java
+++ b/tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java
@@ -115,6 +115,11 @@ public class GiopRmicCompiler
    * Verbose output
    */
   protected boolean verbose = false;
+  
+  /**
+   * Force mode - do not check the exceptions
+   */
+  protected boolean force = false;
 
   /**
    * Clear data, preparing for the next compilation.
@@ -204,7 +209,7 @@ public class GiopRmicCompiler
                     remEx = true;
                     break;
                   }
-                if (! remEx)
+                if (! remEx && !force)
                   throw new CompilationError(m[i].getName() + ", defined in "
                                              + c.getName()
                                              + ", does not throw "
@@ -483,6 +488,14 @@ public class GiopRmicCompiler
   {
     warnings = warn;
   }
+  
+  /**
+   * Set the error ignore mode.
+   */
+  public void setForce(boolean isforce)
+  {
+    force = isforce;
+  }
 
   /**
    * Get the package name.
diff --git a/tools/gnu/classpath/tools/rmi/RMIC.java b/tools/gnu/classpath/tools/rmi/RMIC.java
index 09021dd3f..ffcd0db0e 100644
--- a/tools/gnu/classpath/tools/rmi/RMIC.java
+++ b/tools/gnu/classpath/tools/rmi/RMIC.java
@@ -114,6 +114,10 @@ public class RMIC
                 verbose = true;
                 compiler.setVerbose(true);
               }
+            else if (c.equals("-force"))
+              {
+                compiler.setForce(true);
+              }            
             else if (c.equals("-d"))
               {
                 int f = i + 1;
diff --git a/tools/gnu/classpath/tools/rmi/RMIC.txt b/tools/gnu/classpath/tools/rmi/RMIC.txt
index df1de9ea6..7ec371e9a 100644
--- a/tools/gnu/classpath/tools/rmi/RMIC.txt
+++ b/tools/gnu/classpath/tools/rmi/RMIC.txt
@@ -16,6 +16,8 @@ Usage: rmic <options> <class names>
   -help         Print this help text
   -v            Print version
   -verbose      Verbose output
+  -force        Try to generate code even if the input classes seem not
+                consistent with RMI specification.
   
   -1.2          Generate v 1.2 stubs (default)*