gnue appserver/src/geasSession.py appserver/src...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jan Ischebeck <address@hidden>  03/03/31 08:39:50

Modified files:
        appserver/src  : geasSession.py geasSessionManager.py 
                         geasRpcServer.py 
        common/src/apps: GServerApp.py 
Added files:
        appserver/src  : geasConfiguration.py 

Log message:
        appserver now is using the GConfig Configuration framework.
        settings for database, rpctype and rpcport are read from gnue.conf
        but can be overridden by command line parameters

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/geasConfiguration.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/geasSession.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/geasSessionManager.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/geasRpcServer.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/apps/GServerApp.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gnue/appserver/src/geasRpcServer.py
diff -c gnue/appserver/src/geasRpcServer.py:1.19 
gnue/appserver/src/geasRpcServer.py:1.20
*** gnue/appserver/src/geasRpcServer.py:1.19    Sun Mar 23 17:56:21 2003
--- gnue/appserver/src/geasRpcServer.py Mon Mar 31 08:39:50 2003
***************
*** 19,27 ****
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasRpcServer.py,v 1.19 2003/03/23 22:56:21 siesel Exp $
  
- from gnue.forms.GFConfig import ConfigOptions
  ####
  #  
  #  TODO: The old geasSessionManager should be removed
--- 19,26 ----
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasRpcServer.py,v 1.20 2003/03/31 13:39:50 siesel Exp $
  
  ####
  #  
  #  TODO: The old geasSessionManager should be removed
***************
*** 74,79 ****
--- 73,79 ----
  from gnue.common.apps import GConfig
  from gnue.common.utils.FileUtils import openResource
  from gnue.common.apps.GServerApp import GServerApp
+ from gnue.appserver.geasConfiguration import ConfigOptions
  import time,os,sys
  from gnue.appserver import VERSION
  import geasSessionManager
***************
*** 94,105 ****
            + "data access to various database backends."
  
    COMMAND_OPTIONS = [
!     [ 'rpctype',None,'rpc-type',1,"xmlrpc", 'type',
        _('Set the GNURPC connection type. The currently supported values ')+
        _("for <type> are 'xmlrpc' and 'pw_xmlrpc'. For more information on ")+
        _('GNURPC connection types have a look at ')+
        _('common/doc/RPC-abstraction. ')],
!     [ 'database',None,'database',1,"gnue", 'name',
        _('Set the Database to use for loading and storing data to ')+
        _("<name>. Appserver will search for it in ")+
        _('connections.conf. ')],
--- 94,108 ----
            + "data access to various database backends."
  
    COMMAND_OPTIONS = [
!     [ 'rpctype',None,'rpc-type',1,None, 'type',
        _('Set the GNURPC connection type. The currently supported values ')+
        _("for <type> are 'xmlrpc' and 'pw_xmlrpc'. For more information on ")+
        _('GNURPC connection types have a look at ')+
        _('common/doc/RPC-abstraction. ')],
!     [ 'rpcport',None,'rpc-port',1,None, 'port',
!       _('Set the GNURPC port. For more information on ')+
!       _('GNURPC have a look at common/doc/RPC-abstraction. ')],
!     [ 'database',None,'database',1,None, 'name',
        _('Set the Database to use for loading and storing data to ')+
        _("<name>. Appserver will search for it in ")+
        _('connections.conf. ')],
***************
*** 109,117 ****
        _('Set the password for the used database.')]]
    
    def __init__(self, connections=None):
!     GServerApp.__init__(self, connections,'forms')
!     self.configurationManager.registerAlias('gConfig', 'common')
!     self.configurationManager.registerAlias('gasConfig', 'appserver')
  
  
    ## set a list of transports
--- 112,132 ----
        _('Set the password for the used database.')]]
    
    def __init__(self, connections=None):
!     GServerApp.__init__(self, connections,'appserver',ConfigOptions)
!     self.configurationManager.registerAlias('gConfig', 'appserver')
! 
!     # overwrite configuration settings by command line parameters
!     cparser=self.configurationManager._loadedConfigs['gnue.conf']
!     
!     if self.OPTIONS["rpctype"]!=None:
!       cparser.set('appserver','rpctype',self.OPTIONS["rpctype"])
! 
!     if self.OPTIONS["rpcport"]!=None:
!       cparser.set('appserver','rpcport',self.OPTIONS["rpcport"])
! 
!     if self.OPTIONS["database"]!=None:
!       cparser.set('appserver','database',self.OPTIONS["database"])
! 
  
  
    ## set a list of transports
***************
*** 121,148 ****
  
  
    def phaseInit(self):
-     if self.OPTIONS["rpctype"]=="xmlrpc":
  
!       print "Exporting our services via xmlrpc (port 8765) ..."
!       self.setTransports({'xmlrpc':{ 'port': 8765 }})
  
!     elif self.OPTIONS["rpctype"]=="pw_xmlrpc":
  
!       print "Exporting our services via pw_xmlrpc (port 8765) ..."
!       self.setTransports({'pw_xmlrpc':{ 'port': 8765 }})
  
!     elif self.OPTIONS["rpctype"]=="sockets":
  
        # Sockets not working yet
!       print "Exporting our services via sockets (port 8765) ..."
!       self.setTransports({'sockets':{ 'port': 8765 }})
  
      else:
  
!       # not transport protocol set. exiting
        print "The protocol you've set is currently not supported."
        sys.exit(-1)
! 
  
    def run(self):
             
--- 136,168 ----
  
  
    def phaseInit(self):
  
!     rpctype = gConfig("rpctype")
!     
!     if rpctype=="xmlrpc":
! 
!       port = gConfig("rpcport")
!       print "Exporting our services via xmlrpc (port %s) ..." % port
!       self.setTransports({'xmlrpc':{ 'port': int(port) }})
  
!     elif rpctype=="pw_xmlrpc":
  
!       port = gConfig("rpcport")
!       print "Exporting our services via pw_xmlrpc (port %s) ..." % port
!       self.setTransports({'pw_xmlrpc':{ 'port': int(port) }})
  
!     elif rpctype=="sockets":
  
        # Sockets not working yet
!       print "Exporting our services via sockets (EXPERIMENTAL!) ..."
!       self.setTransports({'sockets':{}})
  
      else:
  
!       # wrong transport protocol set. exiting
        print "The protocol you've set is currently not supported."
        sys.exit(-1)
!     
  
    def run(self):
             
***************
*** 178,184 ****
        
      self.connections.setLoginHandler (loginhandler)
      sm.setConnections(self.connections)
!     sm.setDatabase(self.OPTIONS["database"])
      return sm
  
    def requestSessionManager(self):
--- 198,204 ----
        
      self.connections.setLoginHandler (loginhandler)
      sm.setConnections(self.connections)
!     sm.setDatabase(gConfig("database"))   
      return sm
  
    def requestSessionManager(self):
***************
*** 191,197 ****
        
      self.connections.setLoginHandler (loginhandler)
      sm.setConnections(self.connections)
-     sm.setDatabase(self.OPTIONS["database"])
      return sm
  
  
--- 211,216 ----
Index: gnue/appserver/src/geasSession.py
diff -c gnue/appserver/src/geasSession.py:1.22 
gnue/appserver/src/geasSession.py:1.23
*** gnue/appserver/src/geasSession.py:1.22      Sat Feb  1 10:02:45 2003
--- gnue/appserver/src/geasSession.py   Mon Mar 31 08:39:50 2003
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: geasSession.py,v 1.22 2003/02/01 15:02:45 reinhard Exp $
  
  import geasList
  import geasTrigger 
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: geasSession.py,v 1.23 2003/03/31 13:39:50 siesel Exp $
  
  import geasList
  import geasTrigger 
***************
*** 55,61 ****
      self.loggedIn = 0
      self._user = ""
      self._connections = connections
!     self._database = "gnue"
      self._lists = {}
      self._classes = {}
      self._listcount=0
--- 55,64 ----
      self.loggedIn = 0
      self._user = ""
      self._connections = connections
!     try:
!       self._database = gConfig('database')
!     except:
!       self._database = "gnue"
      self._lists = {}
      self._classes = {}
      self._listcount=0
***************
*** 280,286 ****
    def call(self,classname,obj_id_list,methodname,parameters):    
      # create a temporary geasList
      list = geasList.geasList (self, classname)
!     list.setPrefetch (["gnue_id"] + propertylist)
      list.setSort (["gnue_id"])
      # Accessing the database for every single object_id is not very elegant,
      # but for now it works. -- Reinhard
--- 283,289 ----
    def call(self,classname,obj_id_list,methodname,parameters):    
      # create a temporary geasList
      list = geasList.geasList (self, classname)
!     list.setPrefetch (["gnue_id"]) # + propertylist) TODO: fetch propertylist
      list.setSort (["gnue_id"])
      # Accessing the database for every single object_id is not very elegant,
      # but for now it works. -- Reinhard
Index: gnue/appserver/src/geasSessionManager.py
diff -c gnue/appserver/src/geasSessionManager.py:1.5 
gnue/appserver/src/geasSessionManager.py:1.6
*** gnue/appserver/src/geasSessionManager.py:1.5        Sat Jan  4 11:30:38 2003
--- gnue/appserver/src/geasSessionManager.py    Mon Mar 31 08:39:50 2003
***************
*** 19,25 ****
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasSessionManager.py,v 1.5 2003/01/04 16:30:38 reinhard Exp $
  
  from geasList import *
  from geasSession import *
--- 19,25 ----
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasSessionManager.py,v 1.6 2003/03/31 13:39:50 siesel Exp $
  
  from geasList import *
  from geasSession import *
***************
*** 42,50 ****
    def setConnections(self,connections):
      self._connections=connections
  
-   def setDatabase(self,database):
-     self._database=database
- 
    def Shutdown(self):
      pass
  
--- 42,47 ----
***************
*** 64,70 ****
    def open(self,authentification):
      
      sess=geasSession (self._connections)
-     sess._database=self._database
      sess._authAdapter=self._authAdapter      
      if not sess.login(authentification['user'],authentification['password']):
        raise AuthError
--- 61,66 ----
Index: gnue/common/src/apps/GServerApp.py
diff -c gnue/common/src/apps/GServerApp.py:1.12 
gnue/common/src/apps/GServerApp.py:1.13
*** gnue/common/src/apps/GServerApp.py:1.12     Mon Mar 17 15:53:30 2003
--- gnue/common/src/apps/GServerApp.py  Mon Mar 31 08:39:50 2003
***************
*** 40,46 ****
  
  class GServerApp(GBaseApp):
  
!   def __init__(self, connections=None, application=None):
  ##     #
  ##     # i18n support
  ##     #
--- 40,46 ----
  
  class GServerApp(GBaseApp):
  
!   def __init__(self, connections=None, application=None, defaults=None):
  ##     #
  ##     # i18n support
  ##     #
***************
*** 59,65 ****
          _('this option keeps the server process from forking and detaching ')+
          _('from its controlling terminal.')],
      )
!     GBaseApp.__init__(self, connections, application)
  
  
  
--- 59,65 ----
          _('this option keeps the server process from forking and detaching ')+
          _('from its controlling terminal.')],
      )
!     GBaseApp.__init__(self, connections, application, defaults)