diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-07-16 01:27:14 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-07-16 01:27:14 +0000 |
| commit | b0fa81eea9a270f23d6ad67ca7a6d25c18d20da1 (patch) | |
| tree | 8762d1f992e2f725a6bde1ff966ed6f1e5f4f823 /libjava/java/rmi/registry | |
| parent | ea54b29342c8506acb4f858c68340c44b72e3532 (diff) | |
| download | gcc-b0fa81eea9a270f23d6ad67ca7a6d25c18d20da1.zip gcc-b0fa81eea9a270f23d6ad67ca7a6d25c18d20da1.tar.gz gcc-b0fa81eea9a270f23d6ad67ca7a6d25c18d20da1.tar.bz2 | |
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.
From-SVN: r102082
Diffstat (limited to 'libjava/java/rmi/registry')
| -rw-r--r-- | libjava/java/rmi/registry/LocateRegistry.java | 87 | ||||
| -rw-r--r-- | libjava/java/rmi/registry/Registry.java | 65 | ||||
| -rw-r--r-- | libjava/java/rmi/registry/RegistryHandler.java | 58 |
3 files changed, 0 insertions, 210 deletions
diff --git a/libjava/java/rmi/registry/LocateRegistry.java b/libjava/java/rmi/registry/LocateRegistry.java deleted file mode 100644 index 3547a7a..0000000 --- a/libjava/java/rmi/registry/LocateRegistry.java +++ /dev/null @@ -1,87 +0,0 @@ -/* LocateRegistry.java -- - Copyright (c) 1996, 1997, 1998, 1999, 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 java.rmi.registry; - -import gnu.java.rmi.registry.RegistryImpl; -import gnu.java.rmi.registry.RegistryImpl_Stub; -import gnu.java.rmi.server.UnicastRef; - -import java.rmi.RemoteException; -import java.rmi.server.ObjID; -import java.rmi.server.RMIClientSocketFactory; -import java.rmi.server.RMIServerSocketFactory; -import java.rmi.server.RMISocketFactory; -import java.rmi.server.RemoteRef; - -public final class LocateRegistry { - /** - * This class isn't intended to be instantiated. - */ - private LocateRegistry() {} - -public static Registry getRegistry() throws RemoteException { - return (getRegistry("localhost", Registry.REGISTRY_PORT)); -} - -public static Registry getRegistry(int port) throws RemoteException { - return (getRegistry("localhost", port)); -} - -public static Registry getRegistry(String host) throws RemoteException { - return (getRegistry(host, Registry.REGISTRY_PORT)); -} - -public static Registry getRegistry(String host, int port) throws RemoteException { - return (getRegistry(host, port, RMISocketFactory.getSocketFactory())); -} - -public static Registry getRegistry(String host, int port, RMIClientSocketFactory csf) throws RemoteException { - RemoteRef ref = new UnicastRef(new ObjID(ObjID.REGISTRY_ID), host, port, csf); - return (new RegistryImpl_Stub(ref)); -} - -public static Registry createRegistry(int port) throws RemoteException { - return (createRegistry(port, RMISocketFactory.getSocketFactory(), RMISocketFactory.getSocketFactory())); -} - -public static Registry createRegistry(int port, RMIClientSocketFactory csf, RMIServerSocketFactory ssf) throws RemoteException { - return (new RegistryImpl(port, csf, ssf)); -} - -} diff --git a/libjava/java/rmi/registry/Registry.java b/libjava/java/rmi/registry/Registry.java deleted file mode 100644 index 6cd2a04..0000000 --- a/libjava/java/rmi/registry/Registry.java +++ /dev/null @@ -1,65 +0,0 @@ -/* Registry.java -- - Copyright (c) 1996, 1997, 1998, 1999, 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 java.rmi.registry; - -import java.rmi.AccessException; -import java.rmi.AlreadyBoundException; -import java.rmi.NotBoundException; -import java.rmi.Remote; -import java.rmi.RemoteException; - -public interface Registry extends Remote -{ - int REGISTRY_PORT = 1099; - - Remote lookup(String name) - throws RemoteException, NotBoundException, AccessException; - - void bind(String name, Remote obj) - throws RemoteException, AlreadyBoundException, AccessException; - - void unbind(String name) - throws RemoteException, NotBoundException, AccessException; - - void rebind(String name, Remote obj) - throws RemoteException, AccessException; - - String[] list() - throws RemoteException, AccessException; -} diff --git a/libjava/java/rmi/registry/RegistryHandler.java b/libjava/java/rmi/registry/RegistryHandler.java deleted file mode 100644 index b9b4509..0000000 --- a/libjava/java/rmi/registry/RegistryHandler.java +++ /dev/null @@ -1,58 +0,0 @@ -/* RegistryHandler.java -- - Copyright (c) 1996, 1997, 1998, 1999 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 java.rmi.registry; - -import java.rmi.RemoteException; -import java.rmi.UnknownHostException; - -/** - * @deprecated - */ -public interface RegistryHandler -{ - /** - * @deprecated - */ - Registry registryStub (String host, int port) - throws RemoteException, UnknownHostException; - - /** - * @deprecated - */ - Registry registryImpl (int port) throws RemoteException; -} |