[gnue] r7972 - in trunk/gnue-common/src/rpc: . drivers/pyro

[johannes]

Author: johannes
Date: 2005-09-22 04:42:11 -0500 (Thu, 22 Sep 2005)
New Revision: 7972

Removed:
   trunk/gnue-common/src/rpc/GComm.py
Modified:
   trunk/gnue-common/src/rpc/drivers/pyro/ClientAdapter.py
   trunk/gnue-common/src/rpc/drivers/pyro/ServerAdapter.py
Log:
GComm is no longer used


Deleted: trunk/gnue-common/src/rpc/GComm.py
===================================================================
--- trunk/gnue-common/src/rpc/GComm.py  2005-09-22 09:39:09 UTC (rev 7971)
+++ trunk/gnue-common/src/rpc/GComm.py  2005-09-22 09:42:11 UTC (rev 7972)
@@ -1,28 +0,0 @@
-# GNU Enterprise RPC interface - Server adapter
-#
-# Copyright 2001-2005 Free Software Foundation
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise 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 Enterprise 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 program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id: $
-
-print 'The use of the "common.rpc.GComm" module is deprecated. Please use the'
-print '"common.rpc.server" or "common.rpc.client" module instead.'
-
-from client import attach
-from server import bind

Modified: trunk/gnue-common/src/rpc/drivers/pyro/ClientAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/pyro/ClientAdapter.py     2005-09-22 
09:39:09 UTC (rev 7971)
+++ trunk/gnue-common/src/rpc/drivers/pyro/ClientAdapter.py     2005-09-22 
09:42:11 UTC (rev 7972)
@@ -53,7 +53,7 @@
              "please install xmlrpc from:\n"
              "    http://sourceforge.net/projects/pyro "
              "the appropriate DEBIAN package is python-pyro.deb")
-    raise GComm.AdapterInitializationError, tmsg
+    raise client.AdapterInitializationError, tmsg
 
 
 ##############################################################################
@@ -100,7 +100,7 @@
            tmsg = _("py-xmlrpc just support http as a transport. "
                     "If you need https please have a look at the "
                     "'pw_xmlrpc' adapter.")
-           raise GComm.AdapterConfigurationError,  tmsg
+           raise client.AdapterConfigurationError,  tmsg
         #
         #   path parameter
         #
@@ -158,10 +158,10 @@
     except KeyError:
       tmsg = _("To use Pyro, you must either specify a 'url' or\n"
                "a 'host' and 'port' setting.")
-      raise GComm.AdapterConfigurationError,  tmsg
+      raise client.AdapterConfigurationError,  tmsg
     except:
       tmsg = u_("Unable to initialize the Pyro interface at %s") % url
-      raise GComm.AdapterInitializationError, tmsg
+      raise client.AdapterInitializationError, tmsg
 
 
   def request(self, service, params={}):

Modified: trunk/gnue-common/src/rpc/drivers/pyro/ServerAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/pyro/ServerAdapter.py     2005-09-22 
09:39:09 UTC (rev 7971)
+++ trunk/gnue-common/src/rpc/drivers/pyro/ServerAdapter.py     2005-09-22 
09:42:11 UTC (rev 7972)
@@ -50,7 +50,7 @@
   except ImportError:
     tmsg = _("\nUnable to load Pyro.  To use the Pyro interface, \n"
              "please install pyro from:\n    http://pyro.sf.net/";)
-    raise GComm.AdapterInitializationError, tmsg
+    raise server.AdapterInitializationError, tmsg
 
 
 # Mapping from GRPC's datatype to XML-RPC datatypes