[multiple changes]

2003-09-18  Dalibor Topic  <robilad@kaffe.org>

	* gnu/java/rmi/rmic/Compile_gcj.java (COMPILER_ARGS): New private
	constant.
	(computeArguments): use computeTypicalArguments.

	* gnu/java/rmi/rmic/Makefile.am (EXTRA_DIST): Add Compile_kjc.java,
	Compile_jikes.java and RMICException.java.
	* gnu/java/rmi/rmic/Compile_kjc.java: New file.
	* gnu/java/rmi/rmic/Compile_jikes.java: Likewise.
	* gnu/java/rmi/rmic/RMICException.java: Likewise.

	* gnu/java/rmi/rmic/Compiler.java (getDestination): New method.

	* gnu/java/rmi/rmic/CompilerProcess.java: Import java.io.InputStream.
	(computeTypicalArguments): New method.
	(compile): Print compiler output to System.out. Collect compiler
	error output and use it in exception message.

	* gnu/java/rmi/rmic/RMIC.java: Import java.util.Set.
	(destination): Initialize to null.
	(run): Replace file separator with '.' when processing class.
	(processClass): Replace '.' with file separator when compiling
	classes.
	(findClass): Use SystemClassLoader to load class.
	(generateStub): Use full class name for generated stub, that puts
	it in right path.  Replace '.' with file separator when generating
	stub file name. Write just the stub class name without package
	information as class name, and constructor name. Write only
	interface names for interfaces extending java.rmi.Remote as
	implemented.
	(generateSkel): Use full class name for generated skel, that puts
	it in right path.  Replace '.' with file separator when generating
	stub file name. Write just the stub class name without package
	information as class name.

2003-09-18  Michael Koch  <konqueror@gmx.de>

	* Makefile.am (rmi_java_source_files):
	Added gnu/java/rmi/rmic/Compile_kjc.java,
	gnu/java/rmi/rmic/Compile_jikes.java and
	gnu/java/rmi/rmic/RMICException.java
	* Makefile.in: Regenerated.

From-SVN: r71506

1 files changed, 103 insertions, 36 deletions

diff --git a/libjava/gnu/java/rmi/rmic/RMIC.java b/libjava/gnu/java/rmi/rmic/RMIC.java
index ef44732..82bb37e 100644
--- a/libjava/gnu/java/rmi/rmic/RMIC.java
+++ b/libjava/gnu/java/rmi/rmic/RMIC.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,10 +43,12 @@ import java.io.PrintWriter;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.rmi.RemoteException;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Arrays;
-import java.lang.Comparable;
+import java.util.Set;
+
 import gnu.java.rmi.server.RMIHashes;
 
 public class RMIC {
@@ -71,7 +73,9 @@ private String fullclassname;
 private MethodRef[] remotemethods;
 private String stubname;
 private String skelname;
+private int errorCount = 0;
 
+private Class mRemoteInterface;
 public RMIC(String[] a) {
 	args = a;
 }
@@ -99,7 +103,7 @@ public boolean run() {
 			if (verbose) {
 				System.out.println("[Processing class " + args[i] + ".class]");
 			}
-			processClass(args[i]);
+			processClass(args[i].replace(File.separatorChar, '.'));
 		}
 		catch (Exception e) {
 			exception = e;
@@ -110,27 +114,34 @@ public boolean run() {
 }
 
 private boolean processClass(String classname) throws Exception {
+	errorCount = 0;
 	analyzeClass(classname);
+	if(errorCount > 0) {
+		System.exit(1);
+	}
 	generateStub();
 	if (need11Stubs) {
 		generateSkel();
 	}
 	if (compile) {
-		compile(stubname + ".java");
+		compile(stubname.replace('.', File.separatorChar) + ".java");
 		if (need11Stubs) {
-			compile(skelname + ".java");
+			compile(skelname.replace('.', File.separatorChar) + ".java");
 		}
 	}
 	if (!keep) {
-		(new File(stubname + ".java")).delete();
+		(new File(stubname.replace('.', File.separatorChar) + ".java")).delete();
 		if (need11Stubs) {
-			(new File(skelname + ".java")).delete();
+			(new File(skelname.replace('.', File.separatorChar) + ".java")).delete();
 		}
 	}
 	return (true);
 }
 
 private void analyzeClass(String cname) throws Exception {
+	if(verbose){
+			System.out.println("[analyze class "+cname+"]");
+		}
 	int p = cname.lastIndexOf('.');
 	if (p != -1) {
 		classname = cname.substring(p+1);
@@ -140,27 +151,36 @@ private void analyzeClass(String cname) throws Exception {
 	}
 	fullclassname = cname;
 
+	
 	HashSet rmeths = new HashSet();
 	findClass();
-	for (Class cls = clazz; cls != null; cls = cls.getSuperclass()) {
-		// Keep going down the inheritence tree until we hit the system
-		if (cls.getName().startsWith("java.")) {
-			break;
-		}
-
-		Method[] meths = cls.getDeclaredMethods();
-		for (int i = 0; i < meths.length; i++) {
-			// Only include public methods
-			int mods = meths[i].getModifiers();
-			if (Modifier.isPublic(mods) && !Modifier.isStatic(mods)) {
-				// Should check exceptions here. - XXX
+	
+	// get the remote interface
+	mRemoteInterface = getRemoteInterface(clazz);
+	if(mRemoteInterface == null)
+		return;
+	if(verbose){
+		System.out.println("[implements "+mRemoteInterface.getName()+"]");
+	}
 
-				// Add this one in.
-				rmeths.add(meths[i]);
+	// check if the methods of the remote interface declare RemoteExceptions
+	Method[] meths = mRemoteInterface.getDeclaredMethods();
+	for (int i = 0; i < meths.length; i++) {
+		Class[] exceptions = meths[i].getExceptionTypes();
+		int index = 0;
+		for(;index < exceptions.length; index++){
+			if(exceptions[index].equals(RemoteException.class)){
+				break;
 			}
 		}
+		if (index < exceptions.length) {
+			rmeths.add(meths[i]);
+		} else {
+			logError("Method "+meths[i]+" does not throw a java.rmi.RemoteException");
+		}
 	}
 
+
 	// Convert into a MethodRef array and sort them
 	remotemethods = new MethodRef[rmeths.size()];
 	int c = 0;
@@ -175,12 +195,15 @@ public Exception getException() {
 }
 
 private void findClass() throws ClassNotFoundException {
-	clazz = Class.forName(fullclassname);
+	clazz = Class.forName(fullclassname, true, ClassLoader.getSystemClassLoader());
 }
 
 private void generateStub() throws IOException {
-	stubname = classname + "_Stub";
-	ctrl = new TabbedWriter(new FileWriter(stubname + ".java"));
+	stubname = fullclassname + "_Stub";
+	String stubclassname = classname + "_Stub";
+	ctrl = new TabbedWriter(new FileWriter((destination == null ? "" : destination + File.separator)
+					       + stubname.replace('.', File.separatorChar)
+					       + ".java"));
 	out = new PrintWriter(ctrl);
 
 	if (verbose) {
@@ -195,20 +218,32 @@ private void generateStub() throws IOException {
 		out.println();
 	}
 
-	out.print("public final class " + stubname);
+	out.print("public final class " + stubclassname);
 	ctrl.indent();
 	out.println("extends java.rmi.server.RemoteStub");
 	
 	// Output interfaces we implement
 	out.print("implements ");
-	Class[] ifaces = clazz.getInterfaces(); 
-	for (int i = 0; i < ifaces.length; i++) {
-		out.print(ifaces[i].getName());
-		if (i+1 < ifaces.length) {
+	/* Scan implemented interfaces, and only print remote interfaces. */ 
+        Class[] ifaces = clazz.getInterfaces(); 
+	Set remoteIfaces = new HashSet();
+        for (int i = 0; i < ifaces.length; i++) {
+		Class iface = ifaces[i];
+		if (java.rmi.Remote.class.isAssignableFrom(iface)) {
+			remoteIfaces.add(iface);
+		}
+	}
+	Iterator iter = remoteIfaces.iterator();
+	while (iter.hasNext()) {
+		/* Print remote interface. */
+		Class iface = (Class) iter.next();
+		out.print(iface.getName());
+
+		/* Print ", " if more remote interfaces follow. */
+		if (iter.hasNext()) {
 			out.print(", ");
 		}
 	}
-
 	ctrl.unindent();
 	out.print("{");
 	ctrl.indent();
@@ -278,7 +313,7 @@ private void generateStub() throws IOException {
 		for (int i = 0; i < remotemethods.length; i++) {
 			Method m = remotemethods[i].meth;
 			out.print("$method_" + m.getName() + "_" + i + " = ");
-			out.print(fullclassname + ".class.getMethod(\"" + m.getName() + "\"");
+			out.print(mRemoteInterface.getName() + ".class.getMethod(\"" + m.getName() + "\"");
 			out.print(", new java.lang.Class[] {");
 			// Output signature
 			Class[] sig = m.getParameterTypes();
@@ -311,7 +346,7 @@ private void generateStub() throws IOException {
 
 	// Constructors
 	if (need11Stubs) {
-		out.print("public " + stubname + "() {");
+		out.print("public " + stubclassname + "() {");
 		ctrl.indent();
 		out.print("super();");
 		ctrl.unindent();
@@ -319,7 +354,7 @@ private void generateStub() throws IOException {
 	}
 
 	if (need12Stubs) {
-		out.print("public " + stubname + "(java.rmi.server.RemoteRef ref) {");
+		out.print("public " + stubclassname + "(java.rmi.server.RemoteRef ref) {");
 		ctrl.indent();
 		out.print("super(ref);");
 		ctrl.unindent();
@@ -600,8 +635,11 @@ private void generateStub() throws IOException {
 }
 
 private void generateSkel() throws IOException {
-	skelname = classname + "_Skel";
-	ctrl = new TabbedWriter(new FileWriter(skelname + ".java"));
+	skelname = fullclassname + "_Skel";
+	String skelclassname = classname + "_Skel";
+	ctrl = new TabbedWriter(new FileWriter((destination == null ? "" : destination + File.separator)
+					       + skelname.replace('.', File.separatorChar)
+					       + ".java"));
 	out = new PrintWriter(ctrl);
 
 	if (verbose) {
@@ -616,7 +654,7 @@ private void generateSkel() throws IOException {
 		out.println();
 	}
 
-	out.print("public final class " + skelname);
+	out.print("public final class " + skelclassname);
 	ctrl.indent();
 	
 	// Output interfaces we implement
@@ -961,6 +999,35 @@ private void parseOptions() {
 	}
 }
 
+/**
+ * Looks for the java.rmi.Remote interface that that is implemented by theClazz.
+ * @param theClazz the class to look in  
+ * @return the Remote interface of theClazz or null if theClazz does not implement a Remote interface
+ */
+private Class getRemoteInterface(Class theClazz)
+{
+	Class[] interfaces = theClazz.getInterfaces();
+	for (int i = 0; i < interfaces.length; i++)
+	{
+		if (java.rmi.Remote.class.isAssignableFrom(interfaces[i]))
+		{
+			return interfaces[i];
+		}
+	}
+	logError("Class "+ theClazz.getName()
+			+ " is not a remote object. It does not implement an interface that is a java.rmi.Remote-interface.");
+	return null;
+}
+	
+/**
+ * Prints an error to System.err and increases the error count.
+ * @param theError
+ */
+private void logError(String theError){
+	errorCount++;
+	System.err.println("error:"+theError);
+}
+
 private static void error(String message) {
 	System.err.println("rmic: " + message);
 	System.err.println("Try `rmic --help' for more information.");