gnue-appserver/src geasSessionManager.py classr...

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-appserver
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/08/08 15:33:51

Modified files:
        src            : geasSessionManager.py 
        src/classrep   : __init__.py crpopulate.py ctest.py dtest.py 
                         mtest.py test.py 

Log message:
        Moved initialization of Class Repository to geasSessionManager.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasSessionManager.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/__init__.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/crpopulate.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/ctest.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/dtest.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/mtest.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/test.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue-appserver/src/classrep/__init__.py
diff -c gnue-appserver/src/classrep/__init__.py:1.3 
gnue-appserver/src/classrep/__init__.py:1.4
*** gnue-appserver/src/classrep/__init__.py:1.3 Tue May 27 10:30:57 2003
--- gnue-appserver/src/classrep/__init__.py     Fri Aug  8 15:33:51 2003
***************
*** 19,53 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: __init__.py,v 1.3 2003/05/27 14:30:57 jvetter Exp $
  
  from Module import *
  from Class  import *
  from Namespace import *
  from Definition import *
  
- _CRDefinition = None
- _CRModules    = None
- _CRClasses    = None
- 
- # 
-----------------------------------------------------------------------------
- # load a class repository definition from file
  # 
-----------------------------------------------------------------------------
! def loadDefinition (fileName):
!   global _CRDefinition
!   _CRDefinition = RepositoryDefinition (fileName)
!   return _CRDefinition
! 
  # 
-----------------------------------------------------------------------------
- # find a class in the class repository
- # 
-----------------------------------------------------------------------------
- def findClass (className, session):
-   global _CRModules, _CRClasses, _CRDefinition
- 
-   if not _CRModules:
-     _CRModules = ModuleDict (session, _CRDefinition)
  
!   if not _CRClasses:
!     _CRClasses = ClassDict (session, _CRModules)
  
!   return _CRClasses [className]
--- 19,46 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: __init__.py,v 1.4 2003/08/08 19:33:51 reinhard Exp $
  
  from Module import *
  from Class  import *
  from Namespace import *
  from Definition import *
+ from language import Session
  
  # 
-----------------------------------------------------------------------------
! # Global module and class list
  # 
-----------------------------------------------------------------------------
  
! modules = None
! classes = None
  
! def init (server):
!   global modules, classes
!   # First, load the hardwired default repository
!   modules = ModuleDict (None, RepositoryDefinition 
("classrep/repository.ini"))
!   classes = ClassDict (None, modules)
!   # Now, we can access the database to load the real repository
!   session = Session.Session (server, "hacker", "secret")
!   modules = ModuleDict (session)
!   classes = ClassDict (session, modules)
!   return
Index: gnue-appserver/src/classrep/crpopulate.py
diff -c gnue-appserver/src/classrep/crpopulate.py:1.2 
gnue-appserver/src/classrep/crpopulate.py:1.3
*** gnue-appserver/src/classrep/crpopulate.py:1.2       Mon Jul 28 18:44:56 2003
--- gnue-appserver/src/classrep/crpopulate.py   Fri Aug  8 15:33:51 2003
***************
*** 4,10 ****
  
  from language import App
  from Namespace import *
! from classrep import * 
  
  # First we have to create a session from the language interface
  app = App.App ()
--- 4,10 ----
  
  from language import App
  from Namespace import *
! from gnue.appserver import classrep
  
  # First we have to create a session from the language interface
  app = App.App ()
***************
*** 12,18 ****
  
  # Now load the initial class repository
  print "Loading repository definition ..."
! crdef = loadDefinition ('classrep/repository.ini')
  
  
  print "Retrieving existing modules ..."
--- 12,18 ----
  
  # Now load the initial class repository
  print "Loading repository definition ..."
! crdef = classrep.RepositoryDefinition ('classrep/repository.ini')
  
  
  print "Retrieving existing modules ..."
***************
*** 47,53 ****
    for clDef in crdef.classes (newModule.gnue_name):
      # since we need the classes property-dictionary later, we require the
      # class-dictionary here (using the apropriate module-id).
!     aClass = findClass (clDef [0], lSession)
      aClass.gnue_module = newModule.objectId
  
      if clDef [0] in kllist:
--- 47,53 ----
    for clDef in crdef.classes (newModule.gnue_name):
      # since we need the classes property-dictionary later, we require the
      # class-dictionary here (using the apropriate module-id).
!     aClass = classrep.classes [clDef [0]]
      aClass.gnue_module = newModule.objectId
  
      if clDef [0] in kllist:
Index: gnue-appserver/src/classrep/ctest.py
diff -c gnue-appserver/src/classrep/ctest.py:1.3 
gnue-appserver/src/classrep/ctest.py:1.4
*** gnue-appserver/src/classrep/ctest.py:1.3    Mon Jul 28 18:44:56 2003
--- gnue-appserver/src/classrep/ctest.py        Fri Aug  8 15:33:51 2003
***************
*** 1,27 ****
! from language import App
! from classrep import *
  
  app = App.App ()
- sess = app.newSession ("hacker", "secret")
- 
- Modules = ModuleDict (sess)
- Classes = ClassDict (sess, Modules)
  
  print "\nRequesting module 'address' ..."
! addr = Modules ['address']
  
  print "  %s: %s" % (addr.gnue_name, addr.gnue_comment)
  print "  Full name: %s\n" % addr.fullName
  
! print "Number of classes in ClassDict: %d\n" % len (Classes)
  
  print "Requesting class 'address_person':"
! klass = Classes ['address_person']
  
  print "  %s: %s" % (klass.gnue_name, klass.gnue_comment)
  print "  Full name: %s\n" % klass.fullName
  
! print "Number of classes in ClassDict: %d\n" % len (Classes)
  
  print "Number of properties in '%s': %d" % (klass.gnue_name, 
                        len (klass.properties))
--- 1,23 ----
! from gnue.appserver.language import App
! from gnue.appserver import classrep
  
  app = App.App ()
  
  print "\nRequesting module 'address' ..."
! addr = classrep.modules ['address']
  
  print "  %s: %s" % (addr.gnue_name, addr.gnue_comment)
  print "  Full name: %s\n" % addr.fullName
  
! print "Number of classes in ClassDict: %d\n" % len (classrep.classes)
  
  print "Requesting class 'address_person':"
! klass = classrep.classes ['address_person']
  
  print "  %s: %s" % (klass.gnue_name, klass.gnue_comment)
  print "  Full name: %s\n" % klass.fullName
  
! print "Number of classes in ClassDict: %d\n" % len (classrep.classes)
  
  print "Number of properties in '%s': %d" % (klass.gnue_name, 
                        len (klass.properties))
***************
*** 29,42 ****
  for p in klass.properties.keys ():
    print p
  
! print "Has class 'address_dummy' : %d" % Classes.has_key ('address_dummy')
! print "Has class 'address_person': %d" % Classes.has_key ('address_person')
  
  print
  print "Requesting class 'gnue_module' :"
! gmodule = Classes ['gnue_module']
  print "  %s: %s\n" % (gmodule.gnue_name, gmodule.gnue_comment)
! print "Number of classes in ClassDict: %d\n" % len (Classes)
  
  print "gnue_module: findProp gnue_name"
  x = gmodule.findProp ("gnue_name")
--- 25,38 ----
  for p in klass.properties.keys ():
    print p
  
! print "Has class 'address_dummy' : %d" % classrep.classes.has_key 
('address_dummy')
! print "Has class 'address_person': %d" % classrep.classes.has_key 
('address_person')
  
  print
  print "Requesting class 'gnue_module' :"
! gmodule = classrep.classes ['gnue_module']
  print "  %s: %s\n" % (gmodule.gnue_name, gmodule.gnue_comment)
! print "Number of classes in ClassDict: %d\n" % len (classrep.classes)
  
  print "gnue_module: findProp gnue_name"
  x = gmodule.findProp ("gnue_name")
***************
*** 47,59 ****
  print "\n------- listing contents\n"
  
  print "by keys ():"
! for key in Classes.keys ():
    print "Key:", key
  
  print "\nby values ():"
! for val in Classes.values ():
    print "Val:", val.gnue_name
  
  print "\nas tuple:"
! for tup in Classes.items ():
    print "Item:", tup
--- 43,55 ----
  print "\n------- listing contents\n"
  
  print "by keys ():"
! for key in classrep.classes.keys ():
    print "Key:", key
  
  print "\nby values ():"
! for val in classrep.classes.values ():
    print "Val:", val.gnue_name
  
  print "\nas tuple:"
! for tup in classrep.classes.items ():
    print "Item:", tup
Index: gnue-appserver/src/classrep/dtest.py
diff -c gnue-appserver/src/classrep/dtest.py:1.3 
gnue-appserver/src/classrep/dtest.py:1.4
*** gnue-appserver/src/classrep/dtest.py:1.3    Mon Jul 28 18:44:56 2003
--- gnue-appserver/src/classrep/dtest.py        Fri Aug  8 15:33:51 2003
***************
*** 1,21 ****
  from language import App
! import classrep
  from Definition import *
  
  app = App.App ()
- sess = app.newSession ("hacker", "secret")
- crdef = RepositoryDefinition ('classrep/classrepository.ini')
- classrep.Definition = crdef
  
  print "Requesting class 'gnue_property'\n"
! klass = classrep.findClass ("gnue_property", sess)
  
  print "\n"
  
  print "Requesting class 'address_person'\n"
  
  # -------------
! klass = classrep.findClass ("address_person", sess)
  
  print "Name = %s, Comment = %s, Fullname = %s\n" % (klass.gnue_name, 
                    klass.gnue_comment, klass.fullName)
--- 1,18 ----
  from language import App
! from gnue.appserver import classrep
  from Definition import *
  
  app = App.App ()
  
  print "Requesting class 'gnue_property'\n"
! klass = classrep.classes ["gnue_property"]
  
  print "\n"
  
  print "Requesting class 'address_person'\n"
  
  # -------------
! klass = classrep.classes ["address_person"]
  
  print "Name = %s, Comment = %s, Fullname = %s\n" % (klass.gnue_name, 
                    klass.gnue_comment, klass.fullName)
***************
*** 27,33 ****
    print "Property %s: %s (%s)" % (pObj.gnue_name, pObj.gnue_type, 
        pObj.gnue_comment)
  
! klass = classrep.findClass ("gnue_module", sess)
  print "Number of properties in %s: %d" % (klass.fullName, 
                      len (klass.properties))
  
--- 24,30 ----
    print "Property %s: %s (%s)" % (pObj.gnue_name, pObj.gnue_type, 
        pObj.gnue_comment)
  
! klass = classrep.classes ["gnue_module"]
  print "Number of properties in %s: %d" % (klass.fullName, 
                      len (klass.properties))
  
***************
*** 37,43 ****
  
  print "Now it should come faster (cached):\n"
  
! klass = classrep.findClass ("address_person", sess)
  
  print "Name = %s, Comment = %s, Fullname = %s\n" % (klass.gnue_name, 
                    klass.gnue_comment, klass.fullName)
--- 34,40 ----
  
  print "Now it should come faster (cached):\n"
  
! klass = classrep.classes ["address_person"]
  
  print "Name = %s, Comment = %s, Fullname = %s\n" % (klass.gnue_name, 
                    klass.gnue_comment, klass.fullName)
***************
*** 52,58 ****
  # ---- gnue_*
  
  print "Fetching gnue_class :)"
! gclass = classrep.findClass ("gnue_class", sess)
  print "Name = %s (full:%s) Comment = %s" % (gclass.gnue_name, gclass.fullName,
                   gclass.gnue_comment)
  
--- 49,55 ----
  # ---- gnue_*
  
  print "Fetching gnue_class :)"
! gclass = classrep.classes ["gnue_class"]
  print "Name = %s (full:%s) Comment = %s" % (gclass.gnue_name, gclass.fullName,
                   gclass.gnue_comment)
  
Index: gnue-appserver/src/classrep/mtest.py
diff -c gnue-appserver/src/classrep/mtest.py:1.2 
gnue-appserver/src/classrep/mtest.py:1.3
*** gnue-appserver/src/classrep/mtest.py:1.2    Mon Jul 28 18:44:56 2003
--- gnue-appserver/src/classrep/mtest.py        Fri Aug  8 15:33:51 2003
***************
*** 1,21 ****
  # Testing unit for Class Repository
  
  from language import App
! from classrep import * 
  
  # First we have to create a session from the language interface
  app = App.App ()
- lSession = app.newSession ("hacker", "secret")
- 
- # Now load this file as initial class repository
- loadDefinition ('classrep/repository.ini')
  
  # 
-----------------------------------------------------------------------------
  # Dump some values of a class definition
  # 
-----------------------------------------------------------------------------
  def dumpClass (aName):
    print "\nRequesting class '%s' ..." % aName
!   aClass = findClass (aName, lSession)
  
    print "Fullname:", aClass.fullName
    print "Id      :", aClass.gnue_id
--- 1,17 ----
  # Testing unit for Class Repository
  
  from language import App
! from gnue.appserver import classrep
  
  # First we have to create a session from the language interface
  app = App.App ()
  
  # 
-----------------------------------------------------------------------------
  # Dump some values of a class definition
  # 
-----------------------------------------------------------------------------
  def dumpClass (aName):
    print "\nRequesting class '%s' ..." % aName
!   aClass = classrep.classes [aName]
  
    print "Fullname:", aClass.fullName
    print "Id      :", aClass.gnue_id
***************
*** 36,42 ****
  dumpClass ('gnue_class')
  
  print "Searching for property 'gnue_name' in class 'gnue_property' ..."
! x = findClass ('gnue_property', lSession)
  y = x.findProp ('gnue_name')
  print "Fullname:", y.fullName
  print "Module  :", y.klass.module.fullName
--- 32,38 ----
  dumpClass ('gnue_class')
  
  print "Searching for property 'gnue_name' in class 'gnue_property' ..."
! x = classrep.classes ['gnue_property']
  y = x.findProp ('gnue_name')
  print "Fullname:", y.fullName
  print "Module  :", y.klass.module.fullName
Index: gnue-appserver/src/classrep/test.py
diff -c gnue-appserver/src/classrep/test.py:1.5 
gnue-appserver/src/classrep/test.py:1.6
*** gnue-appserver/src/classrep/test.py:1.5     Mon Jul 28 18:44:56 2003
--- gnue-appserver/src/classrep/test.py Fri Aug  8 15:33:51 2003
***************
*** 1,35 ****
! from language import App
! from classrep import *
  
  app = App.App ()
! sess = app.newSession ("hacker", "secret")
! mod = ModuleDict (sess)
  
  print '\nModule "address":'
! m = mod ["address"]
  print "%s: %s\n" % (m.gnue_name, m.gnue_comment)
  
  print "Classes in 'address':"
  for k in m.classes.keys ():
    print k
  
! print "Number of modules: %d\n" % len (mod)
  
  print "All modules via keys ():"
! for k in mod.keys ():
!   m = mod [k]
    print k, ":", m.gnue_comment
  
  print
  print "All modules via values ():"
! for m in mod.values ():
    print m.gnue_name + ": " + m.gnue_comment
  
  print
  print "All modules via items ():"
! for i in mod.items ():
    print i
  
  print
! print 'Is there a module "address": %d' % mod.has_key ("address")
! print 'Is there a module "foo": %d' % mod.has_key ("foo")
--- 1,35 ----
! from gnue.appserver.language import App
! from gnue.appserver import classrep
  
  app = App.App ()
! # sess = app.newSession ("hacker", "secret")
! # mod = ModuleDict (sess)
  
  print '\nModule "address":'
! m = classrep.modules ["address"]
  print "%s: %s\n" % (m.gnue_name, m.gnue_comment)
  
  print "Classes in 'address':"
  for k in m.classes.keys ():
    print k
  
! print "Number of modules: %d\n" % len (classrep.modules)
  
  print "All modules via keys ():"
! for k in classrep.modules.keys ():
!   m = classrep.modules [k]
    print k, ":", m.gnue_comment
  
  print
  print "All modules via values ():"
! for m in classrep.modules.values ():
    print m.gnue_name + ": " + m.gnue_comment
  
  print
  print "All modules via items ():"
! for i in classrep.modules.items ():
    print i
  
  print
! print 'Is there a module "address": %d' % classrep.modules.has_key ("address")
! print 'Is there a module "foo": %d' % classrep.modules.has_key ("foo")
Index: gnue-appserver/src/geasSessionManager.py
diff -c gnue-appserver/src/geasSessionManager.py:1.8 
gnue-appserver/src/geasSessionManager.py:1.9
*** gnue-appserver/src/geasSessionManager.py:1.8        Mon Jul 28 17:25:01 2003
--- gnue-appserver/src/geasSessionManager.py    Fri Aug  8 15:33:51 2003
***************
*** 19,29 ****
  #
  # 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 *
  import geasAuthentification
  
  class AuthError(Exception):
    pass
--- 19,30 ----
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasSessionManager.py,v 1.9 2003/08/08 19:33:51 reinhard Exp $
  
  from geasList import *
  from geasSession import *
  import geasAuthentification
+ import classrep
  
  class AuthError(Exception):
    pass
***************
*** 34,39 ****
--- 35,43 ----
      self._connections = connections
      self._sessNo = 0
      self._sessions = {}
+     # initialize Class Repository without Authentication
+     self._authAdapter = geasAuthentification.geasAuthAgent ()
+     classrep.init (self)
      # use DB for authetification
      self._authAdapter = geasAuthentification.geasDBAuthAgent()