Major merge with Classpath.

	Removed many duplicate files.
	* HACKING: Updated.x
	* classpath: Imported new directory.
	* standard.omit: New file.
	* Makefile.in, aclocal.m4, configure: Rebuilt.
	* sources.am: New file.
	* configure.ac: Run Classpath configure script.  Moved code around
	to support.  Disable xlib AWT peers (temporarily).
	* Makefile.am (SUBDIRS): Added 'classpath'
	(JAVAC): Removed.
	(AM_CPPFLAGS): Added more -I options.
	(BOOTCLASSPATH): Simplified.
	Completely redid how sources are built.
	Include sources.am.
	* include/Makefile.am (tool_include__HEADERS): Removed jni.h.
	* include/jni.h: Removed (in Classpath).
	* scripts/classes.pl: Updated to look at built classes.
	* scripts/makemake.tcl: New file.
	* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added
	-I options.
	(gcj_jni_invocation_compile_c_to_binary): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@102082 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 0 insertions, 114 deletions

diff --git a/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java b/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java
deleted file mode 100644
index d42908a4147..00000000000
--- a/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* RMIObjectOutputStream.java -
-   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004
-   Free Software Foundation, Inc.
-
-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., 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.java.rmi.server;
-
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.rmi.Remote;
-import java.rmi.server.RMIClassLoader;
-import java.rmi.server.RemoteStub;
-
-public class RMIObjectOutputStream
-	extends ObjectOutputStream {
-
-public RMIObjectOutputStream(OutputStream strm) throws IOException {
-	super(strm);
-	enableReplaceObject(true);
-}
-
-//Separate it for override by MarshalledObject
-protected void setAnnotation(String annotation) throws IOException{
-    writeObject(annotation);
-}
-
-protected void annotateClass(Class cls) throws IOException {
-	setAnnotation(RMIClassLoader.getClassAnnotation(cls));
-}
-
-protected void annotateProxyClass(Class cls)
-        throws IOException
-{
-    annotateClass(cls);
-}
-    
-protected Object replaceObject(Object obj)
-        throws IOException
-{
-    if((obj instanceof Remote) && !(obj instanceof RemoteStub)){
-	    UnicastServerRef ref = UnicastServer.getExportedRef((Remote)obj);
-	    if (ref != null)
-		    return ref.getStub();
-    }
-    return obj;
-}
-
-protected void writeValue(Object value, Class valueClass) throws IOException{
-    if(valueClass.isPrimitive()){
-        if(valueClass == Boolean.TYPE)
-            writeBoolean(((Boolean)value).booleanValue());
-        else
-        if(valueClass == Byte.TYPE)
-            writeByte(((Byte)value).byteValue());
-        else
-        if(valueClass == Character.TYPE)
-            writeChar(((Character)value).charValue());
-        else
-        if(valueClass == Short.TYPE)
-            writeShort(((Short)value).shortValue());
-        else
-        if(valueClass == Integer.TYPE)
-            writeInt(((Integer)value).intValue());
-        else
-        if(valueClass == Long.TYPE)
-            writeLong(((Long)value).longValue());
-        else
-        if(valueClass == Float.TYPE)
-            writeFloat(((Float)value).floatValue());
-        else
-        if(valueClass == Double.TYPE)
-            writeDouble(((Double)value).doubleValue());
-        else
-            throw new Error("Unsupported primitive class: " + valueClass);
-    } else
-        writeObject(value);
-}
-
-}