[Zope3-checkins] CVS: Zope3 - z3.py:1.4.8.1

[Jim Fulton]

Update of /cvs-repository/Zope3
In directory cvs.zope.org:/tmp/cvs-serv1649

Modified Files:
      Tag: FileSystemSync-branch
	z3.py 
Log Message:
adding (back) changed to branch

=== Zope3/z3.py 1.4 => 1.4.8.1 ===
--- Zope3/z3.py:1.4	Tue Aug 13 13:46:12 2002
+++ Zope3/z3.py	Fri Oct 11 02:28:04 2002
@@ -43,22 +43,13 @@
     # temp hack
     dir = os.getcwd()
 
-    from Zope.Configuration.xmlconfig import XMLConfig
-
-    # Set user to system_user, so we can do anything we want
-    from Zope.Security.SecurityManagement import system_user
-    from Zope.Security.SecurityManagement import newSecurityManager
-    newSecurityManager(system_user)
-
-    # Load server-independent site config
-    XMLConfig(os.path.join(dir, 'site.zcml'))()
+    # Do global software config
+    from Zope.App import config
+    config('site.zcml')
     
     # Load server config
+    from Zope.Configuration.xmlconfig import XMLConfig
     XMLConfig(os.path.join(dir, 'zserver.zcml'))()
-
-    # Reset user
-    from Zope.Security.SecurityManagement import noSecurityManager
-    noSecurityManager()
 
     try:
         asyncore.loop()