Use dotted names for abstract types in ZConfig schema components.

lib/python/ZServer/component.xml

 <component prefix="ZServer.datatypes">
 
-  <abstracttype name="server">
+  <abstracttype name="ZServer.server">
     <description>
       The "server" type is used to describe a single type of server
       instance.  The value for a server section is an object with the
@@ -10,7 +10,7 @@
 
   <sectiontype name="http-server"
                datatype=".HTTPServerFactory"
-               implements="server">
+               implements="ZServer.server">
      <key name="address" datatype="inet-address"/>
      <key name="force-connection-close" datatype="boolean" default="off"/>
      <key name="webdav-source-clients">
@@ -23,38 +23,38 @@
 
   <sectiontype name="webdav-source-server"
                datatype=".WebDAVSourceServerFactory"
-               implements="server">
+               implements="ZServer.server">
      <key name="address" datatype="inet-address"/>
      <key name="force-connection-close" datatype="boolean" default="off"/>
   </sectiontype>
 
   <sectiontype name="persistent-cgi"
                datatype=".PCGIServerFactory"
-               implements="server">
+               implements="ZServer.server">
     <key name="path" datatype="existing-file"/>
   </sectiontype>
 
   <sectiontype name="fast-cgi"
                datatype=".FCGIServerFactory"
-               implements="server">
+               implements="ZServer.server">
     <key name="address" datatype="socket-address"/>
   </sectiontype>
 
   <sectiontype name="ftp-server"
                datatype=".FTPServerFactory"
-               implements="server">
+               implements="ZServer.server">
      <key name="address" datatype="inet-address"/>
   </sectiontype>
 
   <sectiontype name="monitor-server"
                datatype=".MonitorServerFactory"
-               implements="server">
+               implements="ZServer.server">
      <key name="address" datatype="inet-address"/>
   </sectiontype>
 
   <sectiontype name="icp-server"
                datatype=".ICPServerFactory"
-               implements="server">
+               implements="ZServer.server">
      <key name="address" datatype="inet-address"/>
   </sectiontype>
 

lib/python/ZServer/tests/test_config.py

@@ -34,7 +34,9 @@ class ZServerConfigurationTestCase(unittest.TestCase):
             sio = StringIO.StringIO("""
             <schema>
               <import package='ZServer'/>
-              <multisection name='*' type='server' attribute='servers'/>
+              <multisection name='*'
+                            type='ZServer.server'
+                            attribute='servers'/>
             </schema>
             """)
             schema = ZConfig.loadSchemaFile(sio)

lib/python/Zope/Startup/zopeschema.xml

@@ -15,7 +15,7 @@
       provides the loghandler type used here.
     </description>
     <key name="level" datatype="zLOG.datatypes.logging_level" default="info"/>
-    <multisection type="loghandler" attribute="handlers" name="*"
+    <multisection type="zLOG.loghandler" attribute="handlers" name="*"
                   required="yes"/>
   </sectiontype>
 
@@ -253,7 +253,7 @@
 
   <section type="logger" name="trace"/>
 
-  <multisection type="server" name="*" attribute="servers"/>
+  <multisection type="ZServer.server" name="*" attribute="servers"/>
   <key name="port-base" datatype="integer" default="0">
     <description>
       Base port number that gets added to the specific port numbers
@@ -261,7 +261,7 @@
     </description>
   </key>
 
-  <multisection type="database" name="*" attribute="databases"/>
+  <multisection type="ZODB.database" name="*" attribute="databases"/>
 
   <section type="zoperunner" name="*" attribute="runner"/>
 

lib/python/zLOG/component.xml

 <component prefix="zLOG.datatypes">
 
-  <abstracttype name="loghandler"/>
+  <abstracttype name="zLOG.loghandler"/>
 
-  <sectiontype name="base-log-handler">
+  <sectiontype name="zLOG.base-log-handler">
     <description>
       Base type for most log handlers.  This is cannot be used as a
       loghandler directly since it doesn't implement the loghandler
@@ -13,14 +13,14 @@
   </sectiontype>
 
   <sectiontype name="logfile" datatype=".FileHandlerFactory"
-               implements="loghandler" extends="base-log-handler">
+               implements="zLOG.loghandler" extends="zLOG.base-log-handler">
     <key name="path" required="yes"/>
     <key name="format" default="------\n%(asctime)s %(message)s"
          datatype=".log_format"/>
   </sectiontype>
 
   <sectiontype name="syslog" datatype=".SyslogHandlerFactory"
-               implements="loghandler" extends="base-log-handler">
+               implements="zLOG.loghandler" extends="zLOG.base-log-handler">
     <key name="facility" default="user" datatype=".syslog_facility"/>
     <key name="address" datatype="socket-address" default="localhost:514"/>
     <key name="format" default="%(message)s"
@@ -28,14 +28,14 @@
   </sectiontype>
 
   <sectiontype name="win32-eventlog" datatype=".Win32EventLogFactory"
-               implements="loghandler" extends="base-log-handler">
+               implements="zLOG.loghandler" extends="zLOG.base-log-handler">
     <key name="appname" default="Zope"/>
     <key name="format" default="%(message)s"
          datatype=".log_format"/>
   </sectiontype>
 
   <sectiontype name="http-logger" datatype=".HTTPHandlerFactory"
-               implements="loghandler" extends="base-log-handler">
+               implements="zLOG.loghandler" extends="zLOG.base-log-handler">
     <key name="url" default="http://localhost/" datatype=".http_handler_url"/>
     <key name="method" default="GET" datatype=".get_or_post"/>
     <key name="format" default="%(asctime)s %(message)s"
@@ -43,7 +43,7 @@
   </sectiontype>
 
   <sectiontype name="email-notifier" datatype=".SMTPHandlerFactory"
-               implements="loghandler" extends="base-log-handler">
+               implements="zLOG.loghandler" extends="zLOG.base-log-handler">
     <key name="from" required="yes" attribute="fromaddr"/>
     <multikey name="to" required="yes" attribute="toaddrs"/>
     <key name="subject" default="Message from Zope"/>
@@ -55,7 +55,7 @@
 
   <sectiontype name="eventlog" datatype=".EventLogFactory">
      <key name="level" datatype=".logging_level" default="info"/>
-     <multisection type="loghandler" attribute="handlers" name="*"/>
+     <multisection type="zLOG.loghandler" attribute="handlers" name="*"/>
   </sectiontype>
 
 </component>