[Zope-Checkins] CVS: Zope/lib/python/Zope/Startup - handlers.py:1.2.2.12 zopeschema.xml:1.2.2.11

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope/lib/python/Zope/Startup
In directory cvs.zope.org:/tmp/cvs-serv24411/lib/python/Zope/Startup

Modified Files:
      Tag: new-install-branch
	handlers.py zopeschema.xml 
Log Message:
Make port-base default to 0, allowing the sections for the default servers to
say exactly what ports they should be on.  This is easier to understand for
someone just coming to Zope.


=== Zope/lib/python/Zope/Startup/handlers.py 1.2.2.11 => 1.2.2.12 ===
--- Zope/lib/python/Zope/Startup/handlers.py:1.2.2.11	Tue Feb 25 15:50:36 2003
+++ Zope/lib/python/Zope/Startup/handlers.py	Thu Mar  6 13:59:05 2003
@@ -105,8 +105,8 @@
     if not config.servers:
         import ZServer.datatypes
         config.servers = [
-            ZServer.datatypes.HTTPServerFactory(_DummyServerConfig(80)),
-            ZServer.datatypes.FTPServerFactory(_DummyServerConfig(21)),
+            ZServer.datatypes.HTTPServerFactory(_DummyServerConfig(8080)),
+            ZServer.datatypes.FTPServerFactory(_DummyServerConfig(8021)),
             ]
 
     # prepare servers:
@@ -114,7 +114,7 @@
         factory.prepare(config.ip_address or '',
                         config.dns_resolver,
                         "Zope",
-                        config.cgi_environment or {},
+                        config.cgi_environment,
                         config.port_base)
 
 


=== Zope/lib/python/Zope/Startup/zopeschema.xml 1.2.2.10 => 1.2.2.11 ===
--- Zope/lib/python/Zope/Startup/zopeschema.xml:1.2.2.10	Tue Feb 25 15:50:36 2003
+++ Zope/lib/python/Zope/Startup/zopeschema.xml	Thu Mar  6 13:59:05 2003
@@ -150,7 +150,7 @@
   <section type="logger" name="trace"/>
 
   <multisection type="server" name="*" attribute="servers"/>
-  <key name="port-base" datatype="port-number" default="8000">
+  <key name="port-base" datatype="integer" default="0">
     <description>
       Base port number that gets added to the specific port numbers
       specified for the individual servers.
@@ -158,7 +158,5 @@
   </key>
 
   <multisection type="database" name="*" attribute="databases"/>
-
-  <!-- schema ends  -->
 
 </schema>