[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-appserver/src classrep/crpopulate.py class...
From: |
Reinhard Mueller |
Subject: |
gnue-appserver/src classrep/crpopulate.py class... |
Date: |
Mon, 28 Jul 2003 18:44:56 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue-appserver
Branch:
Changes by: Reinhard Mueller <address@hidden> 03/07/28 18:44:56
Modified files:
src/classrep : crpopulate.py ctest.py dtest.py mtest.py
test.py
src/language : Session.py
Log message:
Do not derive Session object from GClientApp, define new App object
instead.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/crpopulate.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/ctest.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/dtest.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/mtest.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/test.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/language/Session.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: gnue-appserver/src/classrep/crpopulate.py
diff -c gnue-appserver/src/classrep/crpopulate.py:1.1
gnue-appserver/src/classrep/crpopulate.py:1.2
*** gnue-appserver/src/classrep/crpopulate.py:1.1 Tue May 27 10:32:40 2003
--- gnue-appserver/src/classrep/crpopulate.py Mon Jul 28 18:44:56 2003
***************
*** 2,13 ****
# Populate the database with class repository definition
#
! from language import Session
from Namespace import *
from classrep import *
# First we have to create a session from the language interface
! lSession = Session.newSession ("hacker", "secret")
# Now load the initial class repository
print "Loading repository definition ..."
--- 2,14 ----
# Populate the database with class repository definition
#
! from language import App
from Namespace import *
from classrep import *
# First we have to create a session from the language interface
! app = App.App ()
! lSession = app.newSession ("hacker", "secret")
# Now load the initial class repository
print "Loading repository definition ..."
Index: gnue-appserver/src/classrep/ctest.py
diff -c gnue-appserver/src/classrep/ctest.py:1.2
gnue-appserver/src/classrep/ctest.py:1.3
*** gnue-appserver/src/classrep/ctest.py:1.2 Tue May 27 10:30:57 2003
--- gnue-appserver/src/classrep/ctest.py Mon Jul 28 18:44:56 2003
***************
*** 1,7 ****
! from language import Session
from classrep import *
! sess = Session.newSession ("hacker", "secret")
Modules = ModuleDict (sess)
Classes = ClassDict (sess, Modules)
--- 1,8 ----
! from language import App
from classrep import *
! app = App.App ()
! sess = app.newSession ("hacker", "secret")
Modules = ModuleDict (sess)
Classes = ClassDict (sess, Modules)
Index: gnue-appserver/src/classrep/dtest.py
diff -c gnue-appserver/src/classrep/dtest.py:1.2
gnue-appserver/src/classrep/dtest.py:1.3
*** gnue-appserver/src/classrep/dtest.py:1.2 Tue May 27 10:30:57 2003
--- gnue-appserver/src/classrep/dtest.py Mon Jul 28 18:44:56 2003
***************
*** 1,8 ****
! from language import Session
import classrep
from Definition import *
! sess = Session.newSession ("hacker", "secret")
crdef = RepositoryDefinition ('classrep/classrepository.ini')
classrep.Definition = crdef
--- 1,9 ----
! 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
***************
*** 30,36 ****
print "Number of properties in %s: %d" % (klass.fullName,
len (klass.properties))
! print classrep.Classes.keys ()
# -----------------
--- 31,37 ----
print "Number of properties in %s: %d" % (klass.fullName,
len (klass.properties))
! # print classrep.Classes.keys ()
# -----------------
Index: gnue-appserver/src/classrep/mtest.py
diff -c gnue-appserver/src/classrep/mtest.py:1.1
gnue-appserver/src/classrep/mtest.py:1.2
*** gnue-appserver/src/classrep/mtest.py:1.1 Tue May 27 10:32:40 2003
--- gnue-appserver/src/classrep/mtest.py Mon Jul 28 18:44:56 2003
***************
*** 1,10 ****
# Testing unit for Class Repository
! from language import Session
from classrep import *
# First we have to create a session from the language interface
! lSession = Session.newSession ("hacker", "secret")
# Now load this file as initial class repository
loadDefinition ('classrep/repository.ini')
--- 1,11 ----
# 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')
Index: gnue-appserver/src/classrep/test.py
diff -c gnue-appserver/src/classrep/test.py:1.4
gnue-appserver/src/classrep/test.py:1.5
*** gnue-appserver/src/classrep/test.py:1.4 Mon Jul 28 13:53:09 2003
--- gnue-appserver/src/classrep/test.py Mon Jul 28 18:44:56 2003
***************
*** 1,7 ****
! from language import Session
from classrep import *
! sess = Session.newSession ("hacker", "secret")
mod = ModuleDict (sess)
print '\nModule "address":'
--- 1,8 ----
! from language import App
from classrep import *
! app = App.App ()
! sess = app.newSession ("hacker", "secret")
mod = ModuleDict (sess)
print '\nModule "address":'
Index: gnue-appserver/src/language/Session.py
diff -c gnue-appserver/src/language/Session.py:1.7
gnue-appserver/src/language/Session.py:1.8
*** gnue-appserver/src/language/Session.py:1.7 Mon Jul 28 17:25:02 2003
--- gnue-appserver/src/language/Session.py Mon Jul 28 18:44:56 2003
***************
*** 19,117 ****
# 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
- from gnue.appserver import geasSessionManager
from ObjectList import newList
from Object import newObject
-
- # ===========================================================================
- # Create a new session using 'user' and 'password' for authentication.
- # ===========================================================================
- def newSession (user, password):
- return Session (user, password)
-
-
# ===========================================================================
# CLASS session: implement a session of the language interface
# ===========================================================================
! # FIXME: don't derive class from GClientApp ...
! class Session (GClientApp.GClientApp):
# -------------------------------------------------------------------------
# Constructor:
# -------------------------------------------------------------------------
- def __init__ (self, user, password):
- GClientApp.GClientApp.__init__ (self)
-
- self.connections.setLoginHandler (myLoginHandler ())
-
- self._server = geasSessionManager.geasSessionManager (self.connections)
-
- ## access GNUe Appserver over RPC
- ##
- ## params = { 'host': 'localhost',
- ## 'port': 8765,
- ## 'transport': 'http' }
- ## interface = 'pw_xmlrpc'
- ## from gnue.common.rpc import GComm
- ## rpcserver = GComm.attach(self._interface, self._params)
- ##
- ## self._server = rpcserver.request("Session")
-
- self._session_id = self._server.open ({'user': user, 'password':
password})
# -------------------------------------------------------------------------
# Close the session
# -------------------------------------------------------------------------
def close (self):
! if self._server:
! self._server.close (self._session_id, None)
! self._server = self._session_id = None
# -------------------------------------------------------------------------
# Commit the current transaction
# -------------------------------------------------------------------------
def commit (self):
if self._session_id:
! self._server.commit (self._session_id)
# -------------------------------------------------------------------------
# Revoke the current transaction
# -------------------------------------------------------------------------
def rollback (self):
if self._session_id:
! self._server.rollback (self._session_id)
# -------------------------------------------------------------------------
# Set the default context
# -------------------------------------------------------------------------
def setcontext (self, context):
if self._session_id:
! self._server.setcontext (self._session_id, context)
# -------------------------------------------------------------------------
# Return a collection of 'classname' matching the given arguments
# -------------------------------------------------------------------------
def find (self, classname, cond=[], sort=['gnue_id'], properties=[]):
! return newList (self._server, self._session_id, classname, cond, sort,
properties)
# -------------------------------------------------------------------------
# Create a new instance of classname
# -------------------------------------------------------------------------
def new (self, classname):
! return newObject (self._server, self._session_id, classname)
!
!
!
! # ===========================================================================
! # FIXME: find a better solution for authentication
! # ===========================================================================
! class myLoginHandler (GLoginHandler.LoginHandler):
! def getLogin (self, *arguments):
! return {'_username': 'gnue', '_password': None}
--- 19,81 ----
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: Session.py,v 1.8 2003/07/28 22:44:56 reinhard Exp $
from ObjectList import newList
from Object import newObject
# ===========================================================================
# CLASS session: implement a session of the language interface
# ===========================================================================
!
! class Session:
# -------------------------------------------------------------------------
# Constructor:
# -------------------------------------------------------------------------
+ def __init__ (self, sessionManager, user, password):
+ self._sm = sessionManager
+ self._session_id = self._sm.open ({'user': user, 'password': password})
# -------------------------------------------------------------------------
# Close the session
# -------------------------------------------------------------------------
def close (self):
! if self._sm:
! self._sm.close (self._session_id, None)
! self._sm = self._session_id = None
# -------------------------------------------------------------------------
# Commit the current transaction
# -------------------------------------------------------------------------
def commit (self):
if self._session_id:
! self._sm.commit (self._session_id)
# -------------------------------------------------------------------------
# Revoke the current transaction
# -------------------------------------------------------------------------
def rollback (self):
if self._session_id:
! self._sm.rollback (self._session_id)
# -------------------------------------------------------------------------
# Set the default context
# -------------------------------------------------------------------------
def setcontext (self, context):
if self._session_id:
! self._sm.setcontext (self._session_id, context)
# -------------------------------------------------------------------------
# Return a collection of 'classname' matching the given arguments
# -------------------------------------------------------------------------
def find (self, classname, cond=[], sort=['gnue_id'], properties=[]):
! return newList (self._sm, self._session_id, classname, cond, sort,
properties)
# -------------------------------------------------------------------------
# Create a new instance of classname
# -------------------------------------------------------------------------
def new (self, classname):
! return newObject (self._sm, self._session_id, classname)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue-appserver/src classrep/crpopulate.py class...,
Reinhard Mueller <=