[Zope-CVS] CVS: Zope - zope.py:1.1.2.2

[Chris McDonough]

Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv11896

Modified Files:
      Tag: chrism-install-branch
	zope.py 
Log Message:
Directives are now stored in a singleton registry.  The defaults are read from the 'directives.csv' file in the Controller package and registered dynamically.  As a result, the 'makedirectives.py' script was removed as it is no longer necessary.

The option to get a configuration from XML-RPC was removed in favor of
obtaining a configuration file over HTTP.  The command-line options
to both zope.py and zctl were changed accordingly.



=== Zope/zope.py 1.1.2.1 => 1.1.2.2 ===
--- Zope/zope.py:1.1.2.1	Mon Sep  2 03:35:09 2002
+++ Zope/zope.py	Tue Sep 10 00:15:59 2002
@@ -68,9 +68,9 @@
 
 if __name__ == '__main__':
     check_python_version()
-    filename = 'zope.conf'
+    config_location = 'zope.conf'
     url = None
-    longopts = [ "help", "config-file=", "config-url=" ]
+    longopts = [ "help", "config-location="]
     try:
         opts, args = getopt.getopt(sys.argv[1:], "h", longopts)
     except getopt.GetoptError, v:
@@ -81,18 +81,10 @@
         if k in ('-h', '--help'):
             usage()
             sys.exit(0)
-        if k == '--config-file':
-            filename = v
-        if k == '--config-url':
-            url = v
-    if url:
-        local_config = Main.get_xmlrpc_config(url)
-    else:
-        local_config = Main.parse_config_file(filename)
+        if k == '--config-location':
+            config_location = v
     try:
-        config = Main.Configuration(local_config)
-        config.activate()
-        Main.start_zope(config)
+        Main.start_zope(config_location)
     except SystemExit:
         pass
     except: