← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~sinzui/launchpad/apocalypse-interface-imports-4 into lp:launchpad/devel

 

Curtis Hovey has proposed merging lp:~sinzui/launchpad/apocalypse-interface-imports-4 into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)


This is my branch to remove references to database glob imports in ZCML.

    lp:~sinzui/launchpad/apocalypse-interface-imports-4
    Diff size:
    Launchpad bug:
        https://bugs.launchpad.net/bugs/651740
    Test command: Run the entire suite
    Pre-implementation: no one
    Target release: 10.10


Remove references to database glob imports in ZCML
--------------------------------------------------

Several zcml files, notably soyuz/configure.zcml import models from
canonical.launchpad.net,

NOTE: several of my efforts to move code from canonical.launchpad to
lp were complicated by ZCML imports. This branch fixes the last remain class
of problems in the ZCML that make it difficult to move code, then update
all the call sites.


Rules
-----

    * Hack the zcml deglobber in the utilities/migrater to search and repair
      database imports.
    * Remove the registry and answers imports from
      canonical.launchpad.database because no code or tests knows about the
      location.


QA
--

None, this is pure refactoring.


Lint
----

Linting changed files:
  lib/canonical/launchpad/database/__init__.py
  lib/canonical/launchpad/zcml/account.zcml
  lib/canonical/launchpad/zcml/binaryandsourcepackagename.zcml
  lib/canonical/launchpad/zcml/emailaddress.zcml
  lib/canonical/launchpad/zcml/librarian.zcml
  lib/canonical/launchpad/zcml/logintoken.zcml
  lib/canonical/launchpad/zcml/message.zcml
  lib/canonical/launchpad/zcml/oauth.zcml
  lib/canonical/launchpad/zcml/temporaryblobstorage.zcml
  lib/lp/registry/configure.zcml
  lib/lp/soyuz/configure.zcml



Test
----

The whole test suite passed \o/
-- 
https://code.launchpad.net/~sinzui/launchpad/apocalypse-interface-imports-4/+merge/37124
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~sinzui/launchpad/apocalypse-interface-imports-4 into lp:launchpad/devel.
=== modified file 'lib/canonical/launchpad/database/__init__.py'
--- lib/canonical/launchpad/database/__init__.py	2010-09-28 14:59:25 +0000
+++ lib/canonical/launchpad/database/__init__.py	2010-09-30 13:21:09 +0000
@@ -12,8 +12,6 @@
 from canonical.launchpad.database.oauth import *
 from canonical.launchpad.database.temporaryblobstorage import *
 from lp.buildmaster.model.builder import *
-from lp.coop.answersbugs.model import *
-from lp.registry.model.personnotification import *
 from lp.services.worlddata.model.language import *
 from lp.services.worlddata.model.spokenin import *
 from lp.soyuz.model.archive import *

=== modified file 'lib/canonical/launchpad/zcml/account.zcml'
--- lib/canonical/launchpad/zcml/account.zcml	2010-09-29 14:59:57 +0000
+++ lib/canonical/launchpad/zcml/account.zcml	2010-09-30 13:21:09 +0000
@@ -4,7 +4,7 @@
 
 <configure xmlns="http://namespaces.zope.org/zope";>
 
-    <class class="canonical.launchpad.database.Account">
+    <class class="canonical.launchpad.database.account.Account">
         <require
             permission="zope.Public"
             interface="canonical.launchpad.interfaces.account.IAccountPublic" />
@@ -23,7 +23,7 @@
     </class>
 
     <securedutility
-        class="canonical.launchpad.database.AccountSet"
+        class="canonical.launchpad.database.account.AccountSet"
         provides="canonical.launchpad.interfaces.account.IAccountSet">
         <allow interface="canonical.launchpad.interfaces.account.IAccountSet" />
     </securedutility>

=== modified file 'lib/canonical/launchpad/zcml/binaryandsourcepackagename.zcml'
--- lib/canonical/launchpad/zcml/binaryandsourcepackagename.zcml	2010-09-29 14:59:57 +0000
+++ lib/canonical/launchpad/zcml/binaryandsourcepackagename.zcml	2010-09-30 13:21:09 +0000
@@ -11,7 +11,7 @@
   <facet facet="overview">
 
     <!-- BinaryAndSourcePackagename -->
-    <class class="canonical.launchpad.database.BinaryAndSourcePackageName">
+    <class class="canonical.launchpad.database.binaryandsourcepackagename.BinaryAndSourcePackageName">
         <allow interface="lp.soyuz.interfaces.binarypackagename.IBinaryAndSourcePackageName" />
     </class>
 

=== modified file 'lib/canonical/launchpad/zcml/emailaddress.zcml'
--- lib/canonical/launchpad/zcml/emailaddress.zcml	2010-09-29 14:59:57 +0000
+++ lib/canonical/launchpad/zcml/emailaddress.zcml	2010-09-30 13:21:09 +0000
@@ -8,7 +8,7 @@
     xmlns:i18n="http://namespaces.zope.org/i18n";
     i18n_domain="launchpad">
 
-    <class class="canonical.launchpad.database.EmailAddress">
+    <class class="canonical.launchpad.database.emailaddress.EmailAddress">
         <allow interface="lp.registry.interfaces.role.IHasOwner" />
         <allow attributes="
             id person personID account accountID status rdf_sha1" />
@@ -22,7 +22,7 @@
     </class>
 
     <securedutility
-        class="canonical.launchpad.database.EmailAddressSet"
+        class="canonical.launchpad.database.emailaddress.EmailAddressSet"
         provides="canonical.launchpad.interfaces.emailaddress.IEmailAddressSet">
         <allow interface="canonical.launchpad.interfaces.emailaddress.IEmailAddressSet" />
     </securedutility>

=== modified file 'lib/canonical/launchpad/zcml/librarian.zcml'
--- lib/canonical/launchpad/zcml/librarian.zcml	2010-09-29 14:59:57 +0000
+++ lib/canonical/launchpad/zcml/librarian.zcml	2010-09-30 13:21:09 +0000
@@ -8,23 +8,23 @@
     xmlns:zope="http://namespaces.zope.org/zope";
     i18n_domain="launchpad">
 
-  <class class="canonical.launchpad.database.LibraryFileAlias">
+  <class class="canonical.launchpad.database.librarian.LibraryFileAlias">
     <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileAlias" />
   </class>
 
-  <class class="canonical.launchpad.database.LibraryFileAliasWithParent">
+  <class class="canonical.launchpad.database.librarian.LibraryFileAliasWithParent">
     <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileAliasWithParent" />
     <require
       permission="launchpad.Edit"
       set_attributes="restricted" />
   </class>
 
-  <class class="canonical.launchpad.database.LibraryFileContent">
+  <class class="canonical.launchpad.database.librarian.LibraryFileContent">
     <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileContent" />
   </class>
 
   <securedutility
-    class="canonical.launchpad.database.LibraryFileAliasSet"
+    class="canonical.launchpad.database.librarian.LibraryFileAliasSet"
     provides="canonical.launchpad.interfaces.librarian.ILibraryFileAliasSet">
     <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileAliasSet" />
   </securedutility>

=== modified file 'lib/canonical/launchpad/zcml/logintoken.zcml'
--- lib/canonical/launchpad/zcml/logintoken.zcml	2010-09-29 14:59:57 +0000
+++ lib/canonical/launchpad/zcml/logintoken.zcml	2010-09-30 13:21:09 +0000
@@ -11,7 +11,7 @@
 <facet facet="overview">
 
     <!-- LoginToken -->
-    <class class="canonical.launchpad.database.LoginToken">
+    <class class="canonical.launchpad.database.logintoken.LoginToken">
         <require
             permission="zope.Public"
             interface="canonical.launchpad.interfaces.logintoken.ILoginToken" />
@@ -90,12 +90,12 @@
         />
 
     <!-- LoginTokenSet -->
-    <class class="canonical.launchpad.database.LoginTokenSet">
+    <class class="canonical.launchpad.database.logintoken.LoginTokenSet">
         <allow interface="canonical.launchpad.interfaces.logintoken.ILoginTokenSet" />
     </class>
 
     <securedutility
-        class="canonical.launchpad.database.LoginTokenSet"
+        class="canonical.launchpad.database.logintoken.LoginTokenSet"
         provides="canonical.launchpad.interfaces.logintoken.ILoginTokenSet">
         <allow interface="canonical.launchpad.interfaces.logintoken.ILoginTokenSet" />
     </securedutility>

=== modified file 'lib/canonical/launchpad/zcml/message.zcml'
--- lib/canonical/launchpad/zcml/message.zcml	2010-09-29 14:59:35 +0000
+++ lib/canonical/launchpad/zcml/message.zcml	2010-09-30 13:21:09 +0000
@@ -9,7 +9,7 @@
     i18n_domain="launchpad">
 
     <!-- Message -->
-    <class class="canonical.launchpad.database.Message">
+    <class class="canonical.launchpad.database.message.Message">
         <allow interface="canonical.launchpad.interfaces.message.IMessage" />
         <require
             permission="zope.Public"
@@ -22,13 +22,13 @@
     </class>
 
     <!-- MessageChunk -->
-    <class class="canonical.launchpad.database.MessageChunk">
+    <class class="canonical.launchpad.database.message.MessageChunk">
         <allow interface="canonical.launchpad.interfaces.message.IMessageChunk" />
     </class>
 
   <!-- MessageSet -->
   <securedutility
-      class="canonical.launchpad.database.MessageSet"
+      class="canonical.launchpad.database.message.MessageSet"
       provides="canonical.launchpad.interfaces.message.IMessageSet">
       <allow interface="canonical.launchpad.interfaces.message.IMessageSet" />
   </securedutility>

=== modified file 'lib/canonical/launchpad/zcml/oauth.zcml'
--- lib/canonical/launchpad/zcml/oauth.zcml	2010-09-29 14:59:57 +0000
+++ lib/canonical/launchpad/zcml/oauth.zcml	2010-09-30 13:21:09 +0000
@@ -9,22 +9,22 @@
     xmlns:browser="http://namespaces.zope.org/browser";
     i18n_domain="launchpad">
 
-  <class class="canonical.launchpad.database.OAuthConsumer">
+  <class class="canonical.launchpad.database.oauth.OAuthConsumer">
       <allow interface="canonical.launchpad.interfaces.oauth.IOAuthConsumer"/>
   </class>
 
-  <class class="canonical.launchpad.database.OAuthConsumerSet">
+  <class class="canonical.launchpad.database.oauth.OAuthConsumerSet">
       <allow interface="canonical.launchpad.interfaces.oauth.IOAuthConsumerSet"/>
   </class>
 
   <securedutility
-      class="canonical.launchpad.database.OAuthConsumerSet"
+      class="canonical.launchpad.database.oauth.OAuthConsumerSet"
       provides="canonical.launchpad.interfaces.oauth.IOAuthConsumerSet">
       <allow
           interface="canonical.launchpad.interfaces.oauth.IOAuthConsumerSet"/>
   </securedutility>
 
-  <class class="canonical.launchpad.database.OAuthRequestToken">
+  <class class="canonical.launchpad.database.oauth.OAuthRequestToken">
       <allow interface="canonical.launchpad.interfaces.oauth.IOAuthRequestToken"/>
       <require
           permission="launchpad.Edit"
@@ -32,20 +32,20 @@
   </class>
 
   <securedutility
-      class="canonical.launchpad.database.OAuthRequestTokenSet"
+      class="canonical.launchpad.database.oauth.OAuthRequestTokenSet"
       provides="canonical.launchpad.interfaces.oauth.IOAuthRequestTokenSet">
       <allow
           interface="canonical.launchpad.interfaces.oauth.IOAuthRequestTokenSet"/>
   </securedutility>
 
-  <class class="canonical.launchpad.database.OAuthAccessToken">
+  <class class="canonical.launchpad.database.oauth.OAuthAccessToken">
       <allow interface="canonical.launchpad.interfaces.oauth.IOAuthAccessToken"/>
       <require
           permission="launchpad.Edit"
           set_schema="canonical.launchpad.interfaces.oauth.IOAuthAccessToken"/>
   </class>
 
-  <class class="canonical.launchpad.database.OAuthNonce">
+  <class class="canonical.launchpad.database.oauth.OAuthNonce">
       <allow interface="canonical.launchpad.interfaces.oauth.IOAuthNonce"/>
   </class>
 </configure>

=== modified file 'lib/canonical/launchpad/zcml/temporaryblobstorage.zcml'
--- lib/canonical/launchpad/zcml/temporaryblobstorage.zcml	2010-09-29 14:59:57 +0000
+++ lib/canonical/launchpad/zcml/temporaryblobstorage.zcml	2010-09-30 13:21:09 +0000
@@ -9,7 +9,7 @@
   i18n_domain="launchpad">
 
   <!-- TemporaryBlobStorage -->
-  <class class="canonical.launchpad.database.TemporaryBlobStorage">
+  <class class="canonical.launchpad.database.temporaryblobstorage.TemporaryBlobStorage">
     <allow
       interface="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryBlobStorage" />
   </class>
@@ -24,13 +24,13 @@
   </browser:page>
 
   <!-- TemporaryStorageManager -->
-  <class class="canonical.launchpad.database.TemporaryStorageManager">
+  <class class="canonical.launchpad.database.temporaryblobstorage.TemporaryStorageManager">
     <allow
       interface="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryStorageManager" />
   </class>
 
   <securedutility
-      class="canonical.launchpad.database.TemporaryStorageManager"
+      class="canonical.launchpad.database.temporaryblobstorage.TemporaryStorageManager"
       provides="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryStorageManager">
       <allow
         interface="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryStorageManager" />

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2010-09-29 14:59:57 +0000
+++ lib/lp/registry/configure.zcml	2010-09-30 13:21:09 +0000
@@ -1852,14 +1852,14 @@
     <!-- PersonNotification -->
 
     <class
-        class="canonical.launchpad.database.PersonNotification">
+        class="lp.registry.model.personnotification.PersonNotification">
         <allow
             interface="lp.registry.interfaces.personnotification.IPersonNotification"/>
     </class>
 
     <securedutility
         provides="lp.registry.interfaces.personnotification.IPersonNotificationSet"
-        class="canonical.launchpad.database.PersonNotificationSet">
+        class="lp.registry.model.personnotification.PersonNotificationSet">
         <allow
             interface="lp.registry.interfaces.personnotification.IPersonNotificationSet"/>
     </securedutility>

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2010-09-29 14:59:57 +0000
+++ lib/lp/soyuz/configure.zcml	2010-09-30 13:21:09 +0000
@@ -25,7 +25,7 @@
         <!-- BinaryPackagePublishingHistory -->
 
         <class
-            class="canonical.launchpad.database.BinaryPackagePublishingHistory">
+            class="lp.soyuz.model.publishing.BinaryPackagePublishingHistory">
             <allow
                 interface="lp.soyuz.interfaces.publishing.IArchiveSafePublisher"/>
             <require
@@ -42,7 +42,7 @@
         <!-- BinaryPackageFilePublishing -->
 
         <class
-            class="canonical.launchpad.database.BinaryPackageFilePublishing">
+            class="lp.soyuz.model.publishing.BinaryPackageFilePublishing">
             <allow
                 interface="lp.soyuz.interfaces.publishing.IBinaryPackageFilePublishing"/>
 
@@ -69,7 +69,7 @@
 
     <!-- DistroSeriesPackageCache -->
     <class
-        class="canonical.launchpad.database.DistroSeriesPackageCache">
+        class="lp.soyuz.model.distroseriespackagecache.DistroSeriesPackageCache">
         <allow
             interface="lp.soyuz.interfaces.distroseriespackagecache.IDistroSeriesPackageCache"/>
     </class>
@@ -77,7 +77,7 @@
     <!-- BinaryPackageRelease -->
 
     <class
-        class="canonical.launchpad.database.BinaryPackageRelease">
+        class="lp.soyuz.model.binarypackagerelease.BinaryPackageRelease">
         <allow
             interface="lp.soyuz.interfaces.binarypackagerelease.IBinaryPackageRelease"/>
     </class>
@@ -85,14 +85,14 @@
     <!-- BinaryPackageReleaseSet -->
 
     <class
-        class="canonical.launchpad.database.BinaryPackageReleaseSet">
+        class="lp.soyuz.model.binarypackagerelease.BinaryPackageReleaseSet">
         <allow
             interface="lp.soyuz.interfaces.binarypackagerelease.IBinaryPackageReleaseSet"/>
         <implements
             interface="zope.app.container.interfaces.IItemContainer"/>
     </class>
     <securedutility
-        class="canonical.launchpad.database.BinaryPackageReleaseSet"
+        class="lp.soyuz.model.binarypackagerelease.BinaryPackageReleaseSet"
         provides="lp.soyuz.interfaces.binarypackagerelease.IBinaryPackageReleaseSet">
         <allow
             interface="lp.soyuz.interfaces.binarypackagerelease.IBinaryPackageReleaseSet"/>
@@ -101,7 +101,7 @@
     <!-- SourcePackageRelease -->
 
     <class
-        class="canonical.launchpad.database.SourcePackageRelease">
+        class="lp.soyuz.model.sourcepackagerelease.SourcePackageRelease">
         <allow
             interface="lp.soyuz.interfaces.sourcepackagerelease.ISourcePackageRelease"/>
     </class>
@@ -111,7 +111,7 @@
         <!-- SourcePackagePublishingHistory -->
 
         <class
-            class="canonical.launchpad.database.SourcePackagePublishingHistory">
+            class="lp.soyuz.model.publishing.SourcePackagePublishingHistory">
             <allow
                 interface="lp.soyuz.interfaces.publishing.IArchiveSafePublisher"/>
             <require
@@ -128,7 +128,7 @@
         <!-- SourcePackageFilePublishing -->
 
         <class
-            class="canonical.launchpad.database.SourcePackageFilePublishing">
+            class="lp.soyuz.model.publishing.SourcePackageFilePublishing">
             <allow
                 interface="lp.soyuz.interfaces.publishing.ISourcePackageFilePublishing"/>
 
@@ -151,12 +151,12 @@
         </securedutility>
     </facet>
     <class
-        class="canonical.launchpad.database.PackageUploadQueue">
+        class="lp.soyuz.model.queue.PackageUploadQueue">
         <implements
             interface="lp.soyuz.interfaces.queue.IPackageUploadQueue"/>
     </class>
     <class
-        class="canonical.launchpad.database.PackageUpload">
+        class="lp.soyuz.model.queue.PackageUpload">
         <implements
             interface="lp.soyuz.interfaces.queue.IPackageUpload"/>
         <allow
@@ -213,17 +213,17 @@
             set_attributes="status distroseries pocket changesfile archive"/>
     </class>
     <class
-        class="canonical.launchpad.database.PackageUploadSource">
+        class="lp.soyuz.model.queue.PackageUploadSource">
         <allow
             interface="lp.soyuz.interfaces.queue.IPackageUploadSource"/>
     </class>
     <class
-        class="canonical.launchpad.database.PackageUploadBuild">
+        class="lp.soyuz.model.queue.PackageUploadBuild">
         <allow
             interface="lp.soyuz.interfaces.queue.IPackageUploadBuild"/>
     </class>
     <class
-        class="canonical.launchpad.database.PackageUploadCustom">
+        class="lp.soyuz.model.queue.PackageUploadCustom">
         <allow
             interface="lp.soyuz.interfaces.queue.IPackageUploadCustom"/>
         <require
@@ -233,7 +233,7 @@
     <!-- PackageUploadSet -->
 
     <securedutility
-        class="canonical.launchpad.database.PackageUploadSet"
+        class="lp.soyuz.model.queue.PackageUploadSet"
         provides="lp.soyuz.interfaces.queue.IPackageUploadSet">
         <allow
             interface="lp.soyuz.interfaces.queue.IPackageUploadSet"/>
@@ -244,7 +244,7 @@
         <!-- BinaryPackagename -->
 
         <class
-            class="canonical.launchpad.database.BinaryPackageName">
+            class="lp.soyuz.model.binarypackagename.BinaryPackageName">
             <allow
                 interface="lp.soyuz.interfaces.binarypackagename.IBinaryPackageName"/>
         </class>
@@ -270,13 +270,13 @@
         <!-- BinaryPackageNameSet -->
 
         <securedutility
-            class="canonical.launchpad.database.BinaryPackageNameSet"
+            class="lp.soyuz.model.binarypackagename.BinaryPackageNameSet"
             provides="lp.soyuz.interfaces.binarypackagename.IBinaryPackageNameSet">
             <allow
                 interface="lp.soyuz.interfaces.binarypackagename.IBinaryPackageNameSet"/>
         </securedutility>
         <class
-            class="canonical.launchpad.database.BinaryPackageNameSet">
+            class="lp.soyuz.model.binarypackagename.BinaryPackageNameSet">
             <allow
                 interface="lp.soyuz.interfaces.binarypackagename.IBinaryPackageNameSet"/>
         </class>
@@ -293,7 +293,7 @@
     <!-- DistroSeriesSourcePackageRelease -->
 
     <class
-        class="canonical.launchpad.database.DistroSeriesSourcePackageRelease">
+        class="lp.soyuz.model.distroseriessourcepackagerelease.DistroSeriesSourcePackageRelease">
         <allow
             interface="lp.soyuz.interfaces.distroseriessourcepackagerelease.IDistroSeriesSourcePackageRelease"/>
     </class>
@@ -301,7 +301,7 @@
     <!-- PackageDiff -->
 
     <class
-        class="canonical.launchpad.database.PackageDiff">
+        class="lp.soyuz.model.packagediff.PackageDiff">
         <allow
             interface="lp.soyuz.interfaces.packagediff.IPackageDiff"/>
         <require
@@ -312,12 +312,12 @@
     <!-- PackageDiffSet -->
 
     <class
-        class="canonical.launchpad.database.PackageDiffSet">
+        class="lp.soyuz.model.packagediff.PackageDiffSet">
         <allow
             interface="lp.soyuz.interfaces.packagediff.IPackageDiffSet"/>
     </class>
     <securedutility
-        class="canonical.launchpad.database.PackageDiffSet"
+        class="lp.soyuz.model.packagediff.PackageDiffSet"
         provides="lp.soyuz.interfaces.packagediff.IPackageDiffSet">
         <allow
             interface="lp.soyuz.interfaces.packagediff.IPackageDiffSet"/>
@@ -355,12 +355,12 @@
     <!-- DistroArchSeriesBinaryPackageRelease -->
 
     <class
-        class="canonical.launchpad.database.DistroArchSeriesBinaryPackageRelease">
+        class="lp.soyuz.model.distroarchseriesbinarypackagerelease.DistroArchSeriesBinaryPackageRelease">
         <allow
             interface="lp.soyuz.interfaces.distroarchseriesbinarypackagerelease.IDistroArchSeriesBinaryPackageRelease"/>
     </class>
     <class
-        class="canonical.launchpad.database.Processor">
+        class="lp.soyuz.model.processor.Processor">
         <allow
             interface="lp.soyuz.interfaces.processor.IProcessor"/>
         <require
@@ -368,7 +368,7 @@
             set_schema="lp.soyuz.interfaces.processor.IProcessor"/>
     </class>
     <class
-        class="canonical.launchpad.database.ProcessorFamily">
+        class="lp.soyuz.model.processor.ProcessorFamily">
         <allow
             interface="lp.soyuz.interfaces.processor.IProcessorFamily"/>
         <require
@@ -391,7 +391,7 @@
     <!-- Archive -->
 
     <class
-        class="canonical.launchpad.database.Archive">
+        class="lp.soyuz.model.archive.Archive">
         <allow
             interface="lp.soyuz.interfaces.archive.IArchivePublic"/>
         <require
@@ -432,12 +432,12 @@
     <!-- ArchiveSet -->
 
     <class
-        class="canonical.launchpad.database.ArchiveSet">
+        class="lp.soyuz.model.archive.ArchiveSet">
         <allow
             interface="lp.soyuz.interfaces.archive.IArchiveSet"/>
     </class>
     <securedutility
-        class="canonical.launchpad.database.ArchiveSet"
+        class="lp.soyuz.model.archive.ArchiveSet"
         provides="lp.soyuz.interfaces.archive.IArchiveSet">
         <allow
             interface="lp.soyuz.interfaces.archive.IArchiveSet"/>
@@ -446,7 +446,7 @@
     <!-- ArchivePermission -->
 
     <class
-        class="canonical.launchpad.database.ArchivePermission">
+        class="lp.soyuz.model.archivepermission.ArchivePermission">
         <allow
             interface="lp.soyuz.interfaces.archivepermission.IArchivePermission"/>
     </class>
@@ -454,12 +454,12 @@
     <!-- ArchivePermissionSet -->
 
     <class
-        class="canonical.launchpad.database.ArchivePermissionSet">
+        class="lp.soyuz.model.archivepermission.ArchivePermissionSet">
         <implements
             interface="lp.soyuz.interfaces.archivepermission.IArchivePermissionSet"/>
     </class>
     <securedutility
-        class="canonical.launchpad.database.ArchivePermissionSet"
+        class="lp.soyuz.model.archivepermission.ArchivePermissionSet"
         provides="lp.soyuz.interfaces.archivepermission.IArchivePermissionSet">
         <allow
             attributes="
@@ -548,7 +548,7 @@
     <!-- DistroArchSeriesBinaryPackage -->
 
     <class
-        class="canonical.launchpad.database.DistroArchSeriesBinaryPackage">
+        class="lp.soyuz.model.distroarchseriesbinarypackage.DistroArchSeriesBinaryPackage">
         <allow
             interface="lp.soyuz.interfaces.distroarchseriesbinarypackage.IDistroArchSeriesBinaryPackage"/>
     </class>
@@ -605,7 +605,7 @@
     <!-- DistributionSourcePackageRelease -->
 
     <class
-        class="canonical.launchpad.database.DistributionSourcePackageRelease">
+        class="lp.soyuz.model.distributionsourcepackagerelease.DistributionSourcePackageRelease">
         <allow
             interface="lp.soyuz.interfaces.distributionsourcepackagerelease.IDistributionSourcePackageRelease"/>
     </class>
@@ -618,7 +618,7 @@
     <!-- DistroSeriesBinaryPackage -->
 
     <class
-        class="canonical.launchpad.database.DistroSeriesBinaryPackage">
+        class="lp.soyuz.model.distroseriesbinarypackage.DistroSeriesBinaryPackage">
         <allow
             interface="lp.soyuz.interfaces.distroseriesbinarypackage.IDistroSeriesBinaryPackage"/>
     </class>
@@ -634,7 +634,7 @@
         <!-- DistroArchSeries -->
 
         <class
-            class="canonical.launchpad.database.DistroArchSeries">
+            class="lp.soyuz.model.distroarchseries.DistroArchSeries">
             <allow
                 interface="lp.soyuz.interfaces.distroarchseries.IDistroArchSeries"/>
             <allow
@@ -655,12 +655,12 @@
     <!-- DistroArchSeriesSet -->
 
     <class
-        class="canonical.launchpad.database.DistroArchSeriesSet">
+        class="lp.soyuz.model.distroarchseries.DistroArchSeriesSet">
         <allow
             interface="lp.soyuz.interfaces.distroarchseries.IDistroArchSeriesSet"/>
     </class>
     <securedutility
-        class="canonical.launchpad.database.DistroArchSeriesSet"
+        class="lp.soyuz.model.distroarchseries.DistroArchSeriesSet"
         provides="lp.soyuz.interfaces.distroarchseries.IDistroArchSeriesSet">
         <allow
             interface="lp.soyuz.interfaces.distroarchseries.IDistroArchSeriesSet"/>
@@ -669,7 +669,7 @@
     <!-- PocketChroot -->
 
     <class
-        class="canonical.launchpad.database.PocketChroot">
+        class="lp.soyuz.model.distroarchseries.PocketChroot">
         <!-- XXX cprov 2006-07-13: it needs security permission tweaks. -->
         <!-- Currently it's only modified/added by a script.        -->
         <!-- We should allow changes only by buildd-admin member. -->
@@ -684,7 +684,7 @@
     <!-- Component -->
 
     <class
-        class="canonical.launchpad.database.Component">
+        class="lp.soyuz.model.component.Component">
         <allow
             interface="lp.soyuz.interfaces.component.IComponent"/>
     </class>
@@ -692,7 +692,7 @@
     <!-- ComponentSelection -->
 
     <class
-        class="canonical.launchpad.database.ComponentSelection">
+        class="lp.soyuz.model.component.ComponentSelection">
         <allow
             interface="lp.soyuz.interfaces.component.IComponentSelection"/>
     </class>
@@ -700,12 +700,12 @@
     <!-- ComponentSet -->
 
     <class
-        class="canonical.launchpad.database.ComponentSet">
+        class="lp.soyuz.model.component.ComponentSet">
         <allow
             interface="lp.soyuz.interfaces.component.IComponentSet"/>
     </class>
     <securedutility
-        class="canonical.launchpad.database.ComponentSet"
+        class="lp.soyuz.model.component.ComponentSet"
         provides="lp.soyuz.interfaces.component.IComponentSet">
         <allow
             interface="lp.soyuz.interfaces.component.IComponentSet"/>
@@ -714,7 +714,7 @@
     <!-- Section -->
 
     <class
-        class="canonical.launchpad.database.Section">
+        class="lp.soyuz.model.section.Section">
         <allow
             interface="lp.soyuz.interfaces.section.ISection"/>
     </class>
@@ -722,7 +722,7 @@
     <!-- Section -->
 
     <class
-        class="canonical.launchpad.database.SectionSelection">
+        class="lp.soyuz.model.section.SectionSelection">
         <allow
             interface="lp.soyuz.interfaces.section.ISectionSelection"/>
     </class>
@@ -730,12 +730,12 @@
     <!-- SectionSet -->
 
     <class
-        class="canonical.launchpad.database.SectionSet">
+        class="lp.soyuz.model.section.SectionSet">
         <allow
             interface="lp.soyuz.interfaces.section.ISectionSet"/>
     </class>
     <securedutility
-        class="canonical.launchpad.database.SectionSet"
+        class="lp.soyuz.model.section.SectionSet"
         provides="lp.soyuz.interfaces.section.ISectionSet">
         <allow
             interface="lp.soyuz.interfaces.section.ISectionSet"/>
@@ -766,7 +766,7 @@
     <!-- SourcePackageReleaseFile -->
 
     <class
-        class="canonical.launchpad.database.SourcePackageReleaseFile">
+        class="lp.soyuz.model.files.SourcePackageReleaseFile">
         <allow
             interface="lp.soyuz.interfaces.files.ISourcePackageReleaseFile"/>
         <require
@@ -777,7 +777,7 @@
     <!-- BinaryPackageFile -->
 
     <class
-        class="canonical.launchpad.database.BinaryPackageFile">
+        class="lp.soyuz.model.files.BinaryPackageFile">
         <allow
             interface="lp.soyuz.interfaces.files.IBinaryPackageFile"/>
         <require
@@ -785,7 +785,7 @@
             set_schema="lp.soyuz.interfaces.files.IBinaryPackageFile"/>
     </class>
     <securedutility
-        class="canonical.launchpad.database.BinaryPackageFileSet"
+        class="lp.soyuz.model.files.BinaryPackageFileSet"
         provides="lp.soyuz.interfaces.files.IBinaryPackageFileSet">
         <allow
             interface="lp.soyuz.interfaces.files.IBinaryPackageFileSet"/>