[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/ Remove the <hitlog> section from zope.conf.

[Fred L. Drake, Jr.]

Log message for revision 25931:
Remove the <hitlog> section from zope.conf.

The name <hitlog> was added between the second alpha and the first beta,
and generated a deprecation warning by the time the second beta was released.



-=-
Modified: Zope3/branches/ZopeX3-3.0/doc/CHANGES.txt
===================================================================
--- Zope3/branches/ZopeX3-3.0/doc/CHANGES.txt	2004-06-21 20:48:20 UTC (rev 25930)
+++ Zope3/branches/ZopeX3-3.0/doc/CHANGES.txt	2004-06-21 21:03:51 UTC (rev 25931)
@@ -33,6 +33,11 @@
 
     Restructuring
 
+      - The <hitlog> section is no longer supported in the zope.conf
+        file; use <accesslog> instead.  (The name <hitlog> was added
+        between the second alpha and the first beta, and generated a
+        deprecation warning by the time the second beta was released.)
+
     Much thanks to everyone who contributed to this release:
 
       Jim Fulton, Marius Gedminas, Fred Drake, Philipp von Weitershausen,

Modified: Zope3/branches/ZopeX3-3.0/src/ZConfig/components/logger/hitlog.xml
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/ZConfig/components/logger/hitlog.xml	2004-06-21 20:48:20 UTC (rev 25930)
+++ Zope3/branches/ZopeX3-3.0/src/ZConfig/components/logger/hitlog.xml	2004-06-21 21:03:51 UTC (rev 25931)
@@ -3,12 +3,9 @@
   <import package="ZConfig.components.logger" file="abstract.xml"/>
   <import package="ZConfig.components.logger" file="base-logger.xml"/>
 
-  <abstracttype name="ZConfig.logger.accesslog"/>
-
   <sectiontype name="accesslog"
                datatype=".AccessLogFactory"
-               extends="ZConfig.logger.base-logger"
-               implements="ZConfig.logger.accesslog">
+               extends="ZConfig.logger.base-logger">
     <description>
       Configuration for the access logger.
 
@@ -17,18 +14,4 @@
     </description>
   </sectiontype>
 
-  <sectiontype name="hitlog"
-               datatype=".HitLogFactory"
-               extends="ZConfig.logger.base-logger"
-               implements="ZConfig.logger.accesslog">
-    <description>
-      DEPRECATED.  Use "accesslog" instead.
-
-      Configuration for the access logger.
-
-      Note that the setting of verbosity level and message formats are not
-      used.
-    </description>
-  </sectiontype>
-
 </component>

Modified: Zope3/branches/ZopeX3-3.0/src/ZConfig/components/logger/logger.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/ZConfig/components/logger/logger.py	2004-06-21 20:48:20 UTC (rev 25930)
+++ Zope3/branches/ZopeX3-3.0/src/ZConfig/components/logger/logger.py	2004-06-21 21:03:51 UTC (rev 25931)
@@ -102,16 +102,6 @@
         return logger
 
 
-class HitLogFactory(AccessLogFactory):
-    """AccessLogFactory that generates a deprecation warning."""
-
-    def create(self):
-        import warnings
-        warnings.warn("<hitlog> is deprecated; use <accesslog> instead",
-                      DeprecationWarning)
-        return AccessLogFactory.create(self)
-
-
 class LoggerFactory(LoggerFactoryBase):
     """Logger factory that returns the named logger."""
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/server/schema.xml
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/server/schema.xml	2004-06-21 20:48:20 UTC (rev 25930)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/server/schema.xml	2004-06-21 21:03:51 UTC (rev 25931)
@@ -31,7 +31,7 @@
     </description>
   </section>
 
-  <section type="ZConfig.logger.accesslog" attribute="accesslog" name="*"
+  <section type="accesslog" attribute="accesslog" name="*"
            required="yes">
     <description>
       Configuration for the access log.