gnue appserver/src/geasRpcClient.py appserver/s...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jan Ischebeck <address@hidden>  02/05/05 19:38:27

Modified files:
        appserver/src  : geasRpcClient.py test.py 
        common/src     : GServerApp.py 
        common/src/commdrivers/_test: README donuts.grpc server.py 
                                      test.py 
        common/src/commdrivers/pw_xmlrpc: ServerAdapter.py 
Added files:
        appserver/grpc : GEAS.grpc 
        common/src     : GTest.py 

Log message:
        some i18 fixes,
        add commands gacvs and gtestcvs.
        updated and fixed all testcases
        add testing program GTest.py

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/geasRpcClient.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/test.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/grpc/GEAS.grpc?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GTest.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GServerApp.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/_test/README.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/_test/donuts.grpc.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/_test/server.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/_test/test.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/pw_xmlrpc/ServerAdapter.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/appserver/src/geasRpcClient.py
diff -c gnue/appserver/src/geasRpcClient.py:1.1 
gnue/appserver/src/geasRpcClient.py:1.2
*** gnue/appserver/src/geasRpcClient.py:1.1     Wed May  1 16:56:22 2002
--- gnue/appserver/src/geasRpcClient.py Sun May  5 19:38:27 2002
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: geasRpcClient.py,v 1.1 2002/05/01 20:56:22 reinhard Exp $
  
  
  
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: geasRpcClient.py,v 1.2 2002/05/05 23:38:27 siesel Exp $
  
  
  
***************
*** 54,61 ****
  #   print sessMan.Status
  
  
! if __name__ == "__main__":
! 
    from geasSession import *
    from geasList import *
    from geasInstance import *
--- 54,60 ----
  #   print sessMan.Status
  
  
! def run():
    from geasSession import *
    from geasList import *
    from geasInstance import *
***************
*** 102,104 ****
--- 101,107 ----
    print "Status: ",sessionManager.Status()
    
    print "Thank you for playing!"
+ 
+ 
+ if __name__ == "__main__":
+   run()
Index: gnue/appserver/src/test.py
diff -c gnue/appserver/src/test.py:1.4 gnue/appserver/src/test.py:1.5
*** gnue/appserver/src/test.py:1.4      Wed May  1 16:56:22 2002
--- gnue/appserver/src/test.py  Sun May  5 19:38:27 2002
***************
*** 19,43 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: test.py,v 1.4 2002/05/01 20:56:22 reinhard Exp $
  
  from geasSession import *
  from geasList import *
  from geasInstance import *
- #from geasRpcClient import *
  
- 
- #print "Opening RPC connection ..."
- #params = { 'host': 'localhost',
- #           'port': 8765,
- #           'transport': 'http' }
- #rpcClient = geasRpcClient('xmlrpc',params)
- 
- #print "Setup an link to the session manager"
- #sessionManager = rpcClient.requestSessionManager()
- 
- #print "Get the status of the session manager"
- #print "Status: ",sessionManager.Status()
  
  print "Creating session object ..."
  session = geasSession ()
--- 19,30 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: test.py,v 1.5 2002/05/05 23:38:27 siesel Exp $
  
  from geasSession import *
  from geasList import *
  from geasInstance import *
  
  
  print "Creating session object ..."
  session = geasSession ()
Index: gnue/common/src/GServerApp.py
diff -c gnue/common/src/GServerApp.py:1.7 gnue/common/src/GServerApp.py:1.8
*** gnue/common/src/GServerApp.py:1.7   Sat May  4 12:45:07 2002
--- gnue/common/src/GServerApp.py       Sun May  5 19:38:27 2002
***************
*** 30,36 ****
  # CORBA, RPC-XML, SOAP, etc and daemon/forking/threading.
  #
  
! from GBaseApp import GBaseApp
  from GLogger import Logger
  import sys, os
  
--- 30,36 ----
  # CORBA, RPC-XML, SOAP, etc and daemon/forking/threading.
  #
  
! from GBaseApp import GBaseApp, GConfig
  from GLogger import Logger
  import sys, os
  
***************
*** 39,50 ****
  
  class GServerApp(GBaseApp):
  
!   def __init__(self, connections=None, application=None, defaults=None):
      self.COMMAND_OPTIONS.append (
!          [ 'foreground','Z','no-detach',0,0, None,
!            _('Do not send the server into the background. For a POSIX system, 
')
!            _('this option keeps the server process from forking and detaching 
')
!            _('from its controlling terminal.')],
      )
      GBaseApp.__init__(self, connections, application)
  
--- 39,62 ----
  
  class GServerApp(GBaseApp):
  
!   def __init__(self, connections=None, application=None):
!     #
!     # i18n support
!     #
!     import gettext
! 
!     try:
!       
gettext.install('gnue',GConfig.getInstalledBase('install_prefix')+'/translations')
!     except IOError:
!       sys.stderr.write('Unable to load locale information falling back to 
default English language translations.\n')    
!       import __builtin__
!       __builtin__.__dict__['_'] = lambda string:string
! 
      self.COMMAND_OPTIONS.append (
!       [ 'foreground','Z','no-detach',0,0, None,
!         _('Do not send the server into the background. For a POSIX system, ')+
!         _('this option keeps the server process from forking and detaching ')+
!         _('from its controlling terminal.')],
      )
      GBaseApp.__init__(self, connections, application)
  
Index: gnue/common/src/commdrivers/_test/README
diff -c gnue/common/src/commdrivers/_test/README:1.3 
gnue/common/src/commdrivers/_test/README:1.4
*** gnue/common/src/commdrivers/_test/README:1.3        Tue Apr 30 13:25:53 2002
--- gnue/common/src/commdrivers/_test/README    Sun May  5 19:38:27 2002
***************
*** 21,23 ****
--- 21,29 ----
                 whats going on)
  5. now call the client: python test.py
  6. dream about donuts
+ 
+ 2002-05-06 
+ 
+ add the command "gtestcvs" to the autocreated cvs commands
+ gtestcvs can call many small test or demo programs for you,
+ including the test programs in this directory.
Index: gnue/common/src/commdrivers/_test/donuts.grpc
diff -c gnue/common/src/commdrivers/_test/donuts.grpc:1.4 
gnue/common/src/commdrivers/_test/donuts.grpc:1.5
*** gnue/common/src/commdrivers/_test/donuts.grpc:1.4   Wed Feb 27 15:45:53 2002
--- gnue/common/src/commdrivers/_test/donuts.grpc       Sun May  5 19:38:27 2002
***************
*** 21,34 ****
          <attribute name="flavor" type="string" readonly=""/>
          <attribute name="unitLocation" type="string" readonly=""/>
          <method name="requestDelivery" return="string">
! 
          </method>
!         <method name="get_flavor" return="string">
  
-         </method>
        </object>
  
!       <method name="getBakingUnit" return="BakingUnit">
          <argument name="flavor" type="string"/>
        </method>
  
--- 21,35 ----
          <attribute name="flavor" type="string" readonly=""/>
          <attribute name="unitLocation" type="string" readonly=""/>
          <method name="requestDelivery" return="string">
!             <argument name="address" type="string"/>
          </method>
!         <method name="get_flavor" return="string"/>        
!         <method name="get_unitLocation" return="string"/>
  
        </object>
  
!       <method name="getBakingUnit" 
!             return="&lt;DonutPlace.Bakery.BakingUnit&gt;">
          <argument name="flavor" type="string"/>
        </method>
  
Index: gnue/common/src/commdrivers/_test/server.py
diff -c gnue/common/src/commdrivers/_test/server.py:1.9 
gnue/common/src/commdrivers/_test/server.py:1.10
*** gnue/common/src/commdrivers/_test/server.py:1.9     Tue Apr 30 19:52:30 2002
--- gnue/common/src/commdrivers/_test/server.py Sun May  5 19:38:27 2002
***************
*** 64,69 ****
--- 64,70 ----
  
  from gnue.common import GComm, openResource
  from gnue.common.GServerApp import GServerApp
+ import time
  
  
  #
***************
*** 74,93 ****
  #
  class DonutServery(GServerApp):
  
!   def run(self):
  
!     # Daemonize (if appropriate)
!     GServerApp.run(self)
  
      # Create the various servers
!     servers=bind(self.requestDonutPlace)
  
!     # Start server for the different protocolls
      for key in servers.keys():
!       servers[key].serveAsNewThread()
  
      # wait for the servers shut down
!     wait()
      
  
    def requestDonutPlace(self):
--- 75,108 ----
  #
  class DonutServery(GServerApp):
  
!   def setTransports(self,transports):
!       self._transports=transports
  
!   def setGrpcFile(self,grpcFile):
!       self._grpcFile=grpcFile
!   
!   def bind(self,handler):
!       # Expose our services to the world
!       return GComm.bind ( self._grpcFile,
!                           self._transports,
!                           {'DonutPlace': handler })
! 
! 
!   def run(self):
  
      # Create the various servers
!     servers=self.bind(self.requestDonutPlace)
! 
!     # Daemonize (if appropriate)
!     #GServerApp.run(self)
  
!     # Start the server for the different protocolls
      for key in servers.keys():
!       servers[key].serveAsNewThread()      
  
      # wait for the servers shut down
!     while 1==1:
!       time.sleep(199999999)
      
  
    def requestDonutPlace(self):
***************
*** 122,128 ****
    # Expose our services to the world
    return GComm.bind ( "donuts.grpc",
                        transports,
-                      # {'xmlrpc': handler }) 
                        {'DonutPlace': handler })
  
  
--- 137,142 ----
***************
*** 143,148 ****
--- 157,166 ----
    print "Exporting our services via xmlrpc..."
    transports['xmlrpc'] =  { 'port': 8765 }
  
+ def bind_pw_xmlrpc():  # xmlrpc by pythonware
+   print "Exporting our services via xmlrpc..."
+   transports['pw_xmlrpc'] =  { 'port': 8765 }
+ 
  
  #
  # Use the sockets interface
***************
*** 172,186 ****
  def __request():
    return DonutPlace()
  
- 
  #
! # main
  #
! if __name__ == '__main__':
  
!   bind_xmlrpc()
!   #bind_sockets()
  
-   DonutServery().run()
  
  
--- 190,215 ----
  def __request():
    return DonutPlace()
  
  #
! #  start the server
  #
! def run():
  
! #  bind_xmlrpc()
!   bind_pw_xmlrpc()
! # bind_sockets()
!   server=DonutServery()
!   server.setTransports(transports)
! 
!   
!   import os  #  detect own directory
!   server.setGrpcFile(os.path.abspath(os.getcwd())+"/donuts.grpc")
!   server.run()
  
  
+ #
+ # main
+ #
+ if __name__ == '__main__':
+   run()
  
Index: gnue/common/src/commdrivers/_test/test.py
diff -c gnue/common/src/commdrivers/_test/test.py:1.5 
gnue/common/src/commdrivers/_test/test.py:1.6
*** gnue/common/src/commdrivers/_test/test.py:1.5       Sun Apr 21 21:02:00 2002
--- gnue/common/src/commdrivers/_test/test.py   Sun May  5 19:38:27 2002
***************
*** 60,65 ****
--- 60,79 ----
  
    test('xmlrpc',params)
  
+ #
+ # Test the xmlrpc interface
+ #
+ # Expects server.py to be running via xmlrpc on this
+ # machine's port 8765.
+ #
+ def test_pw_xmlrpc():
+ 
+   params = { 'host': 'localhost',
+              'port': 8765,
+              'transport': 'http' }
+ 
+   test('pw_xmlrpc',params)
+ 
  
  #
  # Test the sockets interface
***************
*** 74,79 ****
--- 88,95 ----
  
    test('sockets',params)
  
+ def run():
+   test_xmlrpc()
  
  #
  # main
***************
*** 83,88 ****
    #test_proxy()
    
    test_xmlrpc()
!   
    #test_sockets()
  
--- 99,104 ----
    #test_proxy()
    
    test_xmlrpc()
!   #test_pw_xmlrpc()
    #test_sockets()
  
Index: gnue/common/src/commdrivers/pw_xmlrpc/ServerAdapter.py
diff -c gnue/common/src/commdrivers/pw_xmlrpc/ServerAdapter.py:1.2 
gnue/common/src/commdrivers/pw_xmlrpc/ServerAdapter.py:1.3
*** gnue/common/src/commdrivers/pw_xmlrpc/ServerAdapter.py:1.2  Fri May  3 
13:58:43 2002
--- gnue/common/src/commdrivers/pw_xmlrpc/ServerAdapter.py      Sun May  5 
19:38:27 2002
***************
*** 417,423 ****
          method=method[i+2:]        
        except ValueError:
          raise AttributeError, \
!               _("Wrong format of object handler ") \
                _("in method call %s") % method
        # TODO check in service dir, if obj is supported or not
        o=ObjectLibrarian.retrieveObject(objhandle)
--- 417,423 ----
          method=method[i+2:]        
        except ValueError:
          raise AttributeError, \
!               _("Wrong format of object handler ") +\
                _("in method call %s") % method
        # TODO check in service dir, if obj is supported or not
        o=ObjectLibrarian.retrieveObject(objhandle)
***************
*** 431,448 ****
          
          if server_method==None:
            raise AttributeError, \
!               _("Server XML-RPC method %s has is not ") \
                _("bound to real method") % method
        except:
          raise AttributeError, \
!               _("Server does not have XML-RPC ") \
                _("procedure %s") % method
        try:
          attr=direntry['signature']
          # TODO:  Compare submitted attributs with signature
        except:
          raise AttributeError, \
!               _("Server XML-RPC ") \
                _("procedure %s accepts just %s as attributs") % (method,attr)
  
      # replace object handles in param with the real object
--- 431,448 ----
          
          if server_method==None:
            raise AttributeError, \
!               _("Server XML-RPC method %s has is not ") + \
                _("bound to real method") % method
        except:
          raise AttributeError, \
!               _("Server does not have XML-RPC ") +\
                _("procedure %s") % method
        try:
          attr=direntry['signature']
          # TODO:  Compare submitted attributs with signature
        except:
          raise AttributeError, \
!               _("Server XML-RPC ") +\
                _("procedure %s accepts just %s as attributs") % (method,attr)
  
      # replace object handles in param with the real object
***************
*** 483,489 ****
                             params[4],params[5],params[6])
      else:
        raise AttributeError,\
!              _("Too many param for XML-RPC ") \
               _("procedure %s") % method
  
      # replace real object in param with an object handle
--- 483,489 ----
                             params[4],params[5],params[6])
      else:
        raise AttributeError,\
!              _("Too many param for XML-RPC ") + \
               _("procedure %s") % method
  
      # replace real object in param with an object handle