gnue-appserver ./setup.py scripts/gnue-appserve...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-appserver
Branch:         
Changes by:     Bajusz Tamás <address@hidden>   03/08/14 17:05:48

Modified files:
        .              : setup.py 
        scripts        : gnue-appserver.in 
        src/classrep   : __init__.py 

Log message:
        * misc fixes
        * repository.ini wants to go somewhere in setup.py !

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/setup.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/scripts/gnue-appserver.in.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/__init__.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue-appserver/scripts/gnue-appserver.in
diff -c gnue-appserver/scripts/gnue-appserver.in:1.4 
gnue-appserver/scripts/gnue-appserver.in:1.5
*** gnue-appserver/scripts/gnue-appserver.in:1.4        Sun Apr  6 19:54:38 2003
--- gnue-appserver/scripts/gnue-appserver.in    Thu Aug 14 17:05:48 2003
***************
*** 32,38 ****
  from  gnue.appserver.geasRpcServer import *
  
  if __name__ == '__main__':
!   geas1 = geasRpcServer();
    
    geas1.phaseInit();
  
--- 32,38 ----
  from  gnue.appserver.geasRpcServer import *
  
  if __name__ == '__main__':
!   geas1 = geasRpcServerApp();
    
    geas1.phaseInit();
  
Index: gnue-appserver/setup.py
diff -c gnue-appserver/setup.py:1.12 gnue-appserver/setup.py:1.13
*** gnue-appserver/setup.py:1.12        Wed Aug 13 17:30:00 2003
--- gnue-appserver/setup.py     Thu Aug 14 17:05:48 2003
***************
*** 307,313 ****
                         ],
  
         packages = ["gnue.appserver",
!                    "gnue.appserver.classrep",],
         package_dir = {"gnue.appserver" : "src"},
         scripts = ["scripts/gnue-appserver"]
         )
--- 307,314 ----
                         ],
  
         packages = ["gnue.appserver",
!                    "gnue.appserver.classrep",
!                    "gnue.appserver.language",],
         package_dir = {"gnue.appserver" : "src"},
         scripts = ["scripts/gnue-appserver"]
         )
Index: gnue-appserver/src/classrep/__init__.py
diff -c gnue-appserver/src/classrep/__init__.py:1.6 
gnue-appserver/src/classrep/__init__.py:1.7
*** gnue-appserver/src/classrep/__init__.py:1.6 Mon Aug 11 11:22:11 2003
--- gnue-appserver/src/classrep/__init__.py     Thu Aug 14 17:05:48 2003
***************
*** 19,31 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: __init__.py,v 1.6 2003/08/11 15:22:11 reinhard Exp $
  
  from Module import *
  from Class  import *
  from Namespace import *
  from Definition import *
! from language import Session
  
  # 
-----------------------------------------------------------------------------
  # Global module and class list
--- 19,33 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: __init__.py,v 1.7 2003/08/14 21:05:48 btami Exp $
! 
! import os, sys
  
  from Module import *
  from Class  import *
  from Namespace import *
  from Definition import *
! from gnue.appserver.language import Session
  
  # 
-----------------------------------------------------------------------------
  # Global module and class list
***************
*** 37,43 ****
  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, None, None)
--- 39,46 ----
  def init (server):
    global modules, classes
    # First, load the hardwired default repository
!   basedir  = os.path.dirname(sys.modules["gnue.appserver.classrep"].__file__)
!   modules = ModuleDict (None, RepositoryDefinition 
(basedir+"/repository.ini"))
    classes = ClassDict (None, modules)
    # Now, we can access the database to load the real repository
    session = Session.Session (server, None, None)