Branch merge

2 files changed, 10 insertions, 10 deletions

diff --git a/src/mailman/config/configure.zcml b/src/mailman/config/configure.zcml
index 325a61f10..e4a5a5c78 100644
--- a/src/mailman/config/configure.zcml
+++ b/src/mailman/config/configure.zcml
@@ -15,44 +15,44 @@
   <adapter
     for="mailman.interfaces.mailinglist.IMailingList"
     provides="mailman.interfaces.autorespond.IAutoResponseSet"
-    factory="mailman.database.autorespond.AutoResponseSet"
+    factory="mailman.model.autorespond.AutoResponseSet"
     />
 
   <adapter
     for="mailman.interfaces.mailinglist.IMailingList"
     provides="mailman.interfaces.mailinglist.IAcceptableAliasSet"
-    factory="mailman.database.mailinglist.AcceptableAliasSet"
+    factory="mailman.model.mailinglist.AcceptableAliasSet"
     />
 
   <adapter
     for="mailman.config.config.IConfiguration"
     provides="mailman.interfaces.domain.IDomainManager"
-    factory="mailman.database.domain.DomainManager"
+    factory="mailman.model.domain.DomainManager"
     />
 
   <!-- utilities -->
   <utility
-    factory="mailman.database.listmanager.ListManager"
+    factory="mailman.model.listmanager.ListManager"
     provides="mailman.interfaces.listmanager.IListManager"
     />
 
   <utility
-    factory="mailman.database.usermanager.UserManager"
+    factory="mailman.model.usermanager.UserManager"
     provides="mailman.interfaces.usermanager.IUserManager"
     />
 
   <utility
-    factory="mailman.database.messagestore.MessageStore"
+    factory="mailman.model.messagestore.MessageStore"
     provides="mailman.interfaces.messages.IMessageStore"
     />
 
   <utility
-    factory="mailman.database.pending.Pendings"
+    factory="mailman.model.pending.Pendings"
     provides="mailman.interfaces.pending.IPendings"
     />
 
   <utility
-    factory="mailman.database.requests.Requests"
+    factory="mailman.model.requests.Requests"
     provides="mailman.interfaces.requests.IRequests"
     />
 
diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg
index 163b61024..00df3849b 100644
--- a/src/mailman/config/schema.cfg
+++ b/src/mailman/config/schema.cfg
@@ -105,8 +105,8 @@ max_restarts: 10
 sleep_time: 1s
 
 [database]
-# The class implementing the IDatabase interface.
-class: mailman.database.StockDatabase
+# The class implementing the IDatabase.
+class: mailman.database.stock.StockDatabase
 
 # Use this to set the Storm database engine URL.  You generally have one
 # primary database connection for all of Mailman.  List data and most rosters