Launchpad itself

Merge lp:~sinzui/launchpad/apocalypse-interface-imports-3 into lp:launchpad

  1. apocalypse-interface-imports-3
  2. Merge into devel
Proposed by Curtis Hovey
Status: Merged
Merged at revision: 11659
Proposed branch: lp:~sinzui/launchpad/apocalypse-interface-imports-3
Merge into: lp:launchpad
Diff against target: 1803 lines (+242/-324)
35 files modified
lib/canonical/configure.zcml (+10/-10)
lib/canonical/launchpad/configure.zcml (+14/-14)
lib/canonical/launchpad/xmlrpc/configure.zcml (+11/-11)
lib/canonical/launchpad/zcml/account.zcml (+7/-7)
lib/canonical/launchpad/zcml/batchnavigator.zcml (+2/-2)
lib/canonical/launchpad/zcml/binaryandsourcepackagename.zcml (+2/-2)
lib/canonical/launchpad/zcml/datetime.zcml (+3/-3)
lib/canonical/launchpad/zcml/distributionrole.zcml (+0/-17)
lib/canonical/launchpad/zcml/emailaddress.zcml (+5/-5)
lib/canonical/launchpad/zcml/example.zcml (+0/-47)
lib/canonical/launchpad/zcml/feeds.zcml (+5/-5)
lib/canonical/launchpad/zcml/gpghandler.zcml (+7/-7)
lib/canonical/launchpad/zcml/launchpad.zcml (+10/-10)
lib/canonical/launchpad/zcml/launchpadstatistic.zcml (+7/-7)
lib/canonical/launchpad/zcml/librarian.zcml (+9/-9)
lib/canonical/launchpad/zcml/logintoken.zcml (+16/-16)
lib/canonical/launchpad/zcml/message.zcml (+13/-13)
lib/canonical/launchpad/zcml/oauth.zcml (+12/-12)
lib/canonical/launchpad/zcml/packagerelationship.zcml (+4/-4)
lib/canonical/launchpad/zcml/searchservice.zcml (+5/-5)
lib/canonical/launchpad/zcml/sourcepackageutility.zcml (+0/-18)
lib/canonical/launchpad/zcml/temporaryblobstorage.zcml (+8/-8)
lib/canonical/launchpad/zcml/webservice.zcml (+5/-5)
lib/lp/bugs/browser/configure.zcml (+1/-1)
lib/lp/code/browser/configure.zcml (+5/-5)
lib/lp/code/configure.zcml (+6/-6)
lib/lp/coop/answersbugs/configure.zcml (+2/-2)
lib/lp/hardwaredb/browser/configure.zcml (+2/-2)
lib/lp/registry/browser/configure.zcml (+15/-15)
lib/lp/registry/configure.zcml (+19/-19)
lib/lp/services/worlddata/browser/configure.zcml (+2/-2)
lib/lp/soyuz/browser/configure.zcml (+2/-2)
lib/lp/soyuz/configure.zcml (+10/-10)
lib/lp/translations/browser/configure.zcml (+19/-19)
lib/lp/translations/configure.zcml (+4/-4)
To merge this branch: bzr merge lp:~sinzui/launchpad/apocalypse-interface-imports-3
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+37032@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) wrote :

Hi Curtis,

Thanks for this next step toward unraveling the mess.

My only question is if example.zcml retains any usefulness. If the updates to it are trivial it might be worth keeping to provide an understandable example. If you don't think it is worthwhile then feel free to delete it.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/configure.zcml'
2--- lib/canonical/configure.zcml 2010-09-03 15:02:39 +0000
3+++ lib/canonical/configure.zcml 2010-09-29 17:51:04 +0000
4@@ -64,13 +64,13 @@
5 -->
6 <!-- virtual host: blueprints -->
7 <browser:defaultView
8- for="canonical.launchpad.interfaces.ILaunchpadRoot"
9+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
10 name="specs"
11 layer="lp.blueprints.publisher.BlueprintsLayer"
12 />
13 <browser:page
14 name=""
15- for="canonical.launchpad.interfaces.ILaunchpadRoot"
16+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
17 class="canonical.launchpad.browser.launchpad.LaunchpadImageFolder"
18 permission="zope.Public"
19 layer="lp.blueprints.publisher.BlueprintsLayer"
20@@ -78,13 +78,13 @@
21
22 <!-- virtual host: code -->
23 <browser:defaultView
24- for="canonical.launchpad.interfaces.ILaunchpadRoot"
25+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
26 name="+code"
27 layer="lp.code.publisher.CodeLayer"
28 />
29 <browser:page
30 name=""
31- for="canonical.launchpad.interfaces.ILaunchpadRoot"
32+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
33 class="canonical.launchpad.browser.launchpad.LaunchpadImageFolder"
34 permission="zope.Public"
35 layer="lp.code.publisher.CodeLayer"
36@@ -92,13 +92,13 @@
37
38 <!-- virtual host: translations -->
39 <browser:defaultView
40- for="canonical.launchpad.interfaces.ILaunchpadRoot"
41+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
42 name="translations"
43 layer="lp.translations.publisher.TranslationsLayer"
44 />
45 <browser:page
46 name=""
47- for="canonical.launchpad.interfaces.ILaunchpadRoot"
48+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
49 class="canonical.launchpad.browser.launchpad.LaunchpadImageFolder"
50 permission="zope.Public"
51 layer="lp.translations.publisher.TranslationsLayer"
52@@ -106,13 +106,13 @@
53
54 <!-- virtual host: bugs -->
55 <browser:defaultView
56- for="canonical.launchpad.interfaces.ILaunchpadRoot"
57+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
58 name="bugs"
59 layer="lp.bugs.publisher.BugsLayer"
60 />
61 <browser:page
62 name=""
63- for="canonical.launchpad.interfaces.ILaunchpadRoot"
64+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
65 class="canonical.launchpad.browser.launchpad.LaunchpadImageFolder"
66 permission="zope.Public"
67 layer="lp.bugs.publisher.BugsLayer"
68@@ -120,13 +120,13 @@
69
70 <!-- virtual host: answers -->
71 <browser:defaultView
72- for="canonical.launchpad.interfaces.ILaunchpadRoot"
73+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
74 name="questions"
75 layer="lp.answers.publisher.AnswersLayer"
76 />
77 <browser:page
78 name=""
79- for="canonical.launchpad.interfaces.ILaunchpadRoot"
80+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
81 class="canonical.launchpad.browser.launchpad.LaunchpadImageFolder"
82 permission="zope.Public"
83 layer="lp.answers.publisher.AnswersLayer"
84
85=== modified file 'lib/canonical/launchpad/configure.zcml'
86--- lib/canonical/launchpad/configure.zcml 2010-09-28 05:20:22 +0000
87+++ lib/canonical/launchpad/configure.zcml 2010-09-29 17:51:04 +0000
88@@ -1,4 +1,4 @@
89-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
90+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
91 GNU Affero General Public License version 3 (see the file LICENSE).
92 -->
93
94@@ -34,45 +34,45 @@
95 <include package="lp.vostok" />
96
97 <browser:url
98- for="canonical.launchpad.interfaces.IPersonSet"
99+ for="lp.registry.interfaces.person.IPersonSet"
100 path_expression="string:people"
101- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
102+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
103 />
104
105 <browser:url
106 for="lp.code.interfaces.branch.IBranchSet"
107 path_expression="string:branches"
108- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
109+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
110 />
111
112 <browser:url
113- for="canonical.launchpad.interfaces.IDistributionSet"
114+ for="lp.registry.interfaces.distribution.IDistributionSet"
115 path_expression="string:distros"
116- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
117+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
118 />
119
120 <browser:url
121- for="canonical.launchpad.interfaces.ISourcePackageNameSet"
122+ for="lp.registry.interfaces.sourcepackagename.ISourcePackageNameSet"
123 path_expression="string:sourcepackagenames"
124- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
125+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
126 />
127
128 <browser:url
129- for="canonical.launchpad.interfaces.IBinaryPackageNameSet"
130+ for="lp.soyuz.interfaces.binarypackagename.IBinaryPackageNameSet"
131 path_expression="string:binarypackagenames"
132- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
133+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
134 />
135
136 <browser:url
137- for="canonical.launchpad.interfaces.IProjectGroupSet"
138+ for="lp.registry.interfaces.projectgroup.IProjectGroupSet"
139 path_expression="string:projectgroups"
140- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
141+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
142 />
143
144 <browser:url
145- for="canonical.launchpad.interfaces.ILoginTokenSet"
146+ for="canonical.launchpad.interfaces.logintoken.ILoginTokenSet"
147 path_expression="string:token"
148- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
149+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
150 />
151
152 <i18n:registerTranslations directory="locales" />
153
154=== modified file 'lib/canonical/launchpad/xmlrpc/configure.zcml'
155--- lib/canonical/launchpad/xmlrpc/configure.zcml 2010-07-01 19:39:54 +0000
156+++ lib/canonical/launchpad/xmlrpc/configure.zcml 2010-09-29 17:51:04 +0000
157@@ -1,4 +1,4 @@
158-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
159+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
160 GNU Affero General Public License version 3 (see the file LICENSE).
161 -->
162
163@@ -10,19 +10,19 @@
164
165 <securedutility
166 class="canonical.launchpad.xmlrpc.PrivateApplication"
167- provides="canonical.launchpad.interfaces.IPrivateApplication">
168- <allow interface="canonical.launchpad.interfaces.IPrivateApplication"/>
169+ provides="canonical.launchpad.interfaces.launchpad.IPrivateApplication">
170+ <allow interface="canonical.launchpad.interfaces.launchpad.IPrivateApplication"/>
171 </securedutility>
172
173 <securedutility
174 class="canonical.launchpad.systemhomes.AuthServerApplication"
175- provides="canonical.launchpad.interfaces.IAuthServerApplication">
176- <allow interface="canonical.launchpad.interfaces.IAuthServerApplication"/>
177+ provides="canonical.launchpad.interfaces.launchpad.IAuthServerApplication">
178+ <allow interface="canonical.launchpad.interfaces.launchpad.IAuthServerApplication"/>
179 </securedutility>
180
181 <xmlrpc:view
182- for="canonical.launchpad.interfaces.IAuthServerApplication"
183- interface="canonical.launchpad.interfaces.IAuthServer"
184+ for="canonical.launchpad.interfaces.launchpad.IAuthServerApplication"
185+ interface="canonical.launchpad.interfaces.authserver.IAuthServer"
186 class="canonical.launchpad.xmlrpc.AuthServerAPIView"
187 permission="zope.Public"
188 />
189@@ -55,13 +55,13 @@
190
191 <securedutility
192 class="canonical.launchpad.systemhomes.PrivateMaloneApplication"
193- provides="canonical.launchpad.interfaces.IPrivateMaloneApplication">
194- <allow interface="canonical.launchpad.interfaces.IPrivateMaloneApplication"/>
195+ provides="canonical.launchpad.interfaces.launchpad.IPrivateMaloneApplication">
196+ <allow interface="canonical.launchpad.interfaces.launchpad.IPrivateMaloneApplication"/>
197 </securedutility>
198
199 <xmlrpc:view
200- for="canonical.launchpad.interfaces.IPrivateMaloneApplication"
201- interface="canonical.launchpad.interfaces.IExternalBugTrackerTokenAPI"
202+ for="canonical.launchpad.interfaces.launchpad.IPrivateMaloneApplication"
203+ interface="lp.bugs.interfaces.externalbugtracker.IExternalBugTrackerTokenAPI"
204 class="canonical.launchpad.xmlrpc.ExternalBugTrackerTokenAPI"
205 permission="zope.Public"
206 />
207
208=== modified file 'lib/canonical/launchpad/zcml/account.zcml'
209--- lib/canonical/launchpad/zcml/account.zcml 2009-12-24 09:58:19 +0000
210+++ lib/canonical/launchpad/zcml/account.zcml 2010-09-29 17:51:04 +0000
211@@ -1,4 +1,4 @@
212-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
213+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
214 GNU Affero General Public License version 3 (see the file LICENSE).
215 -->
216
217@@ -7,13 +7,13 @@
218 <class class="canonical.launchpad.database.Account">
219 <require
220 permission="zope.Public"
221- interface="canonical.launchpad.interfaces.IAccountPublic" />
222+ interface="canonical.launchpad.interfaces.account.IAccountPublic" />
223 <require
224 permission="launchpad.View"
225- interface="canonical.launchpad.interfaces.IAccountPrivate" />
226+ interface="canonical.launchpad.interfaces.account.IAccountPrivate" />
227 <require
228 permission="launchpad.Special"
229- interface="canonical.launchpad.interfaces.IAccountSpecialRestricted" />
230+ interface="canonical.launchpad.interfaces.account.IAccountSpecialRestricted" />
231 <require
232 permission="launchpad.Moderate"
233 set_attributes="status date_status_set status_comment" />
234@@ -24,13 +24,13 @@
235
236 <securedutility
237 class="canonical.launchpad.database.AccountSet"
238- provides="canonical.launchpad.interfaces.IAccountSet">
239- <allow interface="canonical.launchpad.interfaces.IAccountSet" />
240+ provides="canonical.launchpad.interfaces.account.IAccountSet">
241+ <allow interface="canonical.launchpad.interfaces.account.IAccountSet" />
242 </securedutility>
243
244 <adapter
245 for="canonical.launchpad.webapp.interfaces.ILaunchpadPrincipal"
246- provides="canonical.launchpad.interfaces.IAccount"
247+ provides="canonical.launchpad.interfaces.account.IAccount"
248 factory="canonical.launchpad.components.account.accountFromPrincipal"
249 />
250
251
252=== modified file 'lib/canonical/launchpad/zcml/batchnavigator.zcml'
253--- lib/canonical/launchpad/zcml/batchnavigator.zcml 2009-07-13 18:15:02 +0000
254+++ lib/canonical/launchpad/zcml/batchnavigator.zcml 2010-09-29 17:51:04 +0000
255@@ -1,4 +1,4 @@
256-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
257+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
258 GNU Affero General Public License version 3 (see the file LICENSE).
259 -->
260
261@@ -33,7 +33,7 @@
262 permission="zope.Public" />
263
264 <browser:page
265- for="canonical.launchpad.interfaces.INominationsReviewTableBatchNavigator"
266+ for="lp.bugs.interfaces.bugtask.INominationsReviewTableBatchNavigator"
267 class="lp.bugs.browser.bugtask.NominationsReviewTableBatchNavigatorView"
268 name="+table-view-without-navlinks"
269 template="../templates/bugs-listing-nominations-table-without-navlinks.pt"
270
271=== modified file 'lib/canonical/launchpad/zcml/binaryandsourcepackagename.zcml'
272--- lib/canonical/launchpad/zcml/binaryandsourcepackagename.zcml 2010-01-12 19:02:09 +0000
273+++ lib/canonical/launchpad/zcml/binaryandsourcepackagename.zcml 2010-09-29 17:51:04 +0000
274@@ -1,4 +1,4 @@
275-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
276+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
277 GNU Affero General Public License version 3 (see the file LICENSE).
278 -->
279
280@@ -12,7 +12,7 @@
281
282 <!-- BinaryAndSourcePackagename -->
283 <class class="canonical.launchpad.database.BinaryAndSourcePackageName">
284- <allow interface="canonical.launchpad.interfaces.IBinaryAndSourcePackageName" />
285+ <allow interface="lp.soyuz.interfaces.binarypackagename.IBinaryAndSourcePackageName" />
286 </class>
287
288 <class class="canonical.launchpad.database.binaryandsourcepackagename.BinaryAndSourcePackageNameIterator">
289
290=== modified file 'lib/canonical/launchpad/zcml/datetime.zcml'
291--- lib/canonical/launchpad/zcml/datetime.zcml 2009-07-13 18:15:02 +0000
292+++ lib/canonical/launchpad/zcml/datetime.zcml 2010-09-29 17:51:04 +0000
293@@ -1,4 +1,4 @@
294-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
295+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
296 GNU Affero General Public License version 3 (see the file LICENSE).
297 -->
298
299@@ -7,8 +7,8 @@
300
301 <!-- Configuration related to datetime classes in Launchpad. -->
302 <adapter
303- for="canonical.launchpad.interfaces.IHasDateCreated"
304- provides="canonical.launchpad.interfaces.IAging"
305+ for="canonical.launchpad.interfaces.launchpad.IHasDateCreated"
306+ provides="canonical.launchpad.interfaces.launchpad.IAging"
307 factory="canonical.launchpad.components.cdatetime.AgingAdapter" />
308
309 </configure>
310
311=== removed file 'lib/canonical/launchpad/zcml/distributionrole.zcml'
312--- lib/canonical/launchpad/zcml/distributionrole.zcml 2009-07-13 18:15:02 +0000
313+++ lib/canonical/launchpad/zcml/distributionrole.zcml 1970-01-01 00:00:00 +0000
314@@ -1,17 +0,0 @@
315-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
316- GNU Affero General Public License version 3 (see the file LICENSE).
317--->
318-
319-<configure
320- xmlns="http://namespaces.zope.org/zope"
321- xmlns:browser="http://namespaces.zope.org/browser"
322- xmlns:i18n="http://namespaces.zope.org/i18n"
323- i18n_domain="launchpad">
324-
325- <!-- DistributionRole-->
326- <class class="canonical.launchpad.database.DistributionRole">
327- <allow interface="canonical.launchpad.interfaces.IDistributionRole"/>
328- <implements interface="zope.app.container.interfaces.IItemContainer"/>
329- </class>
330-
331-</configure>
332
333=== modified file 'lib/canonical/launchpad/zcml/emailaddress.zcml'
334--- lib/canonical/launchpad/zcml/emailaddress.zcml 2009-07-17 00:26:05 +0000
335+++ lib/canonical/launchpad/zcml/emailaddress.zcml 2010-09-29 17:51:04 +0000
336@@ -1,4 +1,4 @@
337-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
338+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
339 GNU Affero General Public License version 3 (see the file LICENSE).
340 -->
341
342@@ -17,18 +17,18 @@
343 attributes="email" />
344 <require
345 permission="launchpad.Edit"
346- set_schema="canonical.launchpad.interfaces.IEmailAddress"
347+ set_schema="canonical.launchpad.interfaces.emailaddress.IEmailAddress"
348 attributes="destroySelf syncUpdate" />
349 </class>
350
351 <securedutility
352 class="canonical.launchpad.database.EmailAddressSet"
353- provides="canonical.launchpad.interfaces.IEmailAddressSet">
354- <allow interface="canonical.launchpad.interfaces.IEmailAddressSet" />
355+ provides="canonical.launchpad.interfaces.emailaddress.IEmailAddressSet">
356+ <allow interface="canonical.launchpad.interfaces.emailaddress.IEmailAddressSet" />
357 </securedutility>
358
359 <browser:url
360- for="canonical.launchpad.interfaces.IEmailAddress"
361+ for="canonical.launchpad.interfaces.emailaddress.IEmailAddress"
362 path_expression="string:+email/${email}"
363 rootsite="api"
364 attribute_to_parent="person" />
365
366=== removed file 'lib/canonical/launchpad/zcml/example.zcml'
367--- lib/canonical/launchpad/zcml/example.zcml 2009-07-13 18:15:02 +0000
368+++ lib/canonical/launchpad/zcml/example.zcml 1970-01-01 00:00:00 +0000
369@@ -1,47 +0,0 @@
370-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
371- GNU Affero General Public License version 3 (see the file LICENSE).
372--->
373-
374-<!-- THIS IS AN EXAMPLE ONLY -->
375-<!-- XXX Steve Alexander 2004-10-08: Please update for RosettaSkins! -->
376-
377-<configure
378- xmlns="http://namespaces.zope.org/zope"
379- xmlns:browser="http://namespaces.zope.org/browser"
380- xmlns:i18n="http://namespaces.zope.org/i18n"
381- i18n_domain="launchpad">
382-
383- <!-- This is class Example -->
384- <!-- CONTENT CLASSES -->
385- <class class="canonical.launchpad.database.Example">
386- <allow interface="canonical.launchpad.interfaces.IExample" />
387- </class>
388-
389- <!-- UTILITY DECLARATION-->
390- <securedutility
391- class="canonical.launchpad.database.Example"
392- provides="canonical.launchpad.interfaces.IExample">
393- <allow interface="canonical.launchpad.interfaces.IExample" />
394- </securedutility>
395-
396- <!-- VOCABULARIES -->
397-
398- <!--TRAVERSALS-->
399-
400- <!--BROWSER DEFAULTVIEWS-->
401- <browser:defaultView
402- for="canonical.launchpad.interfaces.IExample"
403- name="+index" />
404-
405- <!--PAGE DECLARATIONS-->
406- <browser:defaultView
407- for="canonical.launchpad.interfaces.IExample"
408- name="+index" />
409-
410- <!--FORMS-->
411-
412- <!-- This is class Example2-->
413- <!-- ... -->
414-
415-
416-</configure>
417
418=== modified file 'lib/canonical/launchpad/zcml/feeds.zcml'
419--- lib/canonical/launchpad/zcml/feeds.zcml 2009-07-13 18:15:02 +0000
420+++ lib/canonical/launchpad/zcml/feeds.zcml 2010-09-29 17:51:04 +0000
421@@ -1,4 +1,4 @@
422-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
423+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
424 GNU Affero General Public License version 3 (see the file LICENSE).
425 -->
426
427@@ -10,19 +10,19 @@
428
429 <securedutility
430 class="canonical.launchpad.systemhomes.FeedsApplication"
431- provides="canonical.launchpad.interfaces.IFeedsApplication">
432+ provides="canonical.launchpad.interfaces.launchpad.IFeedsApplication">
433 <allow
434- interface="canonical.launchpad.interfaces.IFeedsApplication" />
435+ interface="canonical.launchpad.interfaces.launchpad.IFeedsApplication" />
436 </securedutility>
437
438 <adapter
439 provides="canonical.launchpad.webapp.interfaces.ICanonicalUrlData"
440- for="canonical.launchpad.interfaces.IFeedsApplication"
441+ for="canonical.launchpad.interfaces.launchpad.IFeedsApplication"
442 factory="canonical.launchpad.browser.feeds.FeedsRootUrlData"
443 />
444
445 <browser:defaultView
446- for="canonical.launchpad.interfaces.IFeedsApplication"
447+ for="canonical.launchpad.interfaces.launchpad.IFeedsApplication"
448 name="+index"
449 />
450
451
452=== modified file 'lib/canonical/launchpad/zcml/gpghandler.zcml'
453--- lib/canonical/launchpad/zcml/gpghandler.zcml 2009-07-13 18:15:02 +0000
454+++ lib/canonical/launchpad/zcml/gpghandler.zcml 2010-09-29 17:51:04 +0000
455@@ -1,4 +1,4 @@
456-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
457+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
458 GNU Affero General Public License version 3 (see the file LICENSE).
459 -->
460
461@@ -10,25 +10,25 @@
462 i18n_domain="launchpad">
463
464 <class class="canonical.launchpad.utilities.GPGHandler">
465- <allow interface="canonical.launchpad.interfaces.IGPGHandler" />
466+ <allow interface="canonical.launchpad.interfaces.gpghandler.IGPGHandler" />
467 </class>
468
469 <securedutility
470 class="canonical.launchpad.utilities.GPGHandler"
471- provides="canonical.launchpad.interfaces.IGPGHandler">
472- <allow interface="canonical.launchpad.interfaces.IGPGHandler" />
473+ provides="canonical.launchpad.interfaces.gpghandler.IGPGHandler">
474+ <allow interface="canonical.launchpad.interfaces.gpghandler.IGPGHandler" />
475 </securedutility>
476
477 <class class="canonical.launchpad.utilities.PymeSignature">
478- <allow interface="canonical.launchpad.interfaces.IPymeSignature" />
479+ <allow interface="canonical.launchpad.interfaces.gpghandler.IPymeSignature" />
480 </class>
481
482 <class class="canonical.launchpad.utilities.PymeKey">
483- <allow interface="canonical.launchpad.interfaces.IPymeKey" />
484+ <allow interface="canonical.launchpad.interfaces.gpghandler.IPymeKey" />
485 </class>
486
487 <class class="canonical.launchpad.utilities.PymeUserId">
488- <allow interface="canonical.launchpad.interfaces.IPymeUserId" />
489+ <allow interface="canonical.launchpad.interfaces.gpghandler.IPymeUserId" />
490 </class>
491
492 </configure>
493
494=== modified file 'lib/canonical/launchpad/zcml/launchpad.zcml'
495--- lib/canonical/launchpad/zcml/launchpad.zcml 2010-09-23 10:12:21 +0000
496+++ lib/canonical/launchpad/zcml/launchpad.zcml 2010-09-29 17:51:04 +0000
497@@ -1,4 +1,4 @@
498-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
499+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
500 GNU Affero General Public License version 3 (see the file LICENSE).
501 -->
502
503@@ -155,7 +155,7 @@
504
505 <utility
506 factory="canonical.launchpad.utilities.LaunchpadCelebrities"
507- provides="canonical.launchpad.interfaces.ILaunchpadCelebrities">
508+ provides="canonical.launchpad.interfaces.launchpad.ILaunchpadCelebrities">
509 </utility>
510
511 <browser:page
512@@ -311,7 +311,7 @@
513 the view class, only Launchpad developers have access to the
514 page -->
515 <browser:page
516- for="canonical.launchpad.interfaces.ILaunchpadRoot"
517+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
518 name="+soft-timeout"
519 class="canonical.launchpad.browser.launchpad.SoftTimeoutView"
520 attribute="__call__"
521@@ -323,11 +323,11 @@
522 <class
523 class="canonical.launchpad.utilities.personroles.PersonRoles">
524 <allow
525- interface="canonical.launchpad.interfaces.IPersonRoles"/>
526+ interface="canonical.launchpad.interfaces.launchpad.IPersonRoles"/>
527 </class>
528 <adapter
529 for="lp.registry.interfaces.person.IPerson"
530- provides="canonical.launchpad.interfaces.IPersonRoles"
531+ provides="canonical.launchpad.interfaces.launchpad.IPersonRoles"
532 factory="canonical.launchpad.utilities.personroles.PersonRoles" />
533
534
535@@ -351,13 +351,13 @@
536 these URLs in Apache.
537 -->
538 <browser:page
539- for="canonical.launchpad.interfaces.ILaunchpadRoot"
540+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
541 name="+opstats"
542 permission="zope.Public"
543 class="canonical.launchpad.webapp.opstats.OpStats"
544 />
545 <xmlrpc:view
546- for="canonical.launchpad.interfaces.ILaunchpadRoot"
547+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
548 class="canonical.launchpad.webapp.opstats.OpStats"
549 methods="opstats"
550 permission="zope.Public"
551@@ -366,13 +366,13 @@
552
553 <!-- self-test xmlrpc api -->
554 <xmlrpc:view
555- for="canonical.launchpad.interfaces.ILaunchpadRoot"
556+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
557 interface="canonical.launchpad.xmlrpc.ISelfTest"
558 class="canonical.launchpad.xmlrpc.SelfTest"
559 permission="zope.Public"
560 />
561 <xmlrpc:view
562- for="canonical.launchpad.interfaces.IRosettaApplication"
563+ for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
564 interface="canonical.launchpad.xmlrpc.IRosettaSelfTest"
565 class="canonical.launchpad.xmlrpc.RosettaSelfTest"
566 permission="zope.Public"
567@@ -401,7 +401,7 @@
568 </class>
569
570 <class class="canonical.launchpad.mailnotification.NotificationRecipientSet">
571- <allow interface="canonical.launchpad.interfaces.INotificationRecipientSet" />
572+ <allow interface="canonical.launchpad.interfaces.launchpad.INotificationRecipientSet" />
573 </class>
574
575 </configure>
576
577=== modified file 'lib/canonical/launchpad/zcml/launchpadstatistic.zcml'
578--- lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2009-09-29 00:29:12 +0000
579+++ lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2010-09-29 17:51:04 +0000
580@@ -1,4 +1,4 @@
581-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
582+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
583 GNU Affero General Public License version 3 (see the file LICENSE).
584 -->
585
586@@ -17,23 +17,23 @@
587 <!-- LaunchpadStatisticSet -->
588 <securedutility
589 class="canonical.launchpad.database.launchpadstatistic.LaunchpadStatisticSet"
590- provides="canonical.launchpad.interfaces.ILaunchpadStatisticSet">
591- <allow interface="canonical.launchpad.interfaces.ILaunchpadStatisticSet" />
592+ provides="canonical.launchpad.interfaces.launchpadstatistic.ILaunchpadStatisticSet">
593+ <allow interface="canonical.launchpad.interfaces.launchpadstatistic.ILaunchpadStatisticSet" />
594 </securedutility>
595
596 <browser:url
597- for="canonical.launchpad.interfaces.ILaunchpadStatisticSet"
598+ for="canonical.launchpad.interfaces.launchpadstatistic.ILaunchpadStatisticSet"
599 path_expression="string:+statistics"
600- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
601+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
602 />
603
604 <browser:defaultView
605- for="canonical.launchpad.interfaces.ILaunchpadStatisticSet"
606+ for="canonical.launchpad.interfaces.launchpadstatistic.ILaunchpadStatisticSet"
607 name="+index"
608 />
609
610 <browser:pages
611- for="canonical.launchpad.interfaces.ILaunchpadStatisticSet"
612+ for="canonical.launchpad.interfaces.launchpadstatistic.ILaunchpadStatisticSet"
613 facet="overview"
614 class="canonical.launchpad.browser.launchpadstatistic.LaunchpadStatisticSet"
615 permission="launchpad.Admin">
616
617=== modified file 'lib/canonical/launchpad/zcml/librarian.zcml'
618--- lib/canonical/launchpad/zcml/librarian.zcml 2010-09-06 15:14:17 +0000
619+++ lib/canonical/launchpad/zcml/librarian.zcml 2010-09-29 17:51:04 +0000
620@@ -1,4 +1,4 @@
621-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
622+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
623 GNU Affero General Public License version 3 (see the file LICENSE).
624 -->
625
626@@ -9,28 +9,28 @@
627 i18n_domain="launchpad">
628
629 <class class="canonical.launchpad.database.LibraryFileAlias">
630- <allow interface="canonical.launchpad.interfaces.ILibraryFileAlias" />
631+ <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileAlias" />
632 </class>
633
634 <class class="canonical.launchpad.database.LibraryFileAliasWithParent">
635- <allow interface="canonical.launchpad.interfaces.ILibraryFileAliasWithParent" />
636+ <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileAliasWithParent" />
637 <require
638 permission="launchpad.Edit"
639 set_attributes="restricted" />
640 </class>
641
642 <class class="canonical.launchpad.database.LibraryFileContent">
643- <allow interface="canonical.launchpad.interfaces.ILibraryFileContent" />
644+ <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileContent" />
645 </class>
646
647 <securedutility
648 class="canonical.launchpad.database.LibraryFileAliasSet"
649- provides="canonical.launchpad.interfaces.ILibraryFileAliasSet">
650- <allow interface="canonical.launchpad.interfaces.ILibraryFileAliasSet" />
651+ provides="canonical.launchpad.interfaces.librarian.ILibraryFileAliasSet">
652+ <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileAliasSet" />
653 </securedutility>
654
655 <browser:defaultView
656- for="canonical.launchpad.interfaces.ILibraryFileAlias"
657+ for="canonical.launchpad.interfaces.librarian.ILibraryFileAlias"
658 name="+index"
659 />
660
661@@ -38,14 +38,14 @@
662 name="+index"
663 facet="overview"
664 permission="zope.Public"
665- for="canonical.launchpad.interfaces.ILibraryFileAlias"
666+ for="canonical.launchpad.interfaces.librarian.ILibraryFileAlias"
667 class="canonical.launchpad.browser.LibraryFileAliasView"
668 />
669
670 <browser:page
671 name="+md5"
672 permission="zope.Public"
673- for="canonical.launchpad.interfaces.ILibraryFileAlias"
674+ for="canonical.launchpad.interfaces.librarian.ILibraryFileAlias"
675 class="canonical.launchpad.browser.LibraryFileAliasMD5View"
676 />
677
678
679=== modified file 'lib/canonical/launchpad/zcml/logintoken.zcml'
680--- lib/canonical/launchpad/zcml/logintoken.zcml 2010-04-15 22:42:41 +0000
681+++ lib/canonical/launchpad/zcml/logintoken.zcml 2010-09-29 17:51:04 +0000
682@@ -1,4 +1,4 @@
683-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
684+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
685 GNU Affero General Public License version 3 (see the file LICENSE).
686 -->
687
688@@ -14,21 +14,21 @@
689 <class class="canonical.launchpad.database.LoginToken">
690 <require
691 permission="zope.Public"
692- interface="canonical.launchpad.interfaces.ILoginToken" />
693+ interface="canonical.launchpad.interfaces.logintoken.ILoginToken" />
694 </class>
695
696 <browser:defaultView
697- for="canonical.launchpad.interfaces.ILoginToken"
698+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
699 name="+index" />
700
701 <browser:url
702- for="canonical.launchpad.interfaces.ILoginToken"
703+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
704 path_expression="token"
705- parent_utility="canonical.launchpad.interfaces.ILoginTokenSet"
706+ parent_utility="canonical.launchpad.interfaces.logintoken.ILoginTokenSet"
707 />
708
709 <browser:page
710- for="canonical.launchpad.interfaces.ILoginToken"
711+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
712 name="+index"
713 permission="zope.Public"
714 class="canonical.launchpad.browser.LoginTokenView"
715@@ -36,7 +36,7 @@
716 />
717
718 <browser:page
719- for="canonical.launchpad.interfaces.ILoginToken"
720+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
721 name="+validateemail"
722 permission="zope.Public"
723 class="canonical.launchpad.browser.logintoken.ValidateEmailView"
724@@ -44,7 +44,7 @@
725 />
726
727 <browser:page
728- for="canonical.launchpad.interfaces.ILoginToken"
729+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
730 name="+validateteamemail"
731 permission="zope.Public"
732 class="canonical.launchpad.browser.logintoken.ValidateTeamEmailView"
733@@ -52,7 +52,7 @@
734 />
735
736 <browser:page
737- for="canonical.launchpad.interfaces.ILoginToken"
738+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
739 name="+validategpg"
740 permission="zope.Public"
741 class="canonical.launchpad.browser.ValidateGPGKeyView"
742@@ -60,7 +60,7 @@
743 />
744
745 <browser:page
746- for="canonical.launchpad.interfaces.ILoginToken"
747+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
748 name="+validatesignonlygpg"
749 permission="zope.Public"
750 class="canonical.launchpad.browser.ValidateGPGKeyView"
751@@ -68,7 +68,7 @@
752 />
753
754 <browser:page
755- for="canonical.launchpad.interfaces.ILoginToken"
756+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
757 name="+accountmerge"
758 permission="zope.Public"
759 class="canonical.launchpad.browser.MergePeopleView"
760@@ -76,7 +76,7 @@
761 />
762
763 <browser:page
764- for="canonical.launchpad.interfaces.ILoginToken"
765+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
766 name="+claimteam"
767 permission="launchpad.AnyPerson"
768 class="canonical.launchpad.browser.ClaimTeamView"
769@@ -84,20 +84,20 @@
770
771 <browser:page
772 name="+bugtracker-handshake"
773- for="canonical.launchpad.interfaces.ILoginToken"
774+ for="canonical.launchpad.interfaces.logintoken.ILoginToken"
775 class="canonical.launchpad.browser.BugTrackerHandshakeView"
776 permission="zope.Public"
777 />
778
779 <!-- LoginTokenSet -->
780 <class class="canonical.launchpad.database.LoginTokenSet">
781- <allow interface="canonical.launchpad.interfaces.ILoginTokenSet" />
782+ <allow interface="canonical.launchpad.interfaces.logintoken.ILoginTokenSet" />
783 </class>
784
785 <securedutility
786 class="canonical.launchpad.database.LoginTokenSet"
787- provides="canonical.launchpad.interfaces.ILoginTokenSet">
788- <allow interface="canonical.launchpad.interfaces.ILoginTokenSet" />
789+ provides="canonical.launchpad.interfaces.logintoken.ILoginTokenSet">
790+ <allow interface="canonical.launchpad.interfaces.logintoken.ILoginTokenSet" />
791 </securedutility>
792
793 <browser:navigation
794
795=== modified file 'lib/canonical/launchpad/zcml/message.zcml'
796--- lib/canonical/launchpad/zcml/message.zcml 2009-07-13 18:15:02 +0000
797+++ lib/canonical/launchpad/zcml/message.zcml 2010-09-29 17:51:04 +0000
798@@ -1,4 +1,4 @@
799-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
800+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
801 GNU Affero General Public License version 3 (see the file LICENSE).
802 -->
803
804@@ -10,38 +10,38 @@
805
806 <!-- Message -->
807 <class class="canonical.launchpad.database.Message">
808- <allow interface="canonical.launchpad.interfaces.IMessage" />
809+ <allow interface="canonical.launchpad.interfaces.message.IMessage" />
810 <require
811 permission="zope.Public"
812- set_schema="canonical.launchpad.interfaces.IMessage" />
813+ set_schema="canonical.launchpad.interfaces.message.IMessage" />
814 </class>
815
816- <class class="canonical.launchpad.interfaces.IndexedMessage">
817- <allow interface="canonical.launchpad.interfaces.IMessage" />
818- <allow interface="canonical.launchpad.interfaces.IIndexedMessage" />
819+ <class class="canonical.launchpad.interfaces.message.IndexedMessage">
820+ <allow interface="canonical.launchpad.interfaces.message.IMessage" />
821+ <allow interface="canonical.launchpad.interfaces.message.IIndexedMessage" />
822 </class>
823
824 <!-- MessageChunk -->
825 <class class="canonical.launchpad.database.MessageChunk">
826- <allow interface="canonical.launchpad.interfaces.IMessageChunk" />
827+ <allow interface="canonical.launchpad.interfaces.message.IMessageChunk" />
828 </class>
829
830 <!-- MessageSet -->
831 <securedutility
832 class="canonical.launchpad.database.MessageSet"
833- provides="canonical.launchpad.interfaces.IMessageSet">
834- <allow interface="canonical.launchpad.interfaces.IMessageSet" />
835+ provides="canonical.launchpad.interfaces.message.IMessageSet">
836+ <allow interface="canonical.launchpad.interfaces.message.IMessageSet" />
837 </securedutility>
838
839 <!-- Some message have a canonical_url -->
840- <adapter for="canonical.launchpad.interfaces.IMessage"
841+ <adapter for="canonical.launchpad.interfaces.message.IMessage"
842 provides="canonical.launchpad.webapp.interfaces.ICanonicalUrlData"
843 factory="canonical.launchpad.browser.message.message_to_canonical_url_data"
844 />
845
846 <!-- Adapt several related objects to provide unified details -->
847- <adapter for="canonical.launchpad.interfaces.IMessageApproval"
848- provides="canonical.launchpad.interfaces.IHeldMessageDetails"
849+ <adapter for="lp.registry.interfaces.mailinglist.IMessageApproval"
850+ provides="lp.registry.interfaces.mailinglist.IHeldMessageDetails"
851 factory="lp.registry.model.mailinglist.HeldMessageDetails"
852 />
853
854@@ -52,6 +52,6 @@
855 provides="canonical.launchpad.interfaces.message.IDirectEmailAuthorization"
856 factory="canonical.launchpad.database.message.DirectEmailAuthorization"
857 />
858-
859+
860
861 </configure>
862
863=== modified file 'lib/canonical/launchpad/zcml/oauth.zcml'
864--- lib/canonical/launchpad/zcml/oauth.zcml 2009-07-13 18:15:02 +0000
865+++ lib/canonical/launchpad/zcml/oauth.zcml 2010-09-29 17:51:04 +0000
866@@ -1,4 +1,4 @@
867-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
868+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
869 GNU Affero General Public License version 3 (see the file LICENSE).
870 -->
871
872@@ -10,42 +10,42 @@
873 i18n_domain="launchpad">
874
875 <class class="canonical.launchpad.database.OAuthConsumer">
876- <allow interface="canonical.launchpad.interfaces.IOAuthConsumer"/>
877+ <allow interface="canonical.launchpad.interfaces.oauth.IOAuthConsumer"/>
878 </class>
879
880 <class class="canonical.launchpad.database.OAuthConsumerSet">
881- <allow interface="canonical.launchpad.interfaces.IOAuthConsumerSet"/>
882+ <allow interface="canonical.launchpad.interfaces.oauth.IOAuthConsumerSet"/>
883 </class>
884
885 <securedutility
886 class="canonical.launchpad.database.OAuthConsumerSet"
887- provides="canonical.launchpad.interfaces.IOAuthConsumerSet">
888+ provides="canonical.launchpad.interfaces.oauth.IOAuthConsumerSet">
889 <allow
890- interface="canonical.launchpad.interfaces.IOAuthConsumerSet"/>
891+ interface="canonical.launchpad.interfaces.oauth.IOAuthConsumerSet"/>
892 </securedutility>
893
894 <class class="canonical.launchpad.database.OAuthRequestToken">
895- <allow interface="canonical.launchpad.interfaces.IOAuthRequestToken"/>
896+ <allow interface="canonical.launchpad.interfaces.oauth.IOAuthRequestToken"/>
897 <require
898 permission="launchpad.Edit"
899- set_schema="canonical.launchpad.interfaces.IOAuthRequestToken"/>
900+ set_schema="canonical.launchpad.interfaces.oauth.IOAuthRequestToken"/>
901 </class>
902
903 <securedutility
904 class="canonical.launchpad.database.OAuthRequestTokenSet"
905- provides="canonical.launchpad.interfaces.IOAuthRequestTokenSet">
906+ provides="canonical.launchpad.interfaces.oauth.IOAuthRequestTokenSet">
907 <allow
908- interface="canonical.launchpad.interfaces.IOAuthRequestTokenSet"/>
909+ interface="canonical.launchpad.interfaces.oauth.IOAuthRequestTokenSet"/>
910 </securedutility>
911
912 <class class="canonical.launchpad.database.OAuthAccessToken">
913- <allow interface="canonical.launchpad.interfaces.IOAuthAccessToken"/>
914+ <allow interface="canonical.launchpad.interfaces.oauth.IOAuthAccessToken"/>
915 <require
916 permission="launchpad.Edit"
917- set_schema="canonical.launchpad.interfaces.IOAuthAccessToken"/>
918+ set_schema="canonical.launchpad.interfaces.oauth.IOAuthAccessToken"/>
919 </class>
920
921 <class class="canonical.launchpad.database.OAuthNonce">
922- <allow interface="canonical.launchpad.interfaces.IOAuthNonce"/>
923+ <allow interface="canonical.launchpad.interfaces.oauth.IOAuthNonce"/>
924 </class>
925 </configure>
926
927=== modified file 'lib/canonical/launchpad/zcml/packagerelationship.zcml'
928--- lib/canonical/launchpad/zcml/packagerelationship.zcml 2009-07-13 18:15:02 +0000
929+++ lib/canonical/launchpad/zcml/packagerelationship.zcml 2010-09-29 17:51:04 +0000
930@@ -1,4 +1,4 @@
931-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
932+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
933 GNU Affero General Public License version 3 (see the file LICENSE).
934 -->
935
936@@ -10,16 +10,16 @@
937
938 <!-- PackageRelationship -->
939 <class class="canonical.launchpad.browser.PackageRelationship">
940- <allow interface="canonical.launchpad.interfaces.IPackageRelationship"/>
941+ <allow interface="canonical.launchpad.interfaces.packagerelationship.IPackageRelationship"/>
942 </class>
943
944 <!-- PackageRelationshipSet -->
945 <class class="canonical.launchpad.browser.PackageRelationshipSet">
946- <allow interface="canonical.launchpad.interfaces.IPackageRelationshipSet"/>
947+ <allow interface="canonical.launchpad.interfaces.packagerelationship.IPackageRelationshipSet"/>
948 </class>
949
950 <browser:pages
951- for="canonical.launchpad.interfaces.IPackageRelationshipSet"
952+ for="canonical.launchpad.interfaces.packagerelationship.IPackageRelationshipSet"
953 permission="zope.Public">
954 <browser:page
955 name="+render-list"
956
957=== modified file 'lib/canonical/launchpad/zcml/searchservice.zcml'
958--- lib/canonical/launchpad/zcml/searchservice.zcml 2009-07-13 18:15:02 +0000
959+++ lib/canonical/launchpad/zcml/searchservice.zcml 2010-09-29 17:51:04 +0000
960@@ -1,4 +1,4 @@
961-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
962+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
963 GNU Affero General Public License version 3 (see the file LICENSE).
964 -->
965
966@@ -7,17 +7,17 @@
967
968 <class
969 class="canonical.launchpad.utilities.PageMatch">
970- <allow interface="canonical.launchpad.interfaces.ISearchResult" />
971+ <allow interface="canonical.launchpad.interfaces.searchservice.ISearchResult" />
972 </class>
973
974 <class
975 class="canonical.launchpad.utilities.PageMatches">
976- <allow interface="canonical.launchpad.interfaces.ISearchResults" />
977+ <allow interface="canonical.launchpad.interfaces.searchservice.ISearchResults" />
978 </class>
979
980 <securedutility
981 class="canonical.launchpad.utilities.GoogleSearchService"
982- provides="canonical.launchpad.interfaces.ISearchService">
983- <allow interface="canonical.launchpad.interfaces.ISearchService" />
984+ provides="canonical.launchpad.interfaces.searchservice.ISearchService">
985+ <allow interface="canonical.launchpad.interfaces.searchservice.ISearchService" />
986 </securedutility>
987 </configure>
988
989=== removed file 'lib/canonical/launchpad/zcml/sourcepackageutility.zcml'
990--- lib/canonical/launchpad/zcml/sourcepackageutility.zcml 2009-07-13 18:15:02 +0000
991+++ lib/canonical/launchpad/zcml/sourcepackageutility.zcml 1970-01-01 00:00:00 +0000
992@@ -1,18 +0,0 @@
993-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
994- GNU Affero General Public License version 3 (see the file LICENSE).
995--->
996-
997-<configure
998- xmlns="http://namespaces.zope.org/zope"
999- xmlns:browser="http://namespaces.zope.org/browser"
1000- xmlns:i18n="http://namespaces.zope.org/i18n"
1001- i18n_domain="launchpad">
1002-
1003- <!-- SourcePackageUtility -->
1004- <securedutility
1005- class="canonical.launchpad.database.SourcePackageUtility"
1006- provides="canonical.launchpad.interfaces.ISourcePackageUtility">
1007- <allow interface="canonical.launchpad.interfaces.ISourcePackageUtility" />
1008- </securedutility>
1009-
1010-</configure>
1011
1012=== modified file 'lib/canonical/launchpad/zcml/temporaryblobstorage.zcml'
1013--- lib/canonical/launchpad/zcml/temporaryblobstorage.zcml 2010-02-26 17:35:01 +0000
1014+++ lib/canonical/launchpad/zcml/temporaryblobstorage.zcml 2010-09-29 17:51:04 +0000
1015@@ -1,4 +1,4 @@
1016-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
1017+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1018 GNU Affero General Public License version 3 (see the file LICENSE).
1019 -->
1020
1021@@ -11,12 +11,12 @@
1022 <!-- TemporaryBlobStorage -->
1023 <class class="canonical.launchpad.database.TemporaryBlobStorage">
1024 <allow
1025- interface="canonical.launchpad.interfaces.ITemporaryBlobStorage" />
1026+ interface="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryBlobStorage" />
1027 </class>
1028
1029 <browser:page
1030 name="+storeblob"
1031- for="canonical.launchpad.interfaces.ILaunchpadRoot"
1032+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
1033 class="canonical.launchpad.browser.TemporaryBlobStorageAddView"
1034 permission="zope.Public"
1035 template="../templates/temporaryblobstorage-storeblob.pt"
1036@@ -26,14 +26,14 @@
1037 <!-- TemporaryStorageManager -->
1038 <class class="canonical.launchpad.database.TemporaryStorageManager">
1039 <allow
1040- interface="canonical.launchpad.interfaces.ITemporaryStorageManager" />
1041+ interface="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryStorageManager" />
1042 </class>
1043
1044 <securedutility
1045 class="canonical.launchpad.database.TemporaryStorageManager"
1046- provides="canonical.launchpad.interfaces.ITemporaryStorageManager">
1047+ provides="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryStorageManager">
1048 <allow
1049- interface="canonical.launchpad.interfaces.ITemporaryStorageManager" />
1050+ interface="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryStorageManager" />
1051 </securedutility>
1052
1053 <browser:navigation
1054@@ -44,12 +44,12 @@
1055 <browser:url
1056 for="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryBlobStorage"
1057 urldata="canonical.launchpad.browser.temporaryblobstorage.TemporaryBlobStorageURL"
1058- parent_utility="canonical.launchpad.interfaces.IWebServiceApplication"/>
1059+ parent_utility="canonical.launchpad.interfaces.launchpad.IWebServiceApplication"/>
1060 path_expression="string:temporary-blobs/${uuid}"
1061 />
1062
1063 <browser:url
1064 for="canonical.launchpad.interfaces.temporaryblobstorage.ITemporaryStorageManager"
1065 path_expression="string:temporary-blobs"
1066- parent_utility="canonical.launchpad.interfaces.IWebServiceApplication"/>
1067+ parent_utility="canonical.launchpad.interfaces.launchpad.IWebServiceApplication"/>
1068 </configure>
1069
1070=== modified file 'lib/canonical/launchpad/zcml/webservice.zcml'
1071--- lib/canonical/launchpad/zcml/webservice.zcml 2010-09-03 19:32:28 +0000
1072+++ lib/canonical/launchpad/zcml/webservice.zcml 2010-09-29 17:51:04 +0000
1073@@ -1,4 +1,4 @@
1074-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
1075+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1076 GNU Affero General Public License version 3 (see the file LICENSE).
1077 -->
1078
1079@@ -23,9 +23,9 @@
1080
1081 <securedutility
1082 class="canonical.launchpad.systemhomes.WebServiceApplication"
1083- provides="canonical.launchpad.interfaces.IWebServiceApplication">
1084+ provides="canonical.launchpad.interfaces.launchpad.IWebServiceApplication">
1085 <allow
1086- interface="canonical.launchpad.interfaces.IWebServiceApplication" />
1087+ interface="canonical.launchpad.interfaces.launchpad.IWebServiceApplication" />
1088 <allow interface='lazr.restful.interfaces.IServiceRootResource' />
1089 <allow interface='canonical.launchpad.webapp.interfaces.ICanonicalUrlData' />
1090 </securedutility>
1091@@ -58,14 +58,14 @@
1092
1093 <!-- WebService uses the default LaunchpadRootNavigation -->
1094 <view
1095- for="canonical.launchpad.interfaces.IWebServiceApplication"
1096+ for="canonical.launchpad.interfaces.launchpad.IWebServiceApplication"
1097 type="canonical.launchpad.layers.WebServiceLayer"
1098 factory="canonical.launchpad.browser.LaunchpadRootNavigation"
1099 provides="zope.publisher.interfaces.browser.IBrowserPublisher"
1100 />
1101
1102 <adapter
1103- for="canonical.launchpad.interfaces.IBugComment
1104+ for="lp.bugs.interfaces.bugmessage.IBugComment
1105 lazr.restful.interfaces.IWebServiceClientRequest"
1106 provides="lazr.restful.interfaces.IEntry"
1107 factory="canonical.launchpad.rest.bugcomment_to_entry"
1108
1109=== modified file 'lib/lp/bugs/browser/configure.zcml'
1110--- lib/lp/bugs/browser/configure.zcml 2010-09-28 03:01:37 +0000
1111+++ lib/lp/bugs/browser/configure.zcml 2010-09-29 17:51:04 +0000
1112@@ -197,7 +197,7 @@
1113 <browser:url
1114 for="lp.bugs.interfaces.malone.IMaloneApplication"
1115 path_expression="string:bugs"
1116- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1117+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1118 <browser:menu
1119 id="malone_actions"
1120 title="Menu for Malone-related actions."/>
1121
1122=== modified file 'lib/lp/code/browser/configure.zcml'
1123--- lib/lp/code/browser/configure.zcml 2010-09-23 13:47:36 +0000
1124+++ lib/lp/code/browser/configure.zcml 2010-09-29 17:51:04 +0000
1125@@ -130,16 +130,16 @@
1126 module="lp.code.browser.branchref"
1127 classes="BranchRefNavigation"/>
1128 <browser:url
1129- for="canonical.launchpad.interfaces.IBazaarApplication"
1130+ for="canonical.launchpad.interfaces.launchpad.IBazaarApplication"
1131 path_expression="string:+code"
1132- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
1133+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
1134 rootsite="code"/>
1135 <browser:defaultView
1136- for="canonical.launchpad.interfaces.IBazaarApplication"
1137+ for="canonical.launchpad.interfaces.launchpad.IBazaarApplication"
1138 layer="lp.code.publisher.CodeLayer"
1139 name="+index"/>
1140 <browser:pages
1141- for="canonical.launchpad.interfaces.IBazaarApplication"
1142+ for="canonical.launchpad.interfaces.launchpad.IBazaarApplication"
1143 layer="lp.code.publisher.CodeLayer"
1144 permission="zope.Public"
1145 class="lp.code.browser.bazaar.BazaarApplicationView"
1146@@ -741,7 +741,7 @@
1147 <browser:url
1148 for="lp.code.interfaces.codeimport.ICodeImportSet"
1149 path_expression="string:+code-imports"
1150- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
1151+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
1152 rootsite="code"/>
1153 <browser:defaultView
1154 for="lp.code.interfaces.codeimport.ICodeImportSet"
1155
1156=== modified file 'lib/lp/code/configure.zcml'
1157--- lib/lp/code/configure.zcml 2010-09-21 14:54:43 +0000
1158+++ lib/lp/code/configure.zcml 2010-09-29 17:51:04 +0000
1159@@ -1,4 +1,4 @@
1160-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
1161+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1162 GNU Affero General Public License version 3 (see the file LICENSE).
1163 -->
1164
1165@@ -183,19 +183,19 @@
1166 </securedutility>
1167 <securedutility
1168 class="canonical.launchpad.systemhomes.BazaarApplication"
1169- provides="canonical.launchpad.interfaces.IBazaarApplication">
1170- <allow interface="canonical.launchpad.interfaces.IBazaarApplication"/>
1171+ provides="canonical.launchpad.interfaces.launchpad.IBazaarApplication">
1172+ <allow interface="canonical.launchpad.interfaces.launchpad.IBazaarApplication"/>
1173 </securedutility>
1174
1175 <!-- pages for the bazaar application -->
1176
1177 <xmlrpc:view
1178- for="canonical.launchpad.interfaces.IBazaarApplication"
1179+ for="canonical.launchpad.interfaces.launchpad.IBazaarApplication"
1180 interface="canonical.launchpad.xmlrpc.IBranchSetAPI"
1181 class="canonical.launchpad.xmlrpc.BranchSetAPI"
1182 permission="launchpad.AnyPerson"/>
1183 <xmlrpc:view
1184- for="canonical.launchpad.interfaces.IBazaarApplication"
1185+ for="canonical.launchpad.interfaces.launchpad.IBazaarApplication"
1186 interface="canonical.launchpad.xmlrpc.IPublicCodehostingAPI"
1187 class="canonical.launchpad.xmlrpc.PublicCodehostingAPI"
1188 permission="zope.Public"/>
1189@@ -280,7 +280,7 @@
1190 <!-- Branch Merge Proposal Jobs -->
1191
1192 <class class="lp.code.model.branchmergeproposaljob.CreateMergeProposalJob">
1193- <allow interface="canonical.launchpad.interfaces.IMessageJob"/>
1194+ <allow interface="canonical.launchpad.interfaces.message.IMessageJob"/>
1195 <allow interface="lp.code.interfaces.branchmergeproposal.ICreateMergeProposalJob"/>
1196 </class>
1197 <securedutility
1198
1199=== modified file 'lib/lp/coop/answersbugs/configure.zcml'
1200--- lib/lp/coop/answersbugs/configure.zcml 2009-08-18 23:14:59 +0000
1201+++ lib/lp/coop/answersbugs/configure.zcml 2010-09-29 17:51:04 +0000
1202@@ -1,4 +1,4 @@
1203-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
1204+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1205 GNU Affero General Public License version 3 (see the file LICENSE).
1206 -->
1207
1208@@ -10,7 +10,7 @@
1209 <facet facet="answers">
1210
1211 <subscriber
1212- for="canonical.launchpad.interfaces.IBugTask
1213+ for="lp.bugs.interfaces.bugtask.IBugTask
1214 lazr.lifecycle.interfaces.IObjectModifiedEvent"
1215 handler=".notification.dispatch_linked_question_notifications"
1216 />
1217
1218=== modified file 'lib/lp/hardwaredb/browser/configure.zcml'
1219--- lib/lp/hardwaredb/browser/configure.zcml 2010-02-02 17:12:29 +0000
1220+++ lib/lp/hardwaredb/browser/configure.zcml 2010-09-29 17:51:04 +0000
1221@@ -11,7 +11,7 @@
1222 <browser:url
1223 for="lp.hardwaredb.interfaces.hwdb.IHWDBApplication"
1224 path_expression="string:+hwdb"
1225- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1226+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1227 <browser:page
1228 for="lp.hardwaredb.interfaces.hwdb.IHWDBApplication"
1229 class="lp.hardwaredb.browser.hwdb.HWDBUploadView"
1230@@ -35,7 +35,7 @@
1231 permission="zope.Public"
1232 name="+text"/>
1233 <browser:page
1234- for="canonical.launchpad.interfaces.IPerson"
1235+ for="lp.registry.interfaces.person.IPerson"
1236 permission="zope.Public"
1237 class="lp.hardwaredb.browser.hwdb.HWDBPersonSubmissionsView"
1238 template="../templates/person-hwdb-submissions.pt"
1239
1240=== modified file 'lib/lp/registry/browser/configure.zcml'
1241--- lib/lp/registry/browser/configure.zcml 2010-09-29 05:14:26 +0000
1242+++ lib/lp/registry/browser/configure.zcml 2010-09-29 17:51:04 +0000
1243@@ -1,4 +1,4 @@
1244-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
1245+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1246 GNU Affero General Public License version 3 (see the file LICENSE).
1247 -->
1248
1249@@ -10,7 +10,7 @@
1250 i18n_domain="launchpad">
1251 <!-- RDF downloadable documents -->
1252 <browser:page
1253- for="canonical.launchpad.interfaces.ILaunchpadRoot"
1254+ for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
1255 class="lp.registry.browser.RDFIndexView"
1256 name="rdf"
1257 template="../templates/rdf-index.pt"
1258@@ -206,7 +206,7 @@
1259 <browser:url
1260 for="lp.registry.interfaces.codeofconduct.ICodeOfConductSet"
1261 path_expression="string:codeofconduct"
1262- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1263+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1264 <browser:url
1265 for="lp.registry.interfaces.codeofconduct.ICodeOfConduct"
1266 parent_utility="lp.registry.interfaces.codeofconduct.ICodeOfConductSet"
1267@@ -285,7 +285,7 @@
1268 </browser:addform>
1269 </facet>
1270 <browser:url
1271- for="canonical.launchpad.interfaces.IIrcID"
1272+ for="lp.registry.interfaces.irc.IIrcID"
1273 path_expression="string:+ircnick/${id}"
1274 attribute_to_parent="person"
1275 rootsite="api"/>
1276@@ -404,7 +404,7 @@
1277 <browser:url
1278 for="lp.registry.interfaces.projectgroup.IProjectGroup"
1279 path_expression="name"
1280- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1281+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1282 <browser:pages
1283 for="lp.registry.interfaces.projectgroup.IProjectGroupSet"
1284 facet="overview"
1285@@ -510,14 +510,14 @@
1286 path_expression="string:+commercialsubscription/${id}"
1287 attribute_to_parent="product"/>
1288 <browser:url
1289- for="canonical.launchpad.interfaces.IJabberID"
1290+ for="lp.registry.interfaces.jabber.IJabberID"
1291 path_expression="string:+jabberid/${jabberid}"
1292 attribute_to_parent="person"
1293 rootsite="api"/>
1294 <browser:url
1295 for="lp.registry.interfaces.pillar.IPillarNameSet"
1296 path_expression="string:pillars"
1297- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1298+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1299 <adapter
1300 provides="canonical.launchpad.webapp.interfaces.INavigationMenu"
1301 for="lp.registry.browser.pillar.IInvolved"
1302@@ -554,7 +554,7 @@
1303 <browser:url
1304 for="lp.registry.interfaces.karma.IKarmaActionSet"
1305 path_expression="string:karmaaction"
1306- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1307+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1308 <browser:defaultView
1309 for="lp.registry.interfaces.karma.IKarmaActionSet"
1310 name="+index"/>
1311@@ -733,7 +733,7 @@
1312 <browser:url
1313 for="lp.registry.interfaces.announcement.IAnnouncementSet"
1314 path_expression="string:+announcements"
1315- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1316+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1317 <browser:defaultView
1318 for="lp.registry.interfaces.announcement.IAnnouncementSet"
1319 name="+announcements"/>
1320@@ -791,7 +791,7 @@
1321 <browser:url
1322 for="lp.registry.interfaces.person.IPerson"
1323 path_expression="string:~${name}"
1324- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1325+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1326 <browser:defaultView
1327 for="lp.registry.interfaces.person.IPerson"
1328 name="+index"/>
1329@@ -1403,7 +1403,7 @@
1330 <browser:url
1331 for="lp.registry.interfaces.product.IProduct"
1332 path_expression="name"
1333- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1334+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1335 <browser:page
1336 name="+get-involved"
1337 for="lp.registry.interfaces.product.IProduct"
1338@@ -1559,7 +1559,7 @@
1339 <browser:url
1340 for="lp.registry.interfaces.product.IProductSet"
1341 path_expression="string:projects"
1342- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1343+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1344 <browser:pages
1345 for="lp.registry.interfaces.product.IProductSet"
1346 permission="zope.Public"
1347@@ -1761,7 +1761,7 @@
1348 <browser:url
1349 for="lp.registry.interfaces.productseries.IProductSeriesSet"
1350 path_expression="string:series"
1351- parent_utility="canonical.launchpad.interfaces.IBazaarApplication"/>
1352+ parent_utility="canonical.launchpad.interfaces.launchpad.IBazaarApplication"/>
1353 <browser:menus
1354 classes="
1355 ProductSeriesFacets
1356@@ -1941,7 +1941,7 @@
1357 <browser:url
1358 for="lp.registry.interfaces.distribution.IDistribution"
1359 path_expression="name"
1360- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1361+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1362 <browser:pages
1363 for="lp.registry.interfaces.distribution.IDistributionSet"
1364 permission="zope.Public"
1365@@ -2117,7 +2117,7 @@
1366 module="lp.registry.browser.productrelease"/>
1367 <browser:page
1368 name="+driver"
1369- for="canonical.launchpad.interfaces.IHasAppointedDriver"
1370+ for="canonical.launchpad.interfaces.launchpad.IHasAppointedDriver"
1371 class="lp.registry.browser.driver.AppointDriverView"
1372 facet="overview"
1373 permission="launchpad.Edit"
1374
1375=== modified file 'lib/lp/registry/configure.zcml'
1376--- lib/lp/registry/configure.zcml 2010-09-23 01:46:29 +0000
1377+++ lib/lp/registry/configure.zcml 2010-09-29 17:51:04 +0000
1378@@ -1,4 +1,4 @@
1379-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
1380+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1381 GNU Affero General Public License version 3 (see the file LICENSE).
1382 -->
1383
1384@@ -135,11 +135,11 @@
1385 <allow
1386 interface="lp.bugs.interfaces.bugtarget.IHasBugHeat"/>
1387 <allow
1388- interface="canonical.launchpad.interfaces.IHasQueueItems"/>
1389+ interface="lp.soyuz.interfaces.queue.IHasQueueItems"/>
1390 <allow
1391 interface="lp.translations.interfaces.translationimportqueue.IHasTranslationImports"/>
1392 <allow
1393- interface="canonical.launchpad.interfaces.ICanPublishPackages"/>
1394+ interface="lp.soyuz.interfaces.publishing.ICanPublishPackages"/>
1395 <require
1396 permission="launchpad.Edit"
1397 set_schema="lp.app.interfaces.launchpad.IServiceUsage"/>
1398@@ -302,9 +302,9 @@
1399 <allow
1400 interface="lp.bugs.interfaces.bugtarget.IHasBugHeat"/>
1401 <allow
1402- interface="canonical.launchpad.interfaces.IFAQCollection"/>
1403+ interface="lp.answers.interfaces.faqcollection.IFAQCollection"/>
1404 <allow
1405- interface="canonical.launchpad.interfaces.IQuestionCollection"/>
1406+ interface="lp.answers.interfaces.questioncollection.IQuestionCollection"/>
1407 <allow
1408 interface="lp.translations.interfaces.translationgroup.ITranslationPolicy"/>
1409 <require
1410@@ -734,7 +734,7 @@
1411 <!-- PollSubset -->
1412
1413 <adapter
1414- for="canonical.launchpad.interfaces.ITeam"
1415+ for="lp.registry.interfaces.person.ITeam"
1416 provides="lp.registry.interfaces.poll.IPollSubset"
1417 factory="lp.registry.adapters.PollSubset"
1418 permission="zope.Public"/>
1419@@ -995,7 +995,7 @@
1420 interface="lp.registry.interfaces.milestone.IProjectGroupMilestone"/>
1421 </class>
1422 <subscriber
1423- for="canonical.launchpad.interfaces.IProduct zope.lifecycleevent.interfaces.IObjectModifiedEvent"
1424+ for="lp.registry.interfaces.product.IProduct zope.lifecycleevent.interfaces.IObjectModifiedEvent"
1425 handler="lp.registry.subscribers.product_modified"/>
1426 <class
1427 class="lp.registry.model.mailinglist.MailingList">
1428@@ -1088,7 +1088,7 @@
1429 <class
1430 class="lp.registry.model.gpgkey.GPGKey">
1431 <allow
1432- interface="canonical.launchpad.interfaces.IGPGKey"/>
1433+ interface="lp.registry.interfaces.gpg.IGPGKey"/>
1434 <require
1435 permission="launchpad.Edit"
1436 set_attributes="active can_encrypt"/>
1437@@ -1099,13 +1099,13 @@
1438 <class
1439 class="lp.registry.model.gpgkey.GPGKeySet">
1440 <allow
1441- interface="canonical.launchpad.interfaces.IGPGKeySet"/>
1442+ interface="lp.registry.interfaces.gpg.IGPGKeySet"/>
1443 </class>
1444 <securedutility
1445 class="lp.registry.model.gpgkey.GPGKeySet"
1446- provides="canonical.launchpad.interfaces.IGPGKeySet">
1447+ provides="lp.registry.interfaces.gpg.IGPGKeySet">
1448 <allow
1449- interface="canonical.launchpad.interfaces.IGPGKeySet"/>
1450+ interface="lp.registry.interfaces.gpg.IGPGKeySet"/>
1451 </securedutility>
1452
1453 <!-- Product -->
1454@@ -1226,7 +1226,7 @@
1455 <!-- IFAQTarget -->
1456
1457 <allow
1458- interface="canonical.launchpad.interfaces.IFAQCollection"
1459+ interface="lp.answers.interfaces.faqcollection.IFAQCollection"
1460 attributes="
1461 findSimilarFAQs"/>
1462 <require
1463@@ -1335,7 +1335,7 @@
1464 <class
1465 class="lp.registry.model.person.SSHKey">
1466 <allow
1467- interface="canonical.launchpad.interfaces.ISSHKey"/>
1468+ interface="lp.registry.interfaces.ssh.ISSHKey"/>
1469 <require
1470 permission="launchpad.Edit"
1471 set_attributes="keytext comment"/>
1472@@ -1346,13 +1346,13 @@
1473 <class
1474 class="lp.registry.model.person.SSHKeySet">
1475 <allow
1476- interface="canonical.launchpad.interfaces.ISSHKeySet"/>
1477+ interface="lp.registry.interfaces.ssh.ISSHKeySet"/>
1478 </class>
1479 <securedutility
1480 class="lp.registry.model.person.SSHKeySet"
1481- provides="canonical.launchpad.interfaces.ISSHKeySet">
1482+ provides="lp.registry.interfaces.ssh.ISSHKeySet">
1483 <allow
1484- interface="canonical.launchpad.interfaces.ISSHKeySet"/>
1485+ interface="lp.registry.interfaces.ssh.ISSHKeySet"/>
1486 </securedutility>
1487 <subscriber
1488 for="canonical.launchpad.event.interfaces.IJoinTeamEvent"
1489@@ -1407,7 +1407,7 @@
1490 removeBugSubscription"/>
1491 </class>
1492 <adapter
1493- provides="canonical.launchpad.interfaces.IHasExternalBugTracker"
1494+ provides="canonical.launchpad.interfaces.launchpad.IHasExternalBugTracker"
1495 for="lp.registry.interfaces.productseries.IProductSeries"
1496 factory="lp.registry.adapters.productseries_to_product"
1497 permission="zope.Public"/>
1498@@ -1506,7 +1506,7 @@
1499 <!-- IFAQTarget -->
1500
1501 <allow
1502- interface="canonical.launchpad.interfaces.IFAQCollection"
1503+ interface="lp.answers.interfaces.faqcollection.IFAQCollection"
1504 attributes="
1505 findSimilarFAQs"/>
1506 <require
1507@@ -1582,7 +1582,7 @@
1508 <allow
1509 interface="lp.bugs.interfaces.bugtarget.IHasBugHeat"/>
1510 <allow
1511- interface="canonical.launchpad.interfaces.IHasBuildRecords"/>
1512+ interface="lp.soyuz.interfaces.buildrecords.IHasBuildRecords"/>
1513 <allow
1514 interface="lp.translations.interfaces.translationimportqueue.IHasTranslationImports"/>
1515
1516
1517=== modified file 'lib/lp/services/worlddata/browser/configure.zcml'
1518--- lib/lp/services/worlddata/browser/configure.zcml 2010-02-21 00:41:56 +0000
1519+++ lib/lp/services/worlddata/browser/configure.zcml 2010-09-29 17:51:04 +0000
1520@@ -1,4 +1,4 @@
1521-<!-- Copyright 2010 Canonical Ltd. This software is licensed under the
1522+<!-- Copyright 2010 Canonical Ltd. This software is licensed under the
1523 GNU Affero General Public License version 3 (see the file LICENSE).
1524 -->
1525
1526@@ -18,7 +18,7 @@
1527 <browser:url
1528 for="lp.services.worlddata.interfaces.country.ICountrySet"
1529 path_expression="string:+countries"
1530- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
1531+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
1532 rootsite="mainsite" />
1533
1534 <browser:navigation
1535
1536=== modified file 'lib/lp/soyuz/browser/configure.zcml'
1537--- lib/lp/soyuz/browser/configure.zcml 2010-07-02 14:34:58 +0000
1538+++ lib/lp/soyuz/browser/configure.zcml 2010-09-29 17:51:04 +0000
1539@@ -388,7 +388,7 @@
1540 <browser:url
1541 for="lp.buildmaster.interfaces.builder.IBuilderSet"
1542 path_expression="string:builders"
1543- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1544+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1545 <browser:defaultView
1546 for="lp.buildmaster.interfaces.builder.IBuilderSet"
1547 name="+index"/>
1548@@ -795,7 +795,7 @@
1549 <browser:url
1550 for="lp.soyuz.interfaces.packageset.IPackagesetSet"
1551 path_expression="string:package-sets"
1552- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
1553+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
1554 />
1555 <browser:navigation
1556 module="lp.soyuz.browser.packageset"
1557
1558=== modified file 'lib/lp/soyuz/configure.zcml'
1559--- lib/lp/soyuz/configure.zcml 2010-08-20 13:47:47 +0000
1560+++ lib/lp/soyuz/configure.zcml 2010-09-29 17:51:04 +0000
1561@@ -1,4 +1,4 @@
1562-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
1563+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1564 GNU Affero General Public License version 3 (see the file LICENSE).
1565 -->
1566
1567@@ -27,7 +27,7 @@
1568 <class
1569 class="canonical.launchpad.database.BinaryPackagePublishingHistory">
1570 <allow
1571- interface="canonical.launchpad.interfaces.IArchiveSafePublisher"/>
1572+ interface="lp.soyuz.interfaces.publishing.IArchiveSafePublisher"/>
1573 <require
1574 permission="launchpad.View"
1575 interface="lp.soyuz.interfaces.publishing.IBinaryPackagePublishingHistoryPublic"/>
1576@@ -36,7 +36,7 @@
1577 interface="lp.soyuz.interfaces.publishing.IPublishingEdit"/>
1578 <require
1579 permission="launchpad.Admin"
1580- set_schema="canonical.launchpad.interfaces.IBinaryPackagePublishingHistory"/>
1581+ set_schema="lp.soyuz.interfaces.publishing.IBinaryPackagePublishingHistory"/>
1582 </class>
1583
1584 <!-- BinaryPackageFilePublishing -->
1585@@ -44,7 +44,7 @@
1586 <class
1587 class="canonical.launchpad.database.BinaryPackageFilePublishing">
1588 <allow
1589- interface="canonical.launchpad.interfaces.IBinaryPackageFilePublishing"/>
1590+ interface="lp.soyuz.interfaces.publishing.IBinaryPackageFilePublishing"/>
1591
1592 <!-- XXX cprov 2006-06-14: missing security adapter -->
1593
1594@@ -113,7 +113,7 @@
1595 <class
1596 class="canonical.launchpad.database.SourcePackagePublishingHistory">
1597 <allow
1598- interface="canonical.launchpad.interfaces.IArchiveSafePublisher"/>
1599+ interface="lp.soyuz.interfaces.publishing.IArchiveSafePublisher"/>
1600 <require
1601 permission="launchpad.View"
1602 interface="lp.soyuz.interfaces.publishing.ISourcePackagePublishingHistoryPublic"/>
1603@@ -122,7 +122,7 @@
1604 interface="lp.soyuz.interfaces.publishing.IPublishingEdit"/>
1605 <require
1606 permission="launchpad.Admin"
1607- set_schema="canonical.launchpad.interfaces.ISourcePackagePublishingHistory"/>
1608+ set_schema="lp.soyuz.interfaces.publishing.ISourcePackagePublishingHistory"/>
1609 </class>
1610
1611 <!-- SourcePackageFilePublishing -->
1612@@ -130,7 +130,7 @@
1613 <class
1614 class="canonical.launchpad.database.SourcePackageFilePublishing">
1615 <allow
1616- interface="canonical.launchpad.interfaces.ISourcePackageFilePublishing"/>
1617+ interface="lp.soyuz.interfaces.publishing.ISourcePackageFilePublishing"/>
1618
1619 <!-- XXX cprov 2006-06-14: Missing security adapter. -->
1620
1621@@ -416,7 +416,7 @@
1622 </class>
1623 <adapter
1624 for="lp.soyuz.interfaces.archive.IArchive"
1625- provides="canonical.launchpad.interfaces.IPerson"
1626+ provides="lp.registry.interfaces.person.IPerson"
1627 factory="lp.registry.browser.person.archive_to_person"/>
1628 <adapter
1629 for="lp.soyuz.interfaces.archive.IArchive"
1630@@ -638,9 +638,9 @@
1631 <allow
1632 interface="lp.soyuz.interfaces.distroarchseries.IDistroArchSeries"/>
1633 <allow
1634- interface="canonical.launchpad.interfaces.IHasBuildRecords"/>
1635+ interface="lp.soyuz.interfaces.buildrecords.IHasBuildRecords"/>
1636 <allow
1637- interface="canonical.launchpad.interfaces.ICanPublishPackages"/>
1638+ interface="lp.soyuz.interfaces.publishing.ICanPublishPackages"/>
1639 <require
1640 permission="launchpad.Admin"
1641 set_schema="lp.soyuz.interfaces.distroarchseries.IDistroArchSeries"/>
1642
1643=== modified file 'lib/lp/translations/browser/configure.zcml'
1644--- lib/lp/translations/browser/configure.zcml 2010-09-23 05:00:58 +0000
1645+++ lib/lp/translations/browser/configure.zcml 2010-09-29 17:51:04 +0000
1646@@ -1,4 +1,4 @@
1647-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
1648+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1649 GNU Affero General Public License version 3 (see the file LICENSE).
1650 -->
1651
1652@@ -9,11 +9,11 @@
1653 xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
1654 i18n_domain="launchpad">
1655 <browser:url
1656- for="canonical.launchpad.interfaces.IRosettaApplication"
1657+ for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
1658 path_expression="string:translations"
1659- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1660+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1661 <browser:defaultView
1662- for="canonical.launchpad.interfaces.IRosettaApplication"
1663+ for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
1664 name="+index"
1665 layer="lp.translations.publisher.TranslationsLayer"/>
1666 <browser:navigation
1667@@ -21,7 +21,7 @@
1668 classes="
1669 RosettaApplicationNavigation"/>
1670 <browser:pages
1671- for="canonical.launchpad.interfaces.IRosettaApplication"
1672+ for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
1673 facet="translations"
1674 permission="zope.Public"
1675 class="lp.translations.browser.translations.RosettaApplicationView"
1676@@ -40,7 +40,7 @@
1677 template="../templates/rosetta-portlet-groups.pt"/>
1678 </browser:pages>
1679 <browser:page
1680- for="canonical.launchpad.interfaces.IRosettaApplication"
1681+ for="canonical.launchpad.interfaces.launchpad.IRosettaApplication"
1682 facet="translations"
1683 permission="zope.Public"
1684 class="lp.translations.browser.translations.TranslatableProductsView"
1685@@ -142,7 +142,7 @@
1686 <browser:url
1687 for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueue"
1688 path_expression="string:+imports"
1689- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
1690+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"/>
1691 <browser:defaultView
1692 for="lp.translations.interfaces.translationimportqueue.ITranslationImportQueue"
1693 name="+index"
1694@@ -302,7 +302,7 @@
1695 classes="
1696 LanguageSetNavigation"/>
1697 <browser:defaultView
1698- for="canonical.launchpad.interfaces.ILanguage"
1699+ for="lp.services.worlddata.interfaces.language.ILanguage"
1700 name="+index"
1701 layer="lp.translations.publisher.TranslationsLayer"/>
1702 <browser:menus
1703@@ -311,26 +311,26 @@
1704 LanguageSetContextMenu
1705 LanguageNavigationMenu"/>
1706 <browser:url
1707- for="canonical.launchpad.interfaces.ILanguage"
1708+ for="lp.services.worlddata.interfaces.language.ILanguage"
1709 path_expression="code"
1710- parent_utility="canonical.launchpad.interfaces.ILanguageSet"
1711+ parent_utility="lp.services.worlddata.interfaces.language.ILanguageSet"
1712 rootsite="translations"/>
1713 <browser:page
1714- for="canonical.launchpad.interfaces.ILanguage"
1715+ for="lp.services.worlddata.interfaces.language.ILanguage"
1716 class="lp.translations.browser.language.LanguageView"
1717 permission="zope.Public"
1718 template="../templates/language-index.pt"
1719 name="+index"
1720 layer="lp.translations.publisher.TranslationsLayer"/>
1721 <browser:page
1722- for="canonical.launchpad.interfaces.ILanguage"
1723+ for="lp.services.worlddata.interfaces.language.ILanguage"
1724 class="lp.translations.browser.language.LanguageAdminView"
1725 permission="launchpad.Admin"
1726 template="../../app/templates/generic-edit.pt"
1727 name="+admin"
1728 layer="lp.translations.publisher.TranslationsLayer"/>
1729 <browser:pages
1730- for="canonical.launchpad.interfaces.ILanguage"
1731+ for="lp.services.worlddata.interfaces.language.ILanguage"
1732 class="lp.translations.browser.language.LanguageView"
1733 permission="zope.Public"
1734 layer="lp.translations.publisher.TranslationsLayer">
1735@@ -342,23 +342,23 @@
1736 template="../templates/language-portlet-top-contributors.pt"/>
1737 </browser:pages>
1738 <browser:defaultView
1739- for="canonical.launchpad.interfaces.ILanguageSet"
1740+ for="lp.services.worlddata.interfaces.language.ILanguageSet"
1741 name="+index"
1742 layer="lp.translations.publisher.TranslationsLayer"/>
1743 <browser:url
1744- for="canonical.launchpad.interfaces.ILanguageSet"
1745+ for="lp.services.worlddata.interfaces.language.ILanguageSet"
1746 path_expression="string:+languages"
1747- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
1748+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
1749 rootsite="translations"/>
1750 <browser:page
1751- for="canonical.launchpad.interfaces.ILanguageSet"
1752+ for="lp.services.worlddata.interfaces.language.ILanguageSet"
1753 class="lp.translations.browser.language.LanguageSetView"
1754 permission="zope.Public"
1755 template="../templates/languageset-index.pt"
1756 name="+index"
1757 layer="lp.translations.publisher.TranslationsLayer"/>
1758 <browser:page
1759- for="canonical.launchpad.interfaces.ILanguageSet"
1760+ for="lp.services.worlddata.interfaces.language.ILanguageSet"
1761 class="lp.translations.browser.language.LanguageAddView"
1762 permission="launchpad.Admin"
1763 template="../../app/templates/generic-edit.pt"
1764@@ -511,7 +511,7 @@
1765 <browser:url
1766 for="lp.translations.interfaces.translationgroup.ITranslationGroupSet"
1767 path_expression="string:+groups"
1768- parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
1769+ parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
1770 rootsite="translations" />
1771 <browser:defaultView
1772 for="lp.translations.interfaces.translationgroup.ITranslationGroupSet"
1773
1774=== modified file 'lib/lp/translations/configure.zcml'
1775--- lib/lp/translations/configure.zcml 2010-09-20 18:42:38 +0000
1776+++ lib/lp/translations/configure.zcml 2010-09-29 17:51:04 +0000
1777@@ -1,4 +1,4 @@
1778-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
1779+<!-- Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1780 GNU Affero General Public License version 3 (see the file LICENSE).
1781 -->
1782
1783@@ -52,9 +52,9 @@
1784 </class>
1785 <securedutility
1786 class="canonical.launchpad.systemhomes.RosettaApplication"
1787- provides="canonical.launchpad.interfaces.IRosettaApplication">
1788+ provides="canonical.launchpad.interfaces.launchpad.IRosettaApplication">
1789 <allow
1790- interface="canonical.launchpad.interfaces.IRosettaApplication"/>
1791+ interface="canonical.launchpad.interfaces.launchpad.IRosettaApplication"/>
1792 </securedutility>
1793
1794 <!-- TranslationsOverview -->
1795@@ -258,7 +258,7 @@
1796 <!-- Subscribers to registry objects -->
1797
1798 <subscriber
1799- for="canonical.launchpad.interfaces.IProduct zope.lifecycleevent.interfaces.IObjectModifiedEvent"
1800+ for="lp.registry.interfaces.product.IProduct zope.lifecycleevent.interfaces.IObjectModifiedEvent"
1801 handler="lp.translations.subscribers.product_modified"/>
1802
1803 <!-- DistroSeriesLanguage and Dummy -->