launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #01307
[Merge] lp:~sinzui/launchpad/apocalypse-interface-imports-3 into lp:launchpad/devel
Curtis Hovey has proposed merging lp:~sinzui/launchpad/apocalypse-interface-imports-3 into lp:launchpad/devel.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
This is my branch to remove globbed interfaces from ZCML.
lp:~sinzui/launchpad/apocalypse-interface-imports-3
Diff size: 1810
Launchpad bug:
https://bugs.launchpad.net/bugs/651342
Test command: ./bin/test -vv
Pre-implementation: no one
Target release: 10.10
Remove globbed interfaces from ZCML
-----------------------------------
This branch applies the migrater's interface deglober to all zcml. This
fixes imports from unmigrated code and from code that was moved before the
deglobber was improved.
The test suite passed so I am eager to land this as an incremental fix for
removing canonical.launchpad.interfaces globs
Rules
-----
* Hack the zcml migration find-replace rules to run across the whole
tree.
* ADDENDUM. Three files were not fixed because the interfaces were
removed years ago. I delete the unused ZCML files.
QA
--
None. This is a true refactoring.
Lint
----
Linting changed files:
lib/canonical/configure.zcml
lib/canonical/launchpad/configure.zcml
lib/canonical/launchpad/xmlrpc/configure.zcml
lib/canonical/launchpad/zcml/account.zcml
lib/canonical/launchpad/zcml/batchnavigator.zcml
lib/canonical/launchpad/zcml/binaryandsourcepackagename.zcml
lib/canonical/launchpad/zcml/datetime.zcml
lib/canonical/launchpad/zcml/emailaddress.zcml
lib/canonical/launchpad/zcml/feeds.zcml
lib/canonical/launchpad/zcml/gpghandler.zcml
lib/canonical/launchpad/zcml/launchpad.zcml
lib/canonical/launchpad/zcml/launchpadstatistic.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/packagerelationship.zcml
lib/canonical/launchpad/zcml/searchservice.zcml
lib/canonical/launchpad/zcml/temporaryblobstorage.zcml
lib/canonical/launchpad/zcml/webservice.zcml
lib/lp/bugs/browser/configure.zcml
lib/lp/code/configure.zcml
lib/lp/code/browser/configure.zcml
lib/lp/coop/answersbugs/configure.zcml
lib/lp/hardwaredb/browser/configure.zcml
lib/lp/registry/configure.zcml
lib/lp/registry/browser/configure.zcml
lib/lp/services/worlddata/browser/configure.zcml
lib/lp/soyuz/configure.zcml
lib/lp/soyuz/browser/configure.zcml
lib/lp/translations/configure.zcml
lib/lp/translations/browser/configure.zcml
Test
----
The whole suite passed!
Implementation
--------------
This was a scripted find and replace, except for the deletion of:
* distributionrole.zcml
* example.zcml
* sourcepackageutility.zcml
--
https://code.launchpad.net/~sinzui/launchpad/apocalypse-interface-imports-3/+merge/37032
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~sinzui/launchpad/apocalypse-interface-imports-3 into lp:launchpad/devel.
=== modified file 'lib/canonical/configure.zcml'
--- lib/canonical/configure.zcml 2010-09-03 15:02:39 +0000
+++ lib/canonical/configure.zcml 2010-09-29 17:51:04 +0000
@@ -64,13 +64,13 @@
-->
<!-- virtual host: blueprints -->
<browser:defaultView
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
name="specs"
layer="lp.blueprints.publisher.BlueprintsLayer"
/>
<browser:page
name=""
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
class="canonical.launchpad.browser.launchpad.LaunchpadImageFolder"
permission="zope.Public"
layer="lp.blueprints.publisher.BlueprintsLayer"
@@ -78,13 +78,13 @@
<!-- virtual host: code -->
<browser:defaultView
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
name="+code"
layer="lp.code.publisher.CodeLayer"
/>
<browser:page
name=""
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
class="canonical.launchpad.browser.launchpad.LaunchpadImageFolder"
permission="zope.Public"
layer="lp.code.publisher.CodeLayer"
@@ -92,13 +92,13 @@
<!-- virtual host: translations -->
<browser:defaultView
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
name="translations"
layer="lp.translations.publisher.TranslationsLayer"
/>
<browser:page
name=""
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
class="canonical.launchpad.browser.launchpad.LaunchpadImageFolder"
permission="zope.Public"
layer="lp.translations.publisher.TranslationsLayer"
@@ -106,13 +106,13 @@
<!-- virtual host: bugs -->
<browser:defaultView
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
name="bugs"
layer="lp.bugs.publisher.BugsLayer"
/>
<browser:page
name=""
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
class="canonical.launchpad.browser.launchpad.LaunchpadImageFolder"
permission="zope.Public"
layer="lp.bugs.publisher.BugsLayer"
@@ -120,13 +120,13 @@
<!-- virtual host: answers -->
<browser:defaultView
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
name="questions"
layer="lp.answers.publisher.AnswersLayer"
/>
<browser:page
name=""
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
class="canonical.launchpad.browser.launchpad.LaunchpadImageFolder"
permission="zope.Public"
layer="lp.answers.publisher.AnswersLayer"
=== modified file 'lib/canonical/launchpad/configure.zcml'
--- lib/canonical/launchpad/configure.zcml 2010-09-28 05:20:22 +0000
+++ lib/canonical/launchpad/configure.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -34,45 +34,45 @@
<include package="lp.vostok" />
<browser:url
- for="canonical.launchpad.interfaces.IPersonSet"
+ for="lp.registry.interfaces.person.IPersonSet"
path_expression="string:people"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
/>
<browser:url
for="lp.code.interfaces.branch.IBranchSet"
path_expression="string:branches"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
/>
<browser:url
- for="canonical.launchpad.interfaces.IDistributionSet"
+ for="lp.registry.interfaces.distribution.IDistributionSet"
path_expression="string:distros"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
/>
<browser:url
- for="canonical.launchpad.interfaces.ISourcePackageNameSet"
+ for="lp.registry.interfaces.sourcepackagename.ISourcePackageNameSet"
path_expression="string:sourcepackagenames"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
/>
<browser:url
- for="canonical.launchpad.interfaces.IBinaryPackageNameSet"
+ for="lp.soyuz.interfaces.binarypackagename.IBinaryPackageNameSet"
path_expression="string:binarypackagenames"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
/>
<browser:url
- for="canonical.launchpad.interfaces.IProjectGroupSet"
+ for="lp.registry.interfaces.projectgroup.IProjectGroupSet"
path_expression="string:projectgroups"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
/>
<browser:url
- for="canonical.launchpad.interfaces.ILoginTokenSet"
+ for="canonical.launchpad.interfaces.logintoken.ILoginTokenSet"
path_expression="string:token"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
/>
<i18n:registerTranslations directory="locales" />
=== modified file 'lib/canonical/launchpad/xmlrpc/configure.zcml'
--- lib/canonical/launchpad/xmlrpc/configure.zcml 2010-07-01 19:39:54 +0000
+++ lib/canonical/launchpad/xmlrpc/configure.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -10,19 +10,19 @@
<securedutility
class="canonical.launchpad.xmlrpc.PrivateApplication"
- provides="canonical.launchpad.interfaces.IPrivateApplication">
- <allow interface="canonical.launchpad.interfaces.IPrivateApplication"/>
+ provides="canonical.launchpad.interfaces.launchpad.IPrivateApplication">
+ <allow interface="canonical.launchpad.interfaces.launchpad.IPrivateApplication"/>
</securedutility>
<securedutility
class="canonical.launchpad.systemhomes.AuthServerApplication"
- provides="canonical.launchpad.interfaces.IAuthServerApplication">
- <allow interface="canonical.launchpad.interfaces.IAuthServerApplication"/>
+ provides="canonical.launchpad.interfaces.launchpad.IAuthServerApplication">
+ <allow interface="canonical.launchpad.interfaces.launchpad.IAuthServerApplication"/>
</securedutility>
<xmlrpc:view
- for="canonical.launchpad.interfaces.IAuthServerApplication"
- interface="canonical.launchpad.interfaces.IAuthServer"
+ for="canonical.launchpad.interfaces.launchpad.IAuthServerApplication"
+ interface="canonical.launchpad.interfaces.authserver.IAuthServer"
class="canonical.launchpad.xmlrpc.AuthServerAPIView"
permission="zope.Public"
/>
@@ -55,13 +55,13 @@
<securedutility
class="canonical.launchpad.systemhomes.PrivateMaloneApplication"
- provides="canonical.launchpad.interfaces.IPrivateMaloneApplication">
- <allow interface="canonical.launchpad.interfaces.IPrivateMaloneApplication"/>
+ provides="canonical.launchpad.interfaces.launchpad.IPrivateMaloneApplication">
+ <allow interface="canonical.launchpad.interfaces.launchpad.IPrivateMaloneApplication"/>
</securedutility>
<xmlrpc:view
- for="canonical.launchpad.interfaces.IPrivateMaloneApplication"
- interface="canonical.launchpad.interfaces.IExternalBugTrackerTokenAPI"
+ for="canonical.launchpad.interfaces.launchpad.IPrivateMaloneApplication"
+ interface="lp.bugs.interfaces.externalbugtracker.IExternalBugTrackerTokenAPI"
class="canonical.launchpad.xmlrpc.ExternalBugTrackerTokenAPI"
permission="zope.Public"
/>
=== modified file 'lib/canonical/launchpad/zcml/account.zcml'
--- lib/canonical/launchpad/zcml/account.zcml 2009-12-24 09:58:19 +0000
+++ lib/canonical/launchpad/zcml/account.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -7,13 +7,13 @@
<class class="canonical.launchpad.database.Account">
<require
permission="zope.Public"
- interface="canonical.launchpad.interfaces.IAccountPublic" />
+ interface="canonical.launchpad.interfaces.account.IAccountPublic" />
<require
permission="launchpad.View"
- interface="canonical.launchpad.interfaces.IAccountPrivate" />
+ interface="canonical.launchpad.interfaces.account.IAccountPrivate" />
<require
permission="launchpad.Special"
- interface="canonical.launchpad.interfaces.IAccountSpecialRestricted" />
+ interface="canonical.launchpad.interfaces.account.IAccountSpecialRestricted" />
<require
permission="launchpad.Moderate"
set_attributes="status date_status_set status_comment" />
@@ -24,13 +24,13 @@
<securedutility
class="canonical.launchpad.database.AccountSet"
- provides="canonical.launchpad.interfaces.IAccountSet">
- <allow interface="canonical.launchpad.interfaces.IAccountSet" />
+ provides="canonical.launchpad.interfaces.account.IAccountSet">
+ <allow interface="canonical.launchpad.interfaces.account.IAccountSet" />
</securedutility>
<adapter
for="canonical.launchpad.webapp.interfaces.ILaunchpadPrincipal"
- provides="canonical.launchpad.interfaces.IAccount"
+ provides="canonical.launchpad.interfaces.account.IAccount"
factory="canonical.launchpad.components.account.accountFromPrincipal"
/>
=== modified file 'lib/canonical/launchpad/zcml/batchnavigator.zcml'
--- lib/canonical/launchpad/zcml/batchnavigator.zcml 2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/batchnavigator.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -33,7 +33,7 @@
permission="zope.Public" />
<browser:page
- for="canonical.launchpad.interfaces.INominationsReviewTableBatchNavigator"
+ for="lp.bugs.interfaces.bugtask.INominationsReviewTableBatchNavigator"
class="lp.bugs.browser.bugtask.NominationsReviewTableBatchNavigatorView"
name="+table-view-without-navlinks"
template="../templates/bugs-listing-nominations-table-without-navlinks.pt"
=== modified file 'lib/canonical/launchpad/zcml/binaryandsourcepackagename.zcml'
--- lib/canonical/launchpad/zcml/binaryandsourcepackagename.zcml 2010-01-12 19:02:09 +0000
+++ lib/canonical/launchpad/zcml/binaryandsourcepackagename.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -12,7 +12,7 @@
<!-- BinaryAndSourcePackagename -->
<class class="canonical.launchpad.database.BinaryAndSourcePackageName">
- <allow interface="canonical.launchpad.interfaces.IBinaryAndSourcePackageName" />
+ <allow interface="lp.soyuz.interfaces.binarypackagename.IBinaryAndSourcePackageName" />
</class>
<class class="canonical.launchpad.database.binaryandsourcepackagename.BinaryAndSourcePackageNameIterator">
=== modified file 'lib/canonical/launchpad/zcml/datetime.zcml'
--- lib/canonical/launchpad/zcml/datetime.zcml 2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/datetime.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -7,8 +7,8 @@
<!-- Configuration related to datetime classes in Launchpad. -->
<adapter
- for="canonical.launchpad.interfaces.IHasDateCreated"
- provides="canonical.launchpad.interfaces.IAging"
+ for="canonical.launchpad.interfaces.launchpad.IHasDateCreated"
+ provides="canonical.launchpad.interfaces.launchpad.IAging"
factory="canonical.launchpad.components.cdatetime.AgingAdapter" />
</configure>
=== removed file 'lib/canonical/launchpad/zcml/distributionrole.zcml'
--- lib/canonical/launchpad/zcml/distributionrole.zcml 2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/distributionrole.zcml 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
- GNU Affero General Public License version 3 (see the file LICENSE).
--->
-
-<configure
- xmlns="http://namespaces.zope.org/zope";
- xmlns:browser="http://namespaces.zope.org/browser";
- xmlns:i18n="http://namespaces.zope.org/i18n";
- i18n_domain="launchpad">
-
- <!-- DistributionRole-->
- <class class="canonical.launchpad.database.DistributionRole">
- <allow interface="canonical.launchpad.interfaces.IDistributionRole"/>
- <implements interface="zope.app.container.interfaces.IItemContainer"/>
- </class>
-
-</configure>
=== modified file 'lib/canonical/launchpad/zcml/emailaddress.zcml'
--- lib/canonical/launchpad/zcml/emailaddress.zcml 2009-07-17 00:26:05 +0000
+++ lib/canonical/launchpad/zcml/emailaddress.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -17,18 +17,18 @@
attributes="email" />
<require
permission="launchpad.Edit"
- set_schema="canonical.launchpad.interfaces.IEmailAddress"
+ set_schema="canonical.launchpad.interfaces.emailaddress.IEmailAddress"
attributes="destroySelf syncUpdate" />
</class>
<securedutility
class="canonical.launchpad.database.EmailAddressSet"
- provides="canonical.launchpad.interfaces.IEmailAddressSet">
- <allow interface="canonical.launchpad.interfaces.IEmailAddressSet" />
+ provides="canonical.launchpad.interfaces.emailaddress.IEmailAddressSet">
+ <allow interface="canonical.launchpad.interfaces.emailaddress.IEmailAddressSet" />
</securedutility>
<browser:url
- for="canonical.launchpad.interfaces.IEmailAddress"
+ for="canonical.launchpad.interfaces.emailaddress.IEmailAddress"
path_expression="string:+email/${email}"
rootsite="api"
attribute_to_parent="person" />
=== removed file 'lib/canonical/launchpad/zcml/example.zcml'
--- lib/canonical/launchpad/zcml/example.zcml 2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/example.zcml 1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
- GNU Affero General Public License version 3 (see the file LICENSE).
--->
-
-<!-- THIS IS AN EXAMPLE ONLY -->
-<!-- XXX Steve Alexander 2004-10-08: Please update for RosettaSkins! -->
-
-<configure
- xmlns="http://namespaces.zope.org/zope";
- xmlns:browser="http://namespaces.zope.org/browser";
- xmlns:i18n="http://namespaces.zope.org/i18n";
- i18n_domain="launchpad">
-
- <!-- This is class Example -->
- <!-- CONTENT CLASSES -->
- <class class="canonical.launchpad.database.Example">
- <allow interface="canonical.launchpad.interfaces.IExample" />
- </class>
-
- <!-- UTILITY DECLARATION-->
- <securedutility
- class="canonical.launchpad.database.Example"
- provides="canonical.launchpad.interfaces.IExample">
- <allow interface="canonical.launchpad.interfaces.IExample" />
- </securedutility>
-
- <!-- VOCABULARIES -->
-
- <!--TRAVERSALS-->
-
- <!--BROWSER DEFAULTVIEWS-->
- <browser:defaultView
- for="canonical.launchpad.interfaces.IExample"
- name="+index" />
-
- <!--PAGE DECLARATIONS-->
- <browser:defaultView
- for="canonical.launchpad.interfaces.IExample"
- name="+index" />
-
- <!--FORMS-->
-
- <!-- This is class Example2-->
- <!-- ... -->
-
-
-</configure>
=== modified file 'lib/canonical/launchpad/zcml/feeds.zcml'
--- lib/canonical/launchpad/zcml/feeds.zcml 2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/feeds.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -10,19 +10,19 @@
<securedutility
class="canonical.launchpad.systemhomes.FeedsApplication"
- provides="canonical.launchpad.interfaces.IFeedsApplication">
+ provides="canonical.launchpad.interfaces.launchpad.IFeedsApplication">
<allow
- interface="canonical.launchpad.interfaces.IFeedsApplication" />
+ interface="canonical.launchpad.interfaces.launchpad.IFeedsApplication" />
</securedutility>
<adapter
provides="canonical.launchpad.webapp.interfaces.ICanonicalUrlData"
- for="canonical.launchpad.interfaces.IFeedsApplication"
+ for="canonical.launchpad.interfaces.launchpad.IFeedsApplication"
factory="canonical.launchpad.browser.feeds.FeedsRootUrlData"
/>
<browser:defaultView
- for="canonical.launchpad.interfaces.IFeedsApplication"
+ for="canonical.launchpad.interfaces.launchpad.IFeedsApplication"
name="+index"
/>
=== modified file 'lib/canonical/launchpad/zcml/gpghandler.zcml'
--- lib/canonical/launchpad/zcml/gpghandler.zcml 2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/gpghandler.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -10,25 +10,25 @@
i18n_domain="launchpad">
<class class="canonical.launchpad.utilities.GPGHandler">
- <allow interface="canonical.launchpad.interfaces.IGPGHandler" />
+ <allow interface="canonical.launchpad.interfaces.gpghandler.IGPGHandler" />
</class>
<securedutility
class="canonical.launchpad.utilities.GPGHandler"
- provides="canonical.launchpad.interfaces.IGPGHandler">
- <allow interface="canonical.launchpad.interfaces.IGPGHandler" />
+ provides="canonical.launchpad.interfaces.gpghandler.IGPGHandler">
+ <allow interface="canonical.launchpad.interfaces.gpghandler.IGPGHandler" />
</securedutility>
<class class="canonical.launchpad.utilities.PymeSignature">
- <allow interface="canonical.launchpad.interfaces.IPymeSignature" />
+ <allow interface="canonical.launchpad.interfaces.gpghandler.IPymeSignature" />
</class>
<class class="canonical.launchpad.utilities.PymeKey">
- <allow interface="canonical.launchpad.interfaces.IPymeKey" />
+ <allow interface="canonical.launchpad.interfaces.gpghandler.IPymeKey" />
</class>
<class class="canonical.launchpad.utilities.PymeUserId">
- <allow interface="canonical.launchpad.interfaces.IPymeUserId" />
+ <allow interface="canonical.launchpad.interfaces.gpghandler.IPymeUserId" />
</class>
</configure>
=== modified file 'lib/canonical/launchpad/zcml/launchpad.zcml'
--- lib/canonical/launchpad/zcml/launchpad.zcml 2010-09-23 10:12:21 +0000
+++ lib/canonical/launchpad/zcml/launchpad.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -155,7 +155,7 @@
<utility
factory="canonical.launchpad.utilities.LaunchpadCelebrities"
- provides="canonical.launchpad.interfaces.ILaunchpadCelebrities">
+ provides="canonical.launchpad.interfaces.launchpad.ILaunchpadCelebrities">
</utility>
<browser:page
@@ -311,7 +311,7 @@
the view class, only Launchpad developers have access to the
page -->
<browser:page
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
name="+soft-timeout"
class="canonical.launchpad.browser.launchpad.SoftTimeoutView"
attribute="__call__"
@@ -323,11 +323,11 @@
<class
class="canonical.launchpad.utilities.personroles.PersonRoles">
<allow
- interface="canonical.launchpad.interfaces.IPersonRoles"/>
+ interface="canonical.launchpad.interfaces.launchpad.IPersonRoles"/>
</class>
<adapter
for="lp.registry.interfaces.person.IPerson"
- provides="canonical.launchpad.interfaces.IPersonRoles"
+ provides="canonical.launchpad.interfaces.launchpad.IPersonRoles"
factory="canonical.launchpad.utilities.personroles.PersonRoles" />
@@ -351,13 +351,13 @@
these URLs in Apache.
-->
<browser:page
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
name="+opstats"
permission="zope.Public"
class="canonical.launchpad.webapp.opstats.OpStats"
/>
<xmlrpc:view
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
class="canonical.launchpad.webapp.opstats.OpStats"
methods="opstats"
permission="zope.Public"
@@ -366,13 +366,13 @@
<!-- self-test xmlrpc api -->
<xmlrpc:view
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
interface="canonical.launchpad.xmlrpc.ISelfTest"
class="canonical.launchpad.xmlrpc.SelfTest"
permission="zope.Public"
/>
<xmlrpc:view
- for="canonical.launchpad.interfaces.IRosettaApplication"
+ for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
interface="canonical.launchpad.xmlrpc.IRosettaSelfTest"
class="canonical.launchpad.xmlrpc.RosettaSelfTest"
permission="zope.Public"
@@ -401,7 +401,7 @@
</class>
<class class="canonical.launchpad.mailnotification.NotificationRecipientSet">
- <allow interface="canonical.launchpad.interfaces.INotificationRecipientSet" />
+ <allow interface="canonical.launchpad.interfaces.launchpad.INotificationRecipientSet" />
</class>
</configure>
=== modified file 'lib/canonical/launchpad/zcml/launchpadstatistic.zcml'
--- lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2009-09-29 00:29:12 +0000
+++ lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -17,23 +17,23 @@
<!-- LaunchpadStatisticSet -->
<securedutility
class="canonical.launchpad.database.launchpadstatistic.LaunchpadStatisticSet"
- provides="canonical.launchpad.interfaces.ILaunchpadStatisticSet">
- <allow interface="canonical.launchpad.interfaces.ILaunchpadStatisticSet" />
+ provides="canonical.launchpad.interfaces.launchpadstatistic.ILaunchpadStatisticSet">
+ <allow interface="canonical.launchpad.interfaces.launchpadstatistic.ILaunchpadStatisticSet" />
</securedutility>
<browser:url
- for="canonical.launchpad.interfaces.ILaunchpadStatisticSet"
+ for="canonical.launchpad.interfaces.launchpadstatistic.ILaunchpadStatisticSet"
path_expression="string:+statistics"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
/>
<browser:defaultView
- for="canonical.launchpad.interfaces.ILaunchpadStatisticSet"
+ for="canonical.launchpad.interfaces.launchpadstatistic.ILaunchpadStatisticSet"
name="+index"
/>
<browser:pages
- for="canonical.launchpad.interfaces.ILaunchpadStatisticSet"
+ for="canonical.launchpad.interfaces.launchpadstatistic.ILaunchpadStatisticSet"
facet="overview"
class="canonical.launchpad.browser.launchpadstatistic.LaunchpadStatisticSet"
permission="launchpad.Admin">
=== modified file 'lib/canonical/launchpad/zcml/librarian.zcml'
--- lib/canonical/launchpad/zcml/librarian.zcml 2010-09-06 15:14:17 +0000
+++ lib/canonical/launchpad/zcml/librarian.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -9,28 +9,28 @@
i18n_domain="launchpad">
<class class="canonical.launchpad.database.LibraryFileAlias">
- <allow interface="canonical.launchpad.interfaces.ILibraryFileAlias" />
+ <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileAlias" />
</class>
<class class="canonical.launchpad.database.LibraryFileAliasWithParent">
- <allow interface="canonical.launchpad.interfaces.ILibraryFileAliasWithParent" />
+ <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileAliasWithParent" />
<require
permission="launchpad.Edit"
set_attributes="restricted" />
</class>
<class class="canonical.launchpad.database.LibraryFileContent">
- <allow interface="canonical.launchpad.interfaces.ILibraryFileContent" />
+ <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileContent" />
</class>
<securedutility
class="canonical.launchpad.database.LibraryFileAliasSet"
- provides="canonical.launchpad.interfaces.ILibraryFileAliasSet">
- <allow interface="canonical.launchpad.interfaces.ILibraryFileAliasSet" />
+ provides="canonical.launchpad.interfaces.librarian.ILibraryFileAliasSet">
+ <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileAliasSet" />
</securedutility>
<browser:defaultView
- for="canonical.launchpad.interfaces.ILibraryFileAlias"
+ for="canonical.launchpad.interfaces.librarian.ILibraryFileAlias"
name="+index"
/>
@@ -38,14 +38,14 @@
name="+index"
facet="overview"
permission="zope.Public"
- for="canonical.launchpad.interfaces.ILibraryFileAlias"
+ for="canonical.launchpad.interfaces.librarian.ILibraryFileAlias"
class="canonical.launchpad.browser.LibraryFileAliasView"
/>
<browser:page
name="+md5"
permission="zope.Public"
- for="canonical.launchpad.interfaces.ILibraryFileAlias"
+ for="canonical.launchpad.interfaces.librarian.ILibraryFileAlias"
class="canonical.launchpad.browser.LibraryFileAliasMD5View"
/>
=== modified file 'lib/canonical/launchpad/zcml/logintoken.zcml'
--- lib/canonical/launchpad/zcml/logintoken.zcml 2010-04-15 22:42:41 +0000
+++ lib/canonical/launchpad/zcml/logintoken.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -14,21 +14,21 @@
<class class="canonical.launchpad.database.LoginToken">
<require
permission="zope.Public"
- interface="canonical.launchpad.interfaces.ILoginToken" />
+ interface="canonical.launchpad.interfaces.logintoken.ILoginToken" />
</class>
<browser:defaultView
- for="canonical.launchpad.interfaces.ILoginToken"
+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
name="+index" />
<browser:url
- for="canonical.launchpad.interfaces.ILoginToken"
+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
path_expression="token"
- parent_utility="canonical.launchpad.interfaces.ILoginTokenSet"
+ parent_utility="canonical.launchpad.interfaces.logintoken.ILoginTokenSet"
/>
<browser:page
- for="canonical.launchpad.interfaces.ILoginToken"
+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
name="+index"
permission="zope.Public"
class="canonical.launchpad.browser.LoginTokenView"
@@ -36,7 +36,7 @@
/>
<browser:page
- for="canonical.launchpad.interfaces.ILoginToken"
+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
name="+validateemail"
permission="zope.Public"
class="canonical.launchpad.browser.logintoken.ValidateEmailView"
@@ -44,7 +44,7 @@
/>
<browser:page
- for="canonical.launchpad.interfaces.ILoginToken"
+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
name="+validateteamemail"
permission="zope.Public"
class="canonical.launchpad.browser.logintoken.ValidateTeamEmailView"
@@ -52,7 +52,7 @@
/>
<browser:page
- for="canonical.launchpad.interfaces.ILoginToken"
+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
name="+validategpg"
permission="zope.Public"
class="canonical.launchpad.browser.ValidateGPGKeyView"
@@ -60,7 +60,7 @@
/>
<browser:page
- for="canonical.launchpad.interfaces.ILoginToken"
+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
name="+validatesignonlygpg"
permission="zope.Public"
class="canonical.launchpad.browser.ValidateGPGKeyView"
@@ -68,7 +68,7 @@
/>
<browser:page
- for="canonical.launchpad.interfaces.ILoginToken"
+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
name="+accountmerge"
permission="zope.Public"
class="canonical.launchpad.browser.MergePeopleView"
@@ -76,7 +76,7 @@
/>
<browser:page
- for="canonical.launchpad.interfaces.ILoginToken"
+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
name="+claimteam"
permission="launchpad.AnyPerson"
class="canonical.launchpad.browser.ClaimTeamView"
@@ -84,20 +84,20 @@
<browser:page
name="+bugtracker-handshake"
- for="canonical.launchpad.interfaces.ILoginToken"
+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
class="canonical.launchpad.browser.BugTrackerHandshakeView"
permission="zope.Public"
/>
<!-- LoginTokenSet -->
<class class="canonical.launchpad.database.LoginTokenSet">
- <allow interface="canonical.launchpad.interfaces.ILoginTokenSet" />
+ <allow interface="canonical.launchpad.interfaces.logintoken.ILoginTokenSet" />
</class>
<securedutility
class="canonical.launchpad.database.LoginTokenSet"
- provides="canonical.launchpad.interfaces.ILoginTokenSet">
- <allow interface="canonical.launchpad.interfaces.ILoginTokenSet" />
+ provides="canonical.launchpad.interfaces.logintoken.ILoginTokenSet">
+ <allow interface="canonical.launchpad.interfaces.logintoken.ILoginTokenSet" />
</securedutility>
<browser:navigation
=== modified file 'lib/canonical/launchpad/zcml/message.zcml'
--- lib/canonical/launchpad/zcml/message.zcml 2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/message.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -10,38 +10,38 @@
<!-- Message -->
<class class="canonical.launchpad.database.Message">
- <allow interface="canonical.launchpad.interfaces.IMessage" />
+ <allow interface="canonical.launchpad.interfaces.message.IMessage" />
<require
permission="zope.Public"
- set_schema="canonical.launchpad.interfaces.IMessage" />
+ set_schema="canonical.launchpad.interfaces.message.IMessage" />
</class>
- <class class="canonical.launchpad.interfaces.IndexedMessage">
- <allow interface="canonical.launchpad.interfaces.IMessage" />
- <allow interface="canonical.launchpad.interfaces.IIndexedMessage" />
+ <class class="canonical.launchpad.interfaces.message.IndexedMessage">
+ <allow interface="canonical.launchpad.interfaces.message.IMessage" />
+ <allow interface="canonical.launchpad.interfaces.message.IIndexedMessage" />
</class>
<!-- MessageChunk -->
<class class="canonical.launchpad.database.MessageChunk">
- <allow interface="canonical.launchpad.interfaces.IMessageChunk" />
+ <allow interface="canonical.launchpad.interfaces.message.IMessageChunk" />
</class>
<!-- MessageSet -->
<securedutility
class="canonical.launchpad.database.MessageSet"
- provides="canonical.launchpad.interfaces.IMessageSet">
- <allow interface="canonical.launchpad.interfaces.IMessageSet" />
+ provides="canonical.launchpad.interfaces.message.IMessageSet">
+ <allow interface="canonical.launchpad.interfaces.message.IMessageSet" />
</securedutility>
<!-- Some message have a canonical_url -->
- <adapter for="canonical.launchpad.interfaces.IMessage"
+ <adapter for="canonical.launchpad.interfaces.message.IMessage"
provides="canonical.launchpad.webapp.interfaces.ICanonicalUrlData"
factory="canonical.launchpad.browser.message.message_to_canonical_url_data"
/>
<!-- Adapt several related objects to provide unified details -->
- <adapter for="canonical.launchpad.interfaces.IMessageApproval"
- provides="canonical.launchpad.interfaces.IHeldMessageDetails"
+ <adapter for="lp.registry.interfaces.mailinglist.IMessageApproval"
+ provides="lp.registry.interfaces.mailinglist.IHeldMessageDetails"
factory="lp.registry.model.mailinglist.HeldMessageDetails"
/>
@@ -52,6 +52,6 @@
provides="canonical.launchpad.interfaces.message.IDirectEmailAuthorization"
factory="canonical.launchpad.database.message.DirectEmailAuthorization"
/>
-
+
</configure>
=== modified file 'lib/canonical/launchpad/zcml/oauth.zcml'
--- lib/canonical/launchpad/zcml/oauth.zcml 2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/oauth.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -10,42 +10,42 @@
i18n_domain="launchpad">
<class class="canonical.launchpad.database.OAuthConsumer">
- <allow interface="canonical.launchpad.interfaces.IOAuthConsumer"/>
+ <allow interface="canonical.launchpad.interfaces.oauth.IOAuthConsumer"/>
</class>
<class class="canonical.launchpad.database.OAuthConsumerSet">
- <allow interface="canonical.launchpad.interfaces.IOAuthConsumerSet"/>
+ <allow interface="canonical.launchpad.interfaces.oauth.IOAuthConsumerSet"/>
</class>
<securedutility
class="canonical.launchpad.database.OAuthConsumerSet"
- provides="canonical.launchpad.interfaces.IOAuthConsumerSet">
+ provides="canonical.launchpad.interfaces.oauth.IOAuthConsumerSet">
<allow
- interface="canonical.launchpad.interfaces.IOAuthConsumerSet"/>
+ interface="canonical.launchpad.interfaces.oauth.IOAuthConsumerSet"/>
</securedutility>
<class class="canonical.launchpad.database.OAuthRequestToken">
- <allow interface="canonical.launchpad.interfaces.IOAuthRequestToken"/>
+ <allow interface="canonical.launchpad.interfaces.oauth.IOAuthRequestToken"/>
<require
permission="launchpad.Edit"
- set_schema="canonical.launchpad.interfaces.IOAuthRequestToken"/>
+ set_schema="canonical.launchpad.interfaces.oauth.IOAuthRequestToken"/>
</class>
<securedutility
class="canonical.launchpad.database.OAuthRequestTokenSet"
- provides="canonical.launchpad.interfaces.IOAuthRequestTokenSet">
+ provides="canonical.launchpad.interfaces.oauth.IOAuthRequestTokenSet">
<allow
- interface="canonical.launchpad.interfaces.IOAuthRequestTokenSet"/>
+ interface="canonical.launchpad.interfaces.oauth.IOAuthRequestTokenSet"/>
</securedutility>
<class class="canonical.launchpad.database.OAuthAccessToken">
- <allow interface="canonical.launchpad.interfaces.IOAuthAccessToken"/>
+ <allow interface="canonical.launchpad.interfaces.oauth.IOAuthAccessToken"/>
<require
permission="launchpad.Edit"
- set_schema="canonical.launchpad.interfaces.IOAuthAccessToken"/>
+ set_schema="canonical.launchpad.interfaces.oauth.IOAuthAccessToken"/>
</class>
<class class="canonical.launchpad.database.OAuthNonce">
- <allow interface="canonical.launchpad.interfaces.IOAuthNonce"/>
+ <allow interface="canonical.launchpad.interfaces.oauth.IOAuthNonce"/>
</class>
</configure>
=== modified file 'lib/canonical/launchpad/zcml/packagerelationship.zcml'
--- lib/canonical/launchpad/zcml/packagerelationship.zcml 2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/packagerelationship.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -10,16 +10,16 @@
<!-- PackageRelationship -->
<class class="canonical.launchpad.browser.PackageRelationship">
- <allow interface="canonical.launchpad.interfaces.IPackageRelationship"/>
+ <allow interface="canonical.launchpad.interfaces.packagerelationship.IPackageRelationship"/>
</class>
<!-- PackageRelationshipSet -->
<class class="canonical.launchpad.browser.PackageRelationshipSet">
- <allow interface="canonical.launchpad.interfaces.IPackageRelationshipSet"/>
+ <allow interface="canonical.launchpad.interfaces.packagerelationship.IPackageRelationshipSet"/>
</class>
<browser:pages
- for="canonical.launchpad.interfaces.IPackageRelationshipSet"
+ for="canonical.launchpad.interfaces.packagerelationship.IPackageRelationshipSet"
permission="zope.Public">
<browser:page
name="+render-list"
=== modified file 'lib/canonical/launchpad/zcml/searchservice.zcml'
--- lib/canonical/launchpad/zcml/searchservice.zcml 2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/searchservice.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -7,17 +7,17 @@
<class
class="canonical.launchpad.utilities.PageMatch">
- <allow interface="canonical.launchpad.interfaces.ISearchResult" />
+ <allow interface="canonical.launchpad.interfaces.searchservice.ISearchResult" />
</class>
<class
class="canonical.launchpad.utilities.PageMatches">
- <allow interface="canonical.launchpad.interfaces.ISearchResults" />
+ <allow interface="canonical.launchpad.interfaces.searchservice.ISearchResults" />
</class>
<securedutility
class="canonical.launchpad.utilities.GoogleSearchService"
- provides="canonical.launchpad.interfaces.ISearchService">
- <allow interface="canonical.launchpad.interfaces.ISearchService" />
+ provides="canonical.launchpad.interfaces.searchservice.ISearchService">
+ <allow interface="canonical.launchpad.interfaces.searchservice.ISearchService" />
</securedutility>
</configure>
=== removed file 'lib/canonical/launchpad/zcml/sourcepackageutility.zcml'
--- lib/canonical/launchpad/zcml/sourcepackageutility.zcml 2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/sourcepackageutility.zcml 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
- GNU Affero General Public License version 3 (see the file LICENSE).
--->
-
-<configure
- xmlns="http://namespaces.zope.org/zope";
- xmlns:browser="http://namespaces.zope.org/browser";
- xmlns:i18n="http://namespaces.zope.org/i18n";
- i18n_domain="launchpad">
-
- <!-- SourcePackageUtility -->
- <securedutility
- class="canonical.launchpad.database.SourcePackageUtility"
- provides="canonical.launchpad.interfaces.ISourcePackageUtility">
- <allow interface="canonical.launchpad.interfaces.ISourcePackageUtility" />
- </securedutility>
-
-</configure>
=== modified file 'lib/canonical/launchpad/zcml/temporaryblobstorage.zcml'
--- lib/canonical/launchpad/zcml/temporaryblobstorage.zcml 2010-02-26 17:35:01 +0000
+++ lib/canonical/launchpad/zcml/temporaryblobstorage.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -11,12 +11,12 @@
<!-- TemporaryBlobStorage -->
<class class="canonical.launchpad.database.TemporaryBlobStorage">
<allow
- interface="canonical.launchpad.interfaces.ITemporaryBlobStorage" />
+ interface="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryBlobStorage" />
</class>
<browser:page
name="+storeblob"
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
class="canonical.launchpad.browser.TemporaryBlobStorageAddView"
permission="zope.Public"
template="../templates/temporaryblobstorage-storeblob.pt"
@@ -26,14 +26,14 @@
<!-- TemporaryStorageManager -->
<class class="canonical.launchpad.database.TemporaryStorageManager">
<allow
- interface="canonical.launchpad.interfaces.ITemporaryStorageManager" />
+ interface="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryStorageManager" />
</class>
<securedutility
class="canonical.launchpad.database.TemporaryStorageManager"
- provides="canonical.launchpad.interfaces.ITemporaryStorageManager">
+ provides="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryStorageManager">
<allow
- interface="canonical.launchpad.interfaces.ITemporaryStorageManager" />
+ interface="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryStorageManager" />
</securedutility>
<browser:navigation
@@ -44,12 +44,12 @@
<browser:url
for="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryBlobStorage"
urldata="canonical.launchpad.browser.temporaryblobstorage.TemporaryBlobStorageURL"
- parent_utility="canonical.launchpad.interfaces.IWebServiceApplication"/>
+ parent_utility="canonical.launchpad.interfaces.launchpad.IWebServiceApplication"/>
path_expression="string:temporary-blobs/${uuid}"
/>
<browser:url
for="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryStorageManager"
path_expression="string:temporary-blobs"
- parent_utility="canonical.launchpad.interfaces.IWebServiceApplication"/>
+ parent_utility="canonical.launchpad.interfaces.launchpad.IWebServiceApplication"/>
</configure>
=== modified file 'lib/canonical/launchpad/zcml/webservice.zcml'
--- lib/canonical/launchpad/zcml/webservice.zcml 2010-09-03 19:32:28 +0000
+++ lib/canonical/launchpad/zcml/webservice.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -23,9 +23,9 @@
<securedutility
class="canonical.launchpad.systemhomes.WebServiceApplication"
- provides="canonical.launchpad.interfaces.IWebServiceApplication">
+ provides="canonical.launchpad.interfaces.launchpad.IWebServiceApplication">
<allow
- interface="canonical.launchpad.interfaces.IWebServiceApplication" />
+ interface="canonical.launchpad.interfaces.launchpad.IWebServiceApplication" />
<allow interface='lazr.restful.interfaces.IServiceRootResource' />
<allow interface='canonical.launchpad.webapp.interfaces.ICanonicalUrlData' />
</securedutility>
@@ -58,14 +58,14 @@
<!-- WebService uses the default LaunchpadRootNavigation -->
<view
- for="canonical.launchpad.interfaces.IWebServiceApplication"
+ for="canonical.launchpad.interfaces.launchpad.IWebServiceApplication"
type="canonical.launchpad.layers.WebServiceLayer"
factory="canonical.launchpad.browser.LaunchpadRootNavigation"
provides="zope.publisher.interfaces.browser.IBrowserPublisher"
/>
<adapter
- for="canonical.launchpad.interfaces.IBugComment
+ for="lp.bugs.interfaces.bugmessage.IBugComment
lazr.restful.interfaces.IWebServiceClientRequest"
provides="lazr.restful.interfaces.IEntry"
factory="canonical.launchpad.rest.bugcomment_to_entry"
=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml 2010-09-28 03:01:37 +0000
+++ lib/lp/bugs/browser/configure.zcml 2010-09-29 17:51:04 +0000
@@ -197,7 +197,7 @@
<browser:url
for="lp.bugs.interfaces.malone.IMaloneApplication"
path_expression="string:bugs"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:menu
id="malone_actions"
title="Menu for Malone-related actions."/>
=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml 2010-09-23 13:47:36 +0000
+++ lib/lp/code/browser/configure.zcml 2010-09-29 17:51:04 +0000
@@ -130,16 +130,16 @@
module="lp.code.browser.branchref"
classes="BranchRefNavigation"/>
<browser:url
- for="canonical.launchpad.interfaces.IBazaarApplication"
+ for="canonical.launchpad.interfaces.launchpad.IBazaarApplication"
path_expression="string:+code"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
rootsite="code"/>
<browser:defaultView
- for="canonical.launchpad.interfaces.IBazaarApplication"
+ for="canonical.launchpad.interfaces.launchpad.IBazaarApplication"
layer="lp.code.publisher.CodeLayer"
name="+index"/>
<browser:pages
- for="canonical.launchpad.interfaces.IBazaarApplication"
+ for="canonical.launchpad.interfaces.launchpad.IBazaarApplication"
layer="lp.code.publisher.CodeLayer"
permission="zope.Public"
class="lp.code.browser.bazaar.BazaarApplicationView"
@@ -741,7 +741,7 @@
<browser:url
for="lp.code.interfaces.codeimport.ICodeImportSet"
path_expression="string:+code-imports"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
rootsite="code"/>
<browser:defaultView
for="lp.code.interfaces.codeimport.ICodeImportSet"
=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml 2010-09-21 14:54:43 +0000
+++ lib/lp/code/configure.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -183,19 +183,19 @@
</securedutility>
<securedutility
class="canonical.launchpad.systemhomes.BazaarApplication"
- provides="canonical.launchpad.interfaces.IBazaarApplication">
- <allow interface="canonical.launchpad.interfaces.IBazaarApplication"/>
+ provides="canonical.launchpad.interfaces.launchpad.IBazaarApplication">
+ <allow interface="canonical.launchpad.interfaces.launchpad.IBazaarApplication"/>
</securedutility>
<!-- pages for the bazaar application -->
<xmlrpc:view
- for="canonical.launchpad.interfaces.IBazaarApplication"
+ for="canonical.launchpad.interfaces.launchpad.IBazaarApplication"
interface="canonical.launchpad.xmlrpc.IBranchSetAPI"
class="canonical.launchpad.xmlrpc.BranchSetAPI"
permission="launchpad.AnyPerson"/>
<xmlrpc:view
- for="canonical.launchpad.interfaces.IBazaarApplication"
+ for="canonical.launchpad.interfaces.launchpad.IBazaarApplication"
interface="canonical.launchpad.xmlrpc.IPublicCodehostingAPI"
class="canonical.launchpad.xmlrpc.PublicCodehostingAPI"
permission="zope.Public"/>
@@ -280,7 +280,7 @@
<!-- Branch Merge Proposal Jobs -->
<class class="lp.code.model.branchmergeproposaljob.CreateMergeProposalJob">
- <allow interface="canonical.launchpad.interfaces.IMessageJob"/>
+ <allow interface="canonical.launchpad.interfaces.message.IMessageJob"/>
<allow interface="lp.code.interfaces.branchmergeproposal.ICreateMergeProposalJob"/>
</class>
<securedutility
=== modified file 'lib/lp/coop/answersbugs/configure.zcml'
--- lib/lp/coop/answersbugs/configure.zcml 2009-08-18 23:14:59 +0000
+++ lib/lp/coop/answersbugs/configure.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -10,7 +10,7 @@
<facet facet="answers">
<subscriber
- for="canonical.launchpad.interfaces.IBugTask
+ for="lp.bugs.interfaces.bugtask.IBugTask
lazr.lifecycle.interfaces.IObjectModifiedEvent"
handler=".notification.dispatch_linked_question_notifications"
/>
=== modified file 'lib/lp/hardwaredb/browser/configure.zcml'
--- lib/lp/hardwaredb/browser/configure.zcml 2010-02-02 17:12:29 +0000
+++ lib/lp/hardwaredb/browser/configure.zcml 2010-09-29 17:51:04 +0000
@@ -11,7 +11,7 @@
<browser:url
for="lp.hardwaredb.interfaces.hwdb.IHWDBApplication"
path_expression="string:+hwdb"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:page
for="lp.hardwaredb.interfaces.hwdb.IHWDBApplication"
class="lp.hardwaredb.browser.hwdb.HWDBUploadView"
@@ -35,7 +35,7 @@
permission="zope.Public"
name="+text"/>
<browser:page
- for="canonical.launchpad.interfaces.IPerson"
+ for="lp.registry.interfaces.person.IPerson"
permission="zope.Public"
class="lp.hardwaredb.browser.hwdb.HWDBPersonSubmissionsView"
template="../templates/person-hwdb-submissions.pt"
=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml 2010-09-29 05:14:26 +0000
+++ lib/lp/registry/browser/configure.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -10,7 +10,7 @@
i18n_domain="launchpad">
<!-- RDF downloadable documents -->
<browser:page
- for="canonical.launchpad.interfaces.ILaunchpadRoot"
+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
class="lp.registry.browser.RDFIndexView"
name="rdf"
template="../templates/rdf-index.pt"
@@ -206,7 +206,7 @@
<browser:url
for="lp.registry.interfaces.codeofconduct.ICodeOfConductSet"
path_expression="string:codeofconduct"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:url
for="lp.registry.interfaces.codeofconduct.ICodeOfConduct"
parent_utility="lp.registry.interfaces.codeofconduct.ICodeOfConductSet"
@@ -285,7 +285,7 @@
</browser:addform>
</facet>
<browser:url
- for="canonical.launchpad.interfaces.IIrcID"
+ for="lp.registry.interfaces.irc.IIrcID"
path_expression="string:+ircnick/${id}"
attribute_to_parent="person"
rootsite="api"/>
@@ -404,7 +404,7 @@
<browser:url
for="lp.registry.interfaces.projectgroup.IProjectGroup"
path_expression="name"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:pages
for="lp.registry.interfaces.projectgroup.IProjectGroupSet"
facet="overview"
@@ -510,14 +510,14 @@
path_expression="string:+commercialsubscription/${id}"
attribute_to_parent="product"/>
<browser:url
- for="canonical.launchpad.interfaces.IJabberID"
+ for="lp.registry.interfaces.jabber.IJabberID"
path_expression="string:+jabberid/${jabberid}"
attribute_to_parent="person"
rootsite="api"/>
<browser:url
for="lp.registry.interfaces.pillar.IPillarNameSet"
path_expression="string:pillars"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<adapter
provides="canonical.launchpad.webapp.interfaces.INavigationMenu"
for="lp.registry.browser.pillar.IInvolved"
@@ -554,7 +554,7 @@
<browser:url
for="lp.registry.interfaces.karma.IKarmaActionSet"
path_expression="string:karmaaction"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:defaultView
for="lp.registry.interfaces.karma.IKarmaActionSet"
name="+index"/>
@@ -733,7 +733,7 @@
<browser:url
for="lp.registry.interfaces.announcement.IAnnouncementSet"
path_expression="string:+announcements"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:defaultView
for="lp.registry.interfaces.announcement.IAnnouncementSet"
name="+announcements"/>
@@ -791,7 +791,7 @@
<browser:url
for="lp.registry.interfaces.person.IPerson"
path_expression="string:~${name}"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:defaultView
for="lp.registry.interfaces.person.IPerson"
name="+index"/>
@@ -1403,7 +1403,7 @@
<browser:url
for="lp.registry.interfaces.product.IProduct"
path_expression="name"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:page
name="+get-involved"
for="lp.registry.interfaces.product.IProduct"
@@ -1559,7 +1559,7 @@
<browser:url
for="lp.registry.interfaces.product.IProductSet"
path_expression="string:projects"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:pages
for="lp.registry.interfaces.product.IProductSet"
permission="zope.Public"
@@ -1761,7 +1761,7 @@
<browser:url
for="lp.registry.interfaces.productseries.IProductSeriesSet"
path_expression="string:series"
- parent_utility="canonical.launchpad.interfaces.IBazaarApplication"/>
+ parent_utility="canonical.launchpad.interfaces.launchpad.IBazaarApplication"/>
<browser:menus
classes="
ProductSeriesFacets
@@ -1941,7 +1941,7 @@
<browser:url
for="lp.registry.interfaces.distribution.IDistribution"
path_expression="name"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:pages
for="lp.registry.interfaces.distribution.IDistributionSet"
permission="zope.Public"
@@ -2117,7 +2117,7 @@
module="lp.registry.browser.productrelease"/>
<browser:page
name="+driver"
- for="canonical.launchpad.interfaces.IHasAppointedDriver"
+ for="canonical.launchpad.interfaces.launchpad.IHasAppointedDriver"
class="lp.registry.browser.driver.AppointDriverView"
facet="overview"
permission="launchpad.Edit"
=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml 2010-09-23 01:46:29 +0000
+++ lib/lp/registry/configure.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -135,11 +135,11 @@
<allow
interface="lp.bugs.interfaces.bugtarget.IHasBugHeat"/>
<allow
- interface="canonical.launchpad.interfaces.IHasQueueItems"/>
+ interface="lp.soyuz.interfaces.queue.IHasQueueItems"/>
<allow
interface="lp.translations.interfaces.translationimportqueue.IHasTranslationImports"/>
<allow
- interface="canonical.launchpad.interfaces.ICanPublishPackages"/>
+ interface="lp.soyuz.interfaces.publishing.ICanPublishPackages"/>
<require
permission="launchpad.Edit"
set_schema="lp.app.interfaces.launchpad.IServiceUsage"/>
@@ -302,9 +302,9 @@
<allow
interface="lp.bugs.interfaces.bugtarget.IHasBugHeat"/>
<allow
- interface="canonical.launchpad.interfaces.IFAQCollection"/>
+ interface="lp.answers.interfaces.faqcollection.IFAQCollection"/>
<allow
- interface="canonical.launchpad.interfaces.IQuestionCollection"/>
+ interface="lp.answers.interfaces.questioncollection.IQuestionCollection"/>
<allow
interface="lp.translations.interfaces.translationgroup.ITranslationPolicy"/>
<require
@@ -734,7 +734,7 @@
<!-- PollSubset -->
<adapter
- for="canonical.launchpad.interfaces.ITeam"
+ for="lp.registry.interfaces.person.ITeam"
provides="lp.registry.interfaces.poll.IPollSubset"
factory="lp.registry.adapters.PollSubset"
permission="zope.Public"/>
@@ -995,7 +995,7 @@
interface="lp.registry.interfaces.milestone.IProjectGroupMilestone"/>
</class>
<subscriber
- for="canonical.launchpad.interfaces.IProduct zope.lifecycleevent.interfaces.IObjectModifiedEvent"
+ for="lp.registry.interfaces.product.IProduct zope.lifecycleevent.interfaces.IObjectModifiedEvent"
handler="lp.registry.subscribers.product_modified"/>
<class
class="lp.registry.model.mailinglist.MailingList">
@@ -1088,7 +1088,7 @@
<class
class="lp.registry.model.gpgkey.GPGKey">
<allow
- interface="canonical.launchpad.interfaces.IGPGKey"/>
+ interface="lp.registry.interfaces.gpg.IGPGKey"/>
<require
permission="launchpad.Edit"
set_attributes="active can_encrypt"/>
@@ -1099,13 +1099,13 @@
<class
class="lp.registry.model.gpgkey.GPGKeySet">
<allow
- interface="canonical.launchpad.interfaces.IGPGKeySet"/>
+ interface="lp.registry.interfaces.gpg.IGPGKeySet"/>
</class>
<securedutility
class="lp.registry.model.gpgkey.GPGKeySet"
- provides="canonical.launchpad.interfaces.IGPGKeySet">
+ provides="lp.registry.interfaces.gpg.IGPGKeySet">
<allow
- interface="canonical.launchpad.interfaces.IGPGKeySet"/>
+ interface="lp.registry.interfaces.gpg.IGPGKeySet"/>
</securedutility>
<!-- Product -->
@@ -1226,7 +1226,7 @@
<!-- IFAQTarget -->
<allow
- interface="canonical.launchpad.interfaces.IFAQCollection"
+ interface="lp.answers.interfaces.faqcollection.IFAQCollection"
attributes="
findSimilarFAQs"/>
<require
@@ -1335,7 +1335,7 @@
<class
class="lp.registry.model.person.SSHKey">
<allow
- interface="canonical.launchpad.interfaces.ISSHKey"/>
+ interface="lp.registry.interfaces.ssh.ISSHKey"/>
<require
permission="launchpad.Edit"
set_attributes="keytext comment"/>
@@ -1346,13 +1346,13 @@
<class
class="lp.registry.model.person.SSHKeySet">
<allow
- interface="canonical.launchpad.interfaces.ISSHKeySet"/>
+ interface="lp.registry.interfaces.ssh.ISSHKeySet"/>
</class>
<securedutility
class="lp.registry.model.person.SSHKeySet"
- provides="canonical.launchpad.interfaces.ISSHKeySet">
+ provides="lp.registry.interfaces.ssh.ISSHKeySet">
<allow
- interface="canonical.launchpad.interfaces.ISSHKeySet"/>
+ interface="lp.registry.interfaces.ssh.ISSHKeySet"/>
</securedutility>
<subscriber
for="canonical.launchpad.event.interfaces.IJoinTeamEvent"
@@ -1407,7 +1407,7 @@
removeBugSubscription"/>
</class>
<adapter
- provides="canonical.launchpad.interfaces.IHasExternalBugTracker"
+ provides="canonical.launchpad.interfaces.launchpad.IHasExternalBugTracker"
for="lp.registry.interfaces.productseries.IProductSeries"
factory="lp.registry.adapters.productseries_to_product"
permission="zope.Public"/>
@@ -1506,7 +1506,7 @@
<!-- IFAQTarget -->
<allow
- interface="canonical.launchpad.interfaces.IFAQCollection"
+ interface="lp.answers.interfaces.faqcollection.IFAQCollection"
attributes="
findSimilarFAQs"/>
<require
@@ -1582,7 +1582,7 @@
<allow
interface="lp.bugs.interfaces.bugtarget.IHasBugHeat"/>
<allow
- interface="canonical.launchpad.interfaces.IHasBuildRecords"/>
+ interface="lp.soyuz.interfaces.buildrecords.IHasBuildRecords"/>
<allow
interface="lp.translations.interfaces.translationimportqueue.IHasTranslationImports"/>
=== modified file 'lib/lp/services/worlddata/browser/configure.zcml'
--- lib/lp/services/worlddata/browser/configure.zcml 2010-02-21 00:41:56 +0000
+++ lib/lp/services/worlddata/browser/configure.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2010 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -18,7 +18,7 @@
<browser:url
for="lp.services.worlddata.interfaces.country.ICountrySet"
path_expression="string:+countries"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
rootsite="mainsite" />
<browser:navigation
=== modified file 'lib/lp/soyuz/browser/configure.zcml'
--- lib/lp/soyuz/browser/configure.zcml 2010-07-02 14:34:58 +0000
+++ lib/lp/soyuz/browser/configure.zcml 2010-09-29 17:51:04 +0000
@@ -388,7 +388,7 @@
<browser:url
for="lp.buildmaster.interfaces.builder.IBuilderSet"
path_expression="string:builders"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:defaultView
for="lp.buildmaster.interfaces.builder.IBuilderSet"
name="+index"/>
@@ -795,7 +795,7 @@
<browser:url
for="lp.soyuz.interfaces.packageset.IPackagesetSet"
path_expression="string:package-sets"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
/>
<browser:navigation
module="lp.soyuz.browser.packageset"
=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml 2010-08-20 13:47:47 +0000
+++ lib/lp/soyuz/configure.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -27,7 +27,7 @@
<class
class="canonical.launchpad.database.BinaryPackagePublishingHistory">
<allow
- interface="canonical.launchpad.interfaces.IArchiveSafePublisher"/>
+ interface="lp.soyuz.interfaces.publishing.IArchiveSafePublisher"/>
<require
permission="launchpad.View"
interface="lp.soyuz.interfaces.publishing.IBinaryPackagePublishingHistoryPublic"/>
@@ -36,7 +36,7 @@
interface="lp.soyuz.interfaces.publishing.IPublishingEdit"/>
<require
permission="launchpad.Admin"
- set_schema="canonical.launchpad.interfaces.IBinaryPackagePublishingHistory"/>
+ set_schema="lp.soyuz.interfaces.publishing.IBinaryPackagePublishingHistory"/>
</class>
<!-- BinaryPackageFilePublishing -->
@@ -44,7 +44,7 @@
<class
class="canonical.launchpad.database.BinaryPackageFilePublishing">
<allow
- interface="canonical.launchpad.interfaces.IBinaryPackageFilePublishing"/>
+ interface="lp.soyuz.interfaces.publishing.IBinaryPackageFilePublishing"/>
<!-- XXX cprov 2006-06-14: missing security adapter -->
@@ -113,7 +113,7 @@
<class
class="canonical.launchpad.database.SourcePackagePublishingHistory">
<allow
- interface="canonical.launchpad.interfaces.IArchiveSafePublisher"/>
+ interface="lp.soyuz.interfaces.publishing.IArchiveSafePublisher"/>
<require
permission="launchpad.View"
interface="lp.soyuz.interfaces.publishing.ISourcePackagePublishingHistoryPublic"/>
@@ -122,7 +122,7 @@
interface="lp.soyuz.interfaces.publishing.IPublishingEdit"/>
<require
permission="launchpad.Admin"
- set_schema="canonical.launchpad.interfaces.ISourcePackagePublishingHistory"/>
+ set_schema="lp.soyuz.interfaces.publishing.ISourcePackagePublishingHistory"/>
</class>
<!-- SourcePackageFilePublishing -->
@@ -130,7 +130,7 @@
<class
class="canonical.launchpad.database.SourcePackageFilePublishing">
<allow
- interface="canonical.launchpad.interfaces.ISourcePackageFilePublishing"/>
+ interface="lp.soyuz.interfaces.publishing.ISourcePackageFilePublishing"/>
<!-- XXX cprov 2006-06-14: Missing security adapter. -->
@@ -416,7 +416,7 @@
</class>
<adapter
for="lp.soyuz.interfaces.archive.IArchive"
- provides="canonical.launchpad.interfaces.IPerson"
+ provides="lp.registry.interfaces.person.IPerson"
factory="lp.registry.browser.person.archive_to_person"/>
<adapter
for="lp.soyuz.interfaces.archive.IArchive"
@@ -638,9 +638,9 @@
<allow
interface="lp.soyuz.interfaces.distroarchseries.IDistroArchSeries"/>
<allow
- interface="canonical.launchpad.interfaces.IHasBuildRecords"/>
+ interface="lp.soyuz.interfaces.buildrecords.IHasBuildRecords"/>
<allow
- interface="canonical.launchpad.interfaces.ICanPublishPackages"/>
+ interface="lp.soyuz.interfaces.publishing.ICanPublishPackages"/>
<require
permission="launchpad.Admin"
set_schema="lp.soyuz.interfaces.distroarchseries.IDistroArchSeries"/>
=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml 2010-09-23 05:00:58 +0000
+++ lib/lp/translations/browser/configure.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -9,11 +9,11 @@
xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc";
i18n_domain="launchpad">
<browser:url
- for="canonical.launchpad.interfaces.IRosettaApplication"
+ for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
path_expression="string:translations"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:defaultView
- for="canonical.launchpad.interfaces.IRosettaApplication"
+ for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
name="+index"
layer="lp.translations.publisher.TranslationsLayer"/>
<browser:navigation
@@ -21,7 +21,7 @@
classes="
RosettaApplicationNavigation"/>
<browser:pages
- for="canonical.launchpad.interfaces.IRosettaApplication"
+ for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
facet="translations"
permission="zope.Public"
class="lp.translations.browser.translations.RosettaApplicationView"
@@ -40,7 +40,7 @@
template="../templates/rosetta-portlet-groups.pt"/>
</browser:pages>
<browser:page
- for="canonical.launchpad.interfaces.IRosettaApplication"
+ for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
facet="translations"
permission="zope.Public"
class="lp.translations.browser.translations.TranslatableProductsView"
@@ -142,7 +142,7 @@
<browser:url
for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueue"
path_expression="string:+imports"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
<browser:defaultView
for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueue"
name="+index"
@@ -302,7 +302,7 @@
classes="
LanguageSetNavigation"/>
<browser:defaultView
- for="canonical.launchpad.interfaces.ILanguage"
+ for="lp.services.worlddata.interfaces.language.ILanguage"
name="+index"
layer="lp.translations.publisher.TranslationsLayer"/>
<browser:menus
@@ -311,26 +311,26 @@
LanguageSetContextMenu
LanguageNavigationMenu"/>
<browser:url
- for="canonical.launchpad.interfaces.ILanguage"
+ for="lp.services.worlddata.interfaces.language.ILanguage"
path_expression="code"
- parent_utility="canonical.launchpad.interfaces.ILanguageSet"
+ parent_utility="lp.services.worlddata.interfaces.language.ILanguageSet"
rootsite="translations"/>
<browser:page
- for="canonical.launchpad.interfaces.ILanguage"
+ for="lp.services.worlddata.interfaces.language.ILanguage"
class="lp.translations.browser.language.LanguageView"
permission="zope.Public"
template="../templates/language-index.pt"
name="+index"
layer="lp.translations.publisher.TranslationsLayer"/>
<browser:page
- for="canonical.launchpad.interfaces.ILanguage"
+ for="lp.services.worlddata.interfaces.language.ILanguage"
class="lp.translations.browser.language.LanguageAdminView"
permission="launchpad.Admin"
template="../../app/templates/generic-edit.pt"
name="+admin"
layer="lp.translations.publisher.TranslationsLayer"/>
<browser:pages
- for="canonical.launchpad.interfaces.ILanguage"
+ for="lp.services.worlddata.interfaces.language.ILanguage"
class="lp.translations.browser.language.LanguageView"
permission="zope.Public"
layer="lp.translations.publisher.TranslationsLayer">
@@ -342,23 +342,23 @@
template="../templates/language-portlet-top-contributors.pt"/>
</browser:pages>
<browser:defaultView
- for="canonical.launchpad.interfaces.ILanguageSet"
+ for="lp.services.worlddata.interfaces.language.ILanguageSet"
name="+index"
layer="lp.translations.publisher.TranslationsLayer"/>
<browser:url
- for="canonical.launchpad.interfaces.ILanguageSet"
+ for="lp.services.worlddata.interfaces.language.ILanguageSet"
path_expression="string:+languages"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
rootsite="translations"/>
<browser:page
- for="canonical.launchpad.interfaces.ILanguageSet"
+ for="lp.services.worlddata.interfaces.language.ILanguageSet"
class="lp.translations.browser.language.LanguageSetView"
permission="zope.Public"
template="../templates/languageset-index.pt"
name="+index"
layer="lp.translations.publisher.TranslationsLayer"/>
<browser:page
- for="canonical.launchpad.interfaces.ILanguageSet"
+ for="lp.services.worlddata.interfaces.language.ILanguageSet"
class="lp.translations.browser.language.LanguageAddView"
permission="launchpad.Admin"
template="../../app/templates/generic-edit.pt"
@@ -511,7 +511,7 @@
<browser:url
for="lp.translations.interfaces.translationgroup.ITranslationGroupSet"
path_expression="string:+groups"
- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
rootsite="translations" />
<browser:defaultView
for="lp.translations.interfaces.translationgroup.ITranslationGroupSet"
=== modified file 'lib/lp/translations/configure.zcml'
--- lib/lp/translations/configure.zcml 2010-09-20 18:42:38 +0000
+++ lib/lp/translations/configure.zcml 2010-09-29 17:51:04 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
GNU Affero General Public License version 3 (see the file LICENSE).
-->
@@ -52,9 +52,9 @@
</class>
<securedutility
class="canonical.launchpad.systemhomes.RosettaApplication"
- provides="canonical.launchpad.interfaces.IRosettaApplication">
+ provides="canonical.launchpad.interfaces.launchpad.IRosettaApplication">
<allow
- interface="canonical.launchpad.interfaces.IRosettaApplication"/>
+ interface="canonical.launchpad.interfaces.launchpad.IRosettaApplication"/>
</securedutility>
<!-- TranslationsOverview -->
@@ -258,7 +258,7 @@
<!-- Subscribers to registry objects -->
<subscriber
- for="canonical.launchpad.interfaces.IProduct zope.lifecycleevent.interfaces.IObjectModifiedEvent"
+ for="lp.registry.interfaces.product.IProduct zope.lifecycleevent.interfaces.IObjectModifiedEvent"
handler="lp.translations.subscribers.product_modified"/>
<!-- DistroSeriesLanguage and Dummy -->
