From 853060fa5fd453b745b09d991b8053c2024cb079 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Mon, 29 Jun 2009 21:30:04 -0400
Subject: More REST server updates.

* Get rid of in-Python adapter registration in favor of ZCML.  Eventually, I'd
  like to get rid of the ZCML.
* Set the view_permission to None, but it's still not right.
* Add IDomainSet and an adapter from Configuration to IDomainSet.
---
 src/mailman/core/initialize.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/mailman/core/initialize.py')

diff --git a/src/mailman/core/initialize.py b/src/mailman/core/initialize.py
index 885174fb0..8fc2150fb 100644
--- a/src/mailman/core/initialize.py
+++ b/src/mailman/core/initialize.py
@@ -38,7 +38,8 @@ __all__ = [
 import os
 import sys
 
-from zope.interface.interface import adapter_hooks
+from pkg_resources import resource_string
+from zope.configuration import xmlconfig
 from zope.interface.verify import verifyObject
 
 import mailman.config.config
@@ -82,6 +83,7 @@ def initialize_1(config_path=None, propagate_logs=None):
 def initialize_2(debug=False):
     """Second initialization step.
 
+    * Pre-hook
     * Rules
     * Chains
     * Pipelines
@@ -117,15 +119,11 @@ def initialize_2(debug=False):
 def initialize_3():
     """Third initialization step.
 
-    * Adapters
+    * Zope component architecture
+    * Post-hook
     """
-    from mailman.app.registrar import adapt_domain_to_registrar
-    adapter_hooks.append(adapt_domain_to_registrar)
-    from mailman.database.autorespond import adapt_mailing_list_to_response_set
-    adapter_hooks.append(adapt_mailing_list_to_response_set)
-    from mailman.database.mailinglist import (
-        adapt_mailing_list_to_acceptable_alias_set)
-    adapter_hooks.append(adapt_mailing_list_to_acceptable_alias_set)
+    zcml = resource_string('mailman.config', 'configure.zcml')
+    xmlconfig.string(zcml)
     # Run the post-hook if there is one.
     config = mailman.config.config
     if config.mailman.post_hook:
-- 
cgit v1.2.3-70-g09d2