gnue-appserver/src frontend.py geasRpcServer.py...

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-appserver
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/07/28 17:25:02

Modified files:
        src            : frontend.py geasRpcServer.py 
                         geasSessionManager.py test2.py 
        src/language   : Session.py 

Log message:
        Pass connections variable to geasSessionManager's constructor.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/frontend.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasRpcServer.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasSessionManager.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/test2.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/language/Session.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue-appserver/src/frontend.py
diff -c gnue-appserver/src/frontend.py:1.12 gnue-appserver/src/frontend.py:1.13
*** gnue-appserver/src/frontend.py:1.12 Thu May 22 16:04:54 2003
--- gnue-appserver/src/frontend.py      Mon Jul 28 17:25:01 2003
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: frontend.py,v 1.12 2003/05/22 20:04:54 reinhard Exp $
  
  import os, getpass
  from gnue.common.apps import GClientApp
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: frontend.py,v 1.13 2003/07/28 21:25:01 reinhard Exp $
  
  import os, getpass
  from gnue.common.apps import GClientApp
***************
*** 59,70 ****
    def __init__ (self):
      GClientApp.GClientApp.__init__ (self)
  
-     # create session manager object representing the server
-     self.server = geasSessionManager.geasSessionManager ()
- 
      # this should (IMHO) happen in geasSessionManager -- reinhard
      self.connections.setLoginHandler (geasLoginHandler ())
!     self.server.setConnections (self.connections)
  
      # the current session_id
      self.session = None
--- 59,69 ----
    def __init__ (self):
      GClientApp.GClientApp.__init__ (self)
  
      # this should (IMHO) happen in geasSessionManager -- reinhard
      self.connections.setLoginHandler (geasLoginHandler ())
! 
!     # create session manager object representing the server
!     self.server = geasSessionManager.geasSessionManager (self.connections)
  
      # the current session_id
      self.session = None
Index: gnue-appserver/src/geasRpcServer.py
diff -c gnue-appserver/src/geasRpcServer.py:1.23 
gnue-appserver/src/geasRpcServer.py:1.24
*** gnue-appserver/src/geasRpcServer.py:1.23    Sun Apr  6 19:54:38 2003
--- gnue-appserver/src/geasRpcServer.py Mon Jul 28 17:25:01 2003
***************
*** 19,25 ****
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasRpcServer.py,v 1.23 2003/04/06 23:54:38 siesel Exp $
  
  ####
  #  
--- 19,25 ----
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasRpcServer.py,v 1.24 2003/07/28 21:25:01 reinhard Exp $
  
  ####
  #  
***************
*** 235,248 ****
      if hasattr(self,"sm"):
        return self.sm
      
-     self.sm=geasSessionManager.geasSessionManager()
      loginhandler=testLoginHandler ()
      if self.OPTIONS["username"]:
        loginhandler.setLoginData(self.OPTIONS["username"],
                                  self.OPTIONS["password"])
        
      self.connections.setLoginHandler (loginhandler)
!     self.sm.setConnections(self.connections)
      return self.sm
  
    def selftest(self):
--- 235,248 ----
      if hasattr(self,"sm"):
        return self.sm
      
      loginhandler=testLoginHandler ()
      if self.OPTIONS["username"]:
        loginhandler.setLoginData(self.OPTIONS["username"],
                                  self.OPTIONS["password"])
        
      self.connections.setLoginHandler (loginhandler)
! 
!     self.sm = geasSessionManager.geasSessionManager (self.connections)
      return self.sm
  
    def selftest(self):
Index: gnue-appserver/src/geasSessionManager.py
diff -c gnue-appserver/src/geasSessionManager.py:1.7 
gnue-appserver/src/geasSessionManager.py:1.8
*** gnue-appserver/src/geasSessionManager.py:1.7        Tue Apr 15 20:18:01 2003
--- gnue-appserver/src/geasSessionManager.py    Mon Jul 28 17:25:01 2003
***************
*** 19,25 ****
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasSessionManager.py,v 1.7 2003/04/16 00:18:01 siesel Exp $
  
  from geasList import *
  from geasSession import *
--- 19,25 ----
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasSessionManager.py,v 1.8 2003/07/28 21:25:01 reinhard Exp $
  
  from geasList import *
  from geasSession import *
***************
*** 30,44 ****
  
  class geasSessionManager:
    
!   def __init__(self):
!     self._sessNo=0
!     self._sessions={}
      # use DB for authetification
!     self._authAdapter=geasAuthentification.geasDBAuthAgent()
! 
!   def setConnections(self,connections):
!     self._connections=connections
! 
  
    def _getSession(self,sess_id):
      try:
--- 30,41 ----
  
  class geasSessionManager:
    
!   def __init__ (self, connections):
!     self._connections = connections
!     self._sessNo = 0
!     self._sessions = {}
      # use DB for authetification
!     self._authAdapter = geasAuthentification.geasDBAuthAgent()
  
    def _getSession(self,sess_id):
      try:
Index: gnue-appserver/src/language/Session.py
diff -c gnue-appserver/src/language/Session.py:1.6 
gnue-appserver/src/language/Session.py:1.7
*** gnue-appserver/src/language/Session.py:1.6  Thu May 22 15:06:49 2003
--- gnue-appserver/src/language/Session.py      Mon Jul 28 17:25:02 2003
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: Session.py,v 1.6 2003/05/22 19:06:49 reinhard Exp $
  
  from gnue.common.apps import GClientApp
  from gnue.common.datasources import GLoginHandler
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: Session.py,v 1.7 2003/07/28 21:25:02 reinhard Exp $
  
  from gnue.common.apps import GClientApp
  from gnue.common.datasources import GLoginHandler
***************
*** 47,56 ****
    def __init__ (self, user, password):
      GClientApp.GClientApp.__init__ (self)
  
-     self._server = geasSessionManager.geasSessionManager ()
-     
      self.connections.setLoginHandler (myLoginHandler ())
!     self._server.setConnections (self.connections)
  
  ##  access GNUe Appserver over RPC
  ##  
--- 47,55 ----
    def __init__ (self, user, password):
      GClientApp.GClientApp.__init__ (self)
  
      self.connections.setLoginHandler (myLoginHandler ())
! 
!     self._server = geasSessionManager.geasSessionManager (self.connections)
  
  ##  access GNUe Appserver over RPC
  ##  
Index: gnue-appserver/src/test2.py
diff -c gnue-appserver/src/test2.py:1.10 gnue-appserver/src/test2.py:1.11
*** gnue-appserver/src/test2.py:1.10    Thu May 22 15:06:49 2003
--- gnue-appserver/src/test2.py Mon Jul 28 17:25:01 2003
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: test2.py,v 1.10 2003/05/22 19:06:49 reinhard Exp $
  
  import os
  from gnue.common.apps import GClientApp
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: test2.py,v 1.11 2003/07/28 21:25:01 reinhard Exp $
  
  import os
  from gnue.common.apps import GClientApp
***************
*** 41,48 ****
      self.connections.setLoginHandler (testLoginHandler ())
      
      print "Creating session object ..."
!     sm=geasSessionManager.geasSessionManager ()
!     sm.setConnections(self.connections)
      return sm
      
    # 
---------------------------------------------------------------------------
--- 41,47 ----
      self.connections.setLoginHandler (testLoginHandler ())
      
      print "Creating session object ..."
!     sm = geasSessionManager.geasSessionManager (self.connections)
      return sm
      
    # 
---------------------------------------------------------------------------