summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAudrius Meskauskas <audriusa@Bioinformatics.org>2005-10-02 21:07:19 +0000
committerAudrius Meskauskas <audriusa@Bioinformatics.org>2005-10-02 21:07:19 +0000
commit3eb2e0349e1fc3fdfcd04f41086d21ae335bbe52 (patch)
treeb69bf4102c866faeba4449d2e94240fe5fe4f254
parentb740b55aeaed6976e45528b3535efd3625e19cc6 (diff)
downloadclasspath-3eb2e0349e1fc3fdfcd04f41086d21ae335bbe52.tar.gz
2005-10-02 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/javax/rmi/PortableServer.java, gnu/javax/rmi/CORBA/ValueHandlerImpl.java, javax/rmi/BAD_OPERATION.java, javax/rmi/ORB.java, javax/rmi/CORBA/ObjectImpl.java, javax/rmi/CORBA/SystemException.java: Deleted.
-rw-r--r--ChangeLog9
-rw-r--r--gnu/javax/rmi/CORBA/ValueHandlerImpl.java46
-rw-r--r--gnu/javax/rmi/PortableServer.java137
-rw-r--r--javax/rmi/BAD_OPERATION.java4
-rw-r--r--javax/rmi/CORBA/ObjectImpl.java9
-rw-r--r--javax/rmi/CORBA/SystemException.java4
-rw-r--r--javax/rmi/ORB.java4
7 files changed, 9 insertions, 204 deletions
diff --git a/ChangeLog b/ChangeLog
index 43062866b..f498c09dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2005-10-02 Audrius Meskauskas <AudriusA@Bioinformatics.org>
+ * gnu/javax/rmi/PortableServer.java,
+ gnu/javax/rmi/CORBA/ValueHandlerImpl.java,
+ javax/rmi/BAD_OPERATION.java,
+ javax/rmi/ORB.java,
+ javax/rmi/CORBA/ObjectImpl.java,
+ javax/rmi/CORBA/SystemException.java: Deleted.
+
+2005-10-02 Audrius Meskauskas <AudriusA@Bioinformatics.org>
+
* gnu/javax/rmi/CORBA/corbaObjectOutput.java (main):
Removed method.
diff --git a/gnu/javax/rmi/CORBA/ValueHandlerImpl.java b/gnu/javax/rmi/CORBA/ValueHandlerImpl.java
deleted file mode 100644
index 93008c1e2..000000000
--- a/gnu/javax/rmi/CORBA/ValueHandlerImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ValueHandlerImpl.java --
- Copyright (C) 2002 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. */
-
-/**
- * TODO Delete with the next patch. Not in use.
- */
-package gnu.javax.rmi.CORBA;
-
-public class ValueHandlerImpl
-{
- // Contents removed to keep code compileable between patches.
-}
diff --git a/gnu/javax/rmi/PortableServer.java b/gnu/javax/rmi/PortableServer.java
deleted file mode 100644
index 17d492bfb..000000000
--- a/gnu/javax/rmi/PortableServer.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* PortableServer.java --
- Copyright (C) 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.javax.rmi;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.NoSuchObjectException;
-import java.rmi.server.UnicastRemoteObject;
-import java.rmi.server.RemoteStub;
-import java.util.Hashtable;
-
-import javax.rmi.CORBA.*;
-
-/**
- * The relationship of PortableRemoteObjectImpl with PortableServer
- * is like that of UnicastRemoteObject with UnicastServer
- */
-public class PortableServer
-{
- static private Hashtable tieCache = new Hashtable();
- static private Object NO_TIE = new Object();
-
- public static final synchronized void exportObject(Remote obj)
- throws RemoteException
- {
- if(Util.getTie(obj) != null)
- return;
-
- Tie tie = getTieFromRemote(obj);
- if (tie != null)
- Util.registerTarget(tie, obj);
- else
- UnicastRemoteObject.exportObject(obj);
- }
-
- public static final void unexportObject(Remote obj)
- {
- }
-
- public static final Remote toStub(Remote obj)
- throws NoSuchObjectException
- {
- if (obj instanceof Stub || obj instanceof RemoteStub)
- return obj;
-
- Tie tie = Util.getTie(obj);
- Remote stub;
- if (tie != null)
- stub = getStubFromTie(tie);
- else
- throw new NoSuchObjectException("Can't toStub an unexported object");
- return stub;
- }
-
- static synchronized Tie getTieFromRemote(Remote obj)
- {
- Object tie = tieCache.get(obj);
- if (tie == null)
- {
- tie = getTieFromClass(obj.getClass());
- if(tie == null)
- tieCache.put(obj, NO_TIE);
- else
- tieCache.put(obj, tie);
- }
- else
- if(tie != NO_TIE)
- {
- try
- {
- tie = obj.getClass().newInstance();
- }
- catch(Exception _)
- {
- tie = null;
- }
- }
- else //NO_TIE
- tie = null;
-
- return (Tie)tie;
- }
-
- static synchronized Tie getTieFromClass(Class clz)
- {
- //FIX ME
- return null;
- }
-
- public static Remote getStubFromTie(Tie tie)
- {
- //FIX ME
- return null;
- }
-
- public static Remote getStubFromObjectImpl(ObjectImpl objimpl, Class toClass)
- {
- //FIX ME
- return null;
- }
-}
diff --git a/javax/rmi/BAD_OPERATION.java b/javax/rmi/BAD_OPERATION.java
deleted file mode 100644
index 36081a47c..000000000
--- a/javax/rmi/BAD_OPERATION.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package javax.rmi;
-
-/** XXX - Stub till we have org.omg.CORBA */
-public class BAD_OPERATION extends Exception { }
diff --git a/javax/rmi/CORBA/ObjectImpl.java b/javax/rmi/CORBA/ObjectImpl.java
deleted file mode 100644
index d76d673ce..000000000
--- a/javax/rmi/CORBA/ObjectImpl.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package javax.rmi.CORBA;
-
-/** XXX - Stub till we have org.omg.CORBA */
-public class ObjectImpl
-{
- public ObjectImpl _orb() { return null; }
- public String object_to_string(ObjectImpl o)
- throws javax.rmi.BAD_OPERATION { return null; }
-}
diff --git a/javax/rmi/CORBA/SystemException.java b/javax/rmi/CORBA/SystemException.java
deleted file mode 100644
index f8afdc35e..000000000
--- a/javax/rmi/CORBA/SystemException.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package javax.rmi.CORBA;
-
-/** XXX - Stub till we have org.omg.CORBA */
-public class SystemException extends Exception { }
diff --git a/javax/rmi/ORB.java b/javax/rmi/ORB.java
deleted file mode 100644
index be7a894e6..000000000
--- a/javax/rmi/ORB.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package javax.rmi;
-
-/** XXX - Stub till we have org.omg.CORBA */
-public class ORB { }