gnue/appserver scripts/gnue-appserver.in src/ge...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jan Ischebeck <address@hidden>  03/04/06 19:54:38

Modified files:
        appserver/scripts: gnue-appserver.in 
        appserver/src  : geasRpcServer.py 

Log message:
        fix --selftest for non-cvs install

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/scripts/gnue-appserver.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/geasRpcServer.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text

Patches:
Index: gnue/appserver/scripts/gnue-appserver.in
diff -c gnue/appserver/scripts/gnue-appserver.in:1.3 
gnue/appserver/scripts/gnue-appserver.in:1.4
*** gnue/appserver/scripts/gnue-appserver.in:1.3        Wed Jan  1 19:45:40 2003
--- gnue/appserver/scripts/gnue-appserver.in    Sun Apr  6 19:54:38 2003
***************
*** 36,41 ****
    
    geas1.phaseInit();
  
-   print "\n... GEAS up and running ...\n"
    geas1.run();
          
--- 36,40 ----
Index: gnue/appserver/src/geasRpcServer.py
diff -c gnue/appserver/src/geasRpcServer.py:1.22 
gnue/appserver/src/geasRpcServer.py:1.23
*** gnue/appserver/src/geasRpcServer.py:1.22    Sat Apr  5 20:28:19 2003
--- gnue/appserver/src/geasRpcServer.py Sun Apr  6 19:54:38 2003
***************
*** 19,25 ****
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasRpcServer.py,v 1.22 2003/04/06 01:28:19 siesel Exp $
  
  ####
  #  
--- 19,25 ----
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasRpcServer.py,v 1.23 2003/04/06 23:54:38 siesel Exp $
  
  ####
  #  
***************
*** 188,194 ****
  
  
    def run(self):
!   
      # Create the various servers
      servers=GComm.bind (GConfig.getInstalledBase('install_prefix')+\
                          '/shared/grpc/GEAS.grpc',
--- 188,197 ----
  
  
    def run(self):
!     if self.OPTIONS["selftest"]:
!       self.selftest()
!       return
!       
      # Create the various servers
      servers=GComm.bind (GConfig.getInstalledBase('install_prefix')+\
                          '/shared/grpc/GEAS.grpc',
***************
*** 196,201 ****
--- 199,207 ----
                           {'OldSessionManager': self.requestOldSessionManager,
                            'SessionManager': self.requestSessionManager})
  
+     # be verbose
+     print _("\n... GNUe Application Server up and running ...\n")
+ 
      # Daemonize (if appropriate)
      GServerApp.run(self)
  
***************
*** 239,277 ****
      self.sm.setConnections(self.connections)
      return self.sm
  
! 
! # 
=============================================================================
! # Login Handler
! # 
=============================================================================
! 
! class testLoginHandler (GLoginHandler.LoginHandler):
!   def setLoginData(self,username,password):
!     self._username=username
!     self._password=password    
!     
!   def getLogin (self, *arguments):
!     if hasattr(self,"_username"):
!       return {"_username": self._username,
!               "_password": self._password}
!     
!     return {"_username": "gnue", "_password": None}
! 
! 
! #
! # main
! #
! if __name__ == '__main__':
! 
!   geas1 = geasRpcServer();
!      
!   geas1.phaseInit()
! 
!   if not geas1.OPTIONS["selftest"]:
! 
!     print _("\n... GNUe Application Server up and running ...\n")
!     geas1.run()
! 
!   else:
  
      ## Starting Appserver selftest
      print _("\nGNUe Application Server is running a simple self test\n")
--- 245,251 ----
      self.sm.setConnections(self.connections)
      return self.sm
  
!   def selftest(self):
  
      ## Starting Appserver selftest
      print _("\nGNUe Application Server is running a simple self test\n")
***************
*** 281,287 ****
      print _('the "address_person" example.\n')
  
      print _("Step 1: Startup Session Manager\n")    
!     sm = geas1.requestSessionManager()
  
      print _("Step 2: Logging into the session (as user 'hacker'")+\
            _("with password 'secret')...\n")
--- 255,261 ----
      print _('the "address_person" example.\n')
  
      print _("Step 1: Startup Session Manager\n")    
!     sm = self.requestSessionManager()
  
      print _("Step 2: Logging into the session (as user 'hacker'")+\
            _("with password 'secret')...\n")
***************
*** 302,305 ****
--- 276,306 ----
      print _('\n\nSelftest passed!\n')
  
  
+ 
+ # 
=============================================================================
+ # Login Handler
+ # 
=============================================================================
+ 
+ class testLoginHandler (GLoginHandler.LoginHandler):
+   def setLoginData(self,username,password):
+     self._username=username
+     self._password=password    
+     
+   def getLogin (self, *arguments):
+     if hasattr(self,"_username"):
+       return {"_username": self._username,
+               "_password": self._password}
      
+     return {"_username": "gnue", "_password": None}
+ 
+ 
+ #
+ # main
+ #
+ if __name__ == '__main__':
+ 
+   geas1 = geasRpcServer();
+      
+   geas1.phaseInit()
+ 
+   geas1.run()